Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 808e453c56036211f57482ed847d54aca01bba68.

19 files changed, 75 insertions, 75 deletions

diff --git a/ksirc/puke/HOWTO-PUKE.pod b/ksirc/puke/HOWTO-PUKE.pod
index c6bf8136..600f2111 100644
--- a/ksirc/puke/HOWTO-PUKE.pod
+++ b/ksirc/puke/HOWTO-PUKE.pod
@@ -11,7 +11,7 @@ under Linux.
 Puke's a generic protocol allowing dsirc to communicate with ksirc.
 Communications works over a unix domain socket between multiple
 client dsirc process's to a single ksirc process.  All communications
-is done via a variable length message with the following layout:
+is done via a variable length message with the following tqlayout:
 
 =begin text
 
@@ -68,17 +68,17 @@ supporting perl5-oop object.
 
 The C++ code must be able to hand all required settings and messages
 for the widget.  Each new widget iherites it's parent and so forth
-allowing for a nice oop layout.  The widget structure the author is
+allowing for a nice oop tqlayout.  The widget structure the author is
 following is the same as Qt's.  Their seems to work well, why
 re-invent the wheel?
 
 =item 2.1.1 General Layout, etc
 
 Figure where your new widget goes in the heirachy.  If it's a simple
-Qt widget, I recommend using their existing layout.  Man pages list
+Qt widget, I recommend using their existing tqlayout.  Man pages list
 what widgets inherit what.
 
-The general idea behind the widget layout should be to be to provide
+The general idea behind the widget tqlayout should be to be to provide
 all the functionality of the widget to dsirc perl script.  Incoming
 messages are handled via the messageHandler and ALL messages should
 return an ACK with current state info.
@@ -106,7 +106,7 @@ These set and return your widget.
 
 If you care about inheritance, which you should, all these functions
 should be virtual.  (Since we are using pointers to PWidget's
-everywhere, it's a good bet you want your children's overriden
+everywhere, it's a good bet you want your tqchildren's overriden
 functions called, not yours)
 
 The structure internally will have to hold a local copy of the widget,
diff --git a/ksirc/puke/commands.h b/ksirc/puke/commands.h
index ead9fb07..2baa316e 100644
--- a/ksirc/puke/commands.h
+++ b/ksirc/puke/commands.h
@@ -130,38 +130,38 @@
 // cArg: not define
 #define PUKE_WIDGET_HIDE_ACK -1003
 
-// Desc: repaint widget
-// iWinId: widget to repaint
+// Desc: tqrepaint widget
+// iWinId: widget to tqrepaint
 // iArg: erase, 0 for false, 1 for true
 // cArg: no defines
 #define PUKE_WIDGET_REPAINT 1005
 
-// Desc: repaint widget ack
-// iWinId: widget to repaint
+// Desc: tqrepaint widget ack
+// iWinId: widget to tqrepaint
 // iArg: not defined
 // cArg: not defined
 #define PUKE_WIDGET_REPAINT_ACK -1005
 
 // Desc: update widget on next event loop
-// iWinId: widget to repaint
+// iWinId: widget to tqrepaint
 // iArg: erase, 0 for false, 1 for true
 // cArg: no defines
 #define PUKE_WIDGET_UPDATE 1010
 
-// Desc: repaint widget ack
-// iWinId: widget to repaint
+// Desc: tqrepaint widget ack
+// iWinId: widget to tqrepaint
 // iArg: not defined
 // cArg: not defined
 #define PUKE_WIDGET_UPDATE_ACK -1010
 
 // Desc: resize the widget
-// iWinId: widget to repaint
+// iWinId: widget to tqrepaint
 // iArg: width in the low 16 bit, height in next 16 bits
 // cArg: not defined
 #define PUKE_WIDGET_RESIZE 1015
 
-// Desc: repaint widget ack
-// iWinId: widget to repaint
+// Desc: tqrepaint widget ack
+// iWinId: widget to tqrepaint
 // iArg: new widget in lower 16 bit, new height in lower 16 bits
 // cArg: not defined
 #define PUKE_WIDGET_RESIZE_ACK -1015
@@ -766,13 +766,13 @@
 
 // Desc: Set label's allignment
 // iWinId: window id
-// iArg: alignment
+// iArg: tqalignment
 // cArg: not defined
 #define PUKE_LABEL_SETALIGNMENT 1715
 
 // Desc: Set label's allignment, ACK
 // iWinId: window id
-// iArg: alignment
+// iArg: tqalignment
 // cArg: not defined
 #define PUKE_LABEL_SETALIGNMENT_ACK -1715
 
@@ -993,14 +993,14 @@
 #define PWIDGET_OBJFINDER 18
 
 
-// Group layout commands exist between 10000 and 11000
+// Group tqlayout commands exist between 10000 and 11000
 
-// Desc: create new box layout
+// Desc: create new box tqlayout
 // iWinId: PWidget parent
 // iArg: 2 shorts, short[0] direction, short[1] border
 // cArg: random character string
 #define PUKE_LAYOUT_NEW 11000
-// Desc: ack for box layout
+// Desc: ack for box tqlayout
 // iWinId: Layout ID.
 // iArg: not define
 // cArg: same random m character string as PUKE_LAYOUT_NEW
@@ -1009,10 +1009,10 @@
 #define PUKE_LAYOUT_ADDLAYOUT 11005
 #define PUKE_LAYOUT_ADDLAYOUT_ACK -11005
 
-// Desc: add widget into layout manager
+// Desc: add widget into tqlayout manager
 // iWinId: Layout Manager to add widget too
 // iArg: Widget Id to be added
-// cArg: 2 characters, char[0] strech, char[1] alignment
+// cArg: 2 characters, char[0] strech, char[1] tqalignment
 #define PUKE_LAYOUT_ADDWIDGET 11010
 // Desc: ack for add widget
 // iWinId: Layout manager 
@@ -1032,7 +1032,7 @@
 // cArg: not define
 #define PUKE_LAYOUT_ADDSTRUT_ACK -11015
 
-// Desc: activates layout management, like show() for widget
+// Desc: activates tqlayout management, like show() for widget
 // iWinId: Layout Manager to activate
 // iArg: undef
 // cArg: undef
diff --git a/ksirc/puke/controller.cpp b/ksirc/puke/controller.cpp
index a790436d..20c020c7 100644
--- a/ksirc/puke/controller.cpp
+++ b/ksirc/puke/controller.cpp
@@ -32,7 +32,7 @@ using namespace std; // iostream.h include cstring which puts strlen into
 #include "pframe.h"
 #include "pkfiledialog.h"
 #include "plabel.h"
-#include "playout.h"
+#include "ptqlayout.h"
 #include "plined.h"
 #include "plistbox.h"
 #include "pmenudta.h"
@@ -173,7 +173,7 @@ void PukeController::NewConnect(int)
   fcntl(cfd, F_SETFL, O_NONBLOCK);  // Set it non-block so that
                                     // cfd() never blocks.
 
-  fdStatus *fds = new fdStatus();
+  fdtqStatus *fds = new fdtqStatus();
   fds->sr = new TQSocketNotifier(cfd, TQSocketNotifier::Read, this);
   fds->sw = new TQSocketNotifier(cfd, TQSocketNotifier::Write, this);
   connect(fds->sr, TQT_SIGNAL(activated(int)),
@@ -868,7 +868,7 @@ void PukeController::messageHandler(int fd, PukeMessage *pm) {
       return;
     }
 
-    TQString libName = "ksirc/lib"+TQString::fromLatin1(pm->cArg);
+    TQString libName = "ksirc/lib"+TQString::tqfromLatin1(pm->cArg);
     if (libName.right(3) == ".so")
        libName = libName.left(libName.length()-2)+"la";
 
diff --git a/ksirc/puke/controller.h b/ksirc/puke/controller.h
index c2a086f7..92c8be98 100644
--- a/ksirc/puke/controller.h
+++ b/ksirc/puke/controller.h
@@ -27,7 +27,7 @@ typedef struct {
   TQString server;
   bool writeable;
   TQSocketNotifier *sr,*sw;
-} fdStatus;
+} fdtqStatus;
 
 
 struct commandStruct {
@@ -137,7 +137,7 @@ private:
   int iListenFd;
   bool bClosing; // Set true if we are closing, we don't try and close twice at the same time.
   TQSocketNotifier *qsnListen;
-  TQIntDict<fdStatus> qidConnectFd;
+  TQIntDict<fdtqStatus> qidConnectFd;
 
   /**
    * Controller ID is defined as 1
diff --git a/ksirc/puke/dcc_status.pm b/ksirc/puke/dcc_status.pm
index 65bc1b07..799c8cf5 100644
--- a/ksirc/puke/dcc_status.pm
+++ b/ksirc/puke/dcc_status.pm
@@ -6,7 +6,7 @@
 &docommand("/load ptablevw.pm");
 &docommand("/load plistbox.pm");
 &docommand("/load pbutton.pm");;
-&docommand("/load pboxlayout.pm");
+&docommand("/load pboxtqlayout.pm");
 &docommand("/load plabel.pm");
 &docommand("/load pbutton.pm");
 &docommand("/load ppushbt.pm");
@@ -123,7 +123,7 @@ sub sendClicked {
 
 use vars qw(@ISA $KSIRC_DCC %KSIRC_DCC);
 
-package DCCStatus;
+package DCCtqStatus;
 use vars qw(@ISA);
 @ISA = qw(PFrame);
 
@@ -330,7 +330,7 @@ sub hook_ksirc_dcc_request {
   my($size) = shift;
   my($mwho) = $who;
   if($KSIRC_DCCSTATUS == undef){
-    $KSIRC_DCCSTATUS = new DCCStatus;
+    $KSIRC_DCCSTATUS = new DCCtqStatus;
     $KSIRC_DCCSTATUS->resize(400, 275);
   }
 
@@ -473,13 +473,13 @@ addhook("dcc_disconnect", "ksirc_dcc_disconnect");
 
 
 &print("*I* Done DCC Status");
-#$::test = new DCCStatus;
+#$::test = new DCCtqStatus;
 #$::test->resize(400, 275);
 #$::test->show();
 
 sub popup_dccstatus{
   if($KSIRC_DCCSTATUS == undef){
-    $KSIRC_DCCSTATUS = new DCCStatus;
+    $KSIRC_DCCSTATUS = new DCCtqStatus;
     $KSIRC_DCCSTATUS->resize(400, 275);
   }
   $KSIRC_DCCSTATUS->show();
@@ -487,7 +487,7 @@ sub popup_dccstatus{
 
 sub popup_dccsend{
   if($KSIRC_DCCSTATUS == undef){
-    $KSIRC_DCCSTATUS = new DCCStatus;
+    $KSIRC_DCCSTATUS = new DCCtqStatus;
     $KSIRC_DCCSTATUS->resize(400, 275);
   }
   $KSIRC_DCCSTATUS->sendClicked();
diff --git a/ksirc/puke/load_all.pm b/ksirc/puke/load_all.pm
index 26594c0f..048eb9eb 100644
--- a/ksirc/puke/load_all.pm
+++ b/ksirc/puke/load_all.pm
@@ -1,7 +1,7 @@
 &docommand("/load pbase.pm");
 &docommand("/load pwidget.pm");
 &docommand("/load pframe.pm"); 
-&docommand("/load pboxlayout.pm");
+&docommand("/load pboxtqlayout.pm");
 &docommand("/load plined.pm");
 &docommand("/load pbutton.pm");
 &docommand("/load ppushbt.pm");
diff --git a/ksirc/puke/palistbox.cpp b/ksirc/puke/palistbox.cpp
index 9f43b124..05124441 100644
--- a/ksirc/puke/palistbox.cpp
+++ b/ksirc/puke/palistbox.cpp
@@ -88,7 +88,7 @@ void PAListBox::messageHandler(int fd, PukeMessage *pm)
       widget()->removeItem(index);
       item->setVoice(pm->iArg);
       widget()->inSort(item);
-      widget()->repaint(TRUE);
+      widget()->tqrepaint(TRUE);
 
       pmRet.iCommand = - pm->iCommand;
       pmRet.iWinId = pm->iWinId;
@@ -108,7 +108,7 @@ void PAListBox::messageHandler(int fd, PukeMessage *pm)
       widget()->removeItem(index);
       item->setOp(pm->iArg);
       widget()->inSort(item);
-      widget()->repaint(TRUE);
+      widget()->tqrepaint(TRUE);
 
       pmRet.iCommand = - pm->iCommand;
       pmRet.iWinId = pm->iWinId;
diff --git a/ksirc/puke/pboxlayout.pm b/ksirc/puke/pboxlayout.pm
index 505ddc0d..9896fd1c 100644
--- a/ksirc/puke/pboxlayout.pm
+++ b/ksirc/puke/pboxlayout.pm
@@ -40,7 +40,7 @@ sub new {
   #}
   #  else{
   if(ref($widget) ne ''){
-      #    print "*\cbI\cb* Generic Non-topleve layout type\n";
+      #    print "*\cbI\cb* Generic Non-topleve tqlayout type\n";
     $self->{Parent} = $widget;
     $self->{ParentType} = 'Widget';
     $self->{Direction} = shift;
@@ -99,7 +99,7 @@ sub addWidget {
   my $align = shift;
 
   if($self->{Added} == 0){
-    print "*E* Burp: Can't add widget without first being added to parent layout\n";
+    print "*E* Burp: Can't add widget without first being added to parent tqlayout\n";
     return;
   }
 
@@ -128,41 +128,41 @@ sub addLayout {
   my $self = shift;
 
   if($self->{Added} == 0){
-    print "*E* Burp: Can't add layout without first being added to parent layout\n";
+    print "*E* Burp: Can't add tqlayout without first being added to parent tqlayout\n";
   }
 
   
-  my $layout = shift;
-  if(ref($layout) ne 'PBoxLayout'){
-    print "*E* Passed non layout type to addLayout\n";
+  my $tqlayout = shift;
+  if(ref($tqlayout) ne 'PBoxLayout'){
+    print "*E* Passed non tqlayout type to addLayout\n";
     return 1;
   }
 
-  if($layout->{iWinId} <= 0){
-    print "*E* Trying to add invalid layout " . ref($layout) . "\n";
+  if($tqlayout->{iWinId} <= 0){
+    print "*E* Trying to add invalid tqlayout " . ref($tqlayout) . "\n";
     return;
   }
 
 
   # make sure we can run, and the widget we want to add can run.
-  #  my @ARG = ($layout);
+  #  my @ARG = ($tqlayout);
   #$self->canRun($self, \&PBoxLayout::addLayout, \@ARG) || return;
-  #$layout->canRun($self, \&PBoxLayout::addLayout, \@ARG) || return;
+  #$tqlayout->canRun($self, \&PBoxLayout::addLayout, \@ARG) || return;
 
   my %REPLY = $self->sendMessage('iCommand' => $::PUKE_LAYOUT_ADDLAYOUT,
                                  'iWinId' => $self->{iWinId},
-                                 'iArg' => $layout->{iWinId},
+                                 'iArg' => $tqlayout->{iWinId},
                                  'cArg' => pack("C", 0),
                                  'CallBack' => sub { },
                                  'WaitFor' => 1);
 
-  #  print "*I* Adding layout\n";
+  #  print "*I* Adding tqlayout\n";
   if($REPLY{'iArg'} != 0){
     print "*E* AddLayout call failed\n";
   }
   else{
-    #    print "*I* Added new Layout for " . $layout->{iWinId} . "\n";
-    $layout->{Added} = 1;
+    #    print "*I* Added new Layout for " . $tqlayout->{iWinId} . "\n";
+    $tqlayout->{Added} = 1;
   }
 
 }
diff --git a/ksirc/puke/pframe.pm b/ksirc/puke/pframe.pm
index f851cdb8..2ef36ebc 100644
--- a/ksirc/puke/pframe.pm
+++ b/ksirc/puke/pframe.pm
@@ -44,13 +44,13 @@ sub setFrameStyle {
   my $self = shift;
 
   my $frame = shift;
-  my $repaint = shift;
+  my $tqrepaint = shift;
 
   $self->sendMessage('iCommand' => $::PUKE_QFRAME_SET_FRAME,
 		     'iArg' => $frame,
 		    'CallBack' => sub {});
 
-  $self->repaint(1) if($repaint == 1);
+  $self->tqrepaint(1) if($tqrepaint == 1);
 
 }
 
diff --git a/ksirc/puke/plabel.cpp b/ksirc/puke/plabel.cpp
index 7567ac08..41a68636 100644
--- a/ksirc/puke/plabel.cpp
+++ b/ksirc/puke/plabel.cpp
@@ -83,7 +83,7 @@ void PLabel::messageHandler(int fd, PukeMessage *pm)
     if(!checkWidget())
       return;
 
-    widget()->setAlignment(pm->iArg);
+    widget()->tqsetAlignment(pm->iArg);
     pmRet.iCommand = - pm->iCommand;
     pmRet.iWinId = pm->iWinId;
     pmRet.iArg = 0;
diff --git a/ksirc/puke/plabel.pm b/ksirc/puke/plabel.pm
index bc557b5e..efdcf490 100644
--- a/ksirc/puke/plabel.pm
+++ b/ksirc/puke/plabel.pm
@@ -83,7 +83,7 @@ sub text {
 
 
 
-sub setAlignment {
+sub tqsetAlignment {
   my $self = shift;
   
   my $align = shift;
diff --git a/ksirc/puke/playout.cpp b/ksirc/puke/playout.cpp
index 9bcdfa2a..3dbe5c87 100644
--- a/ksirc/puke/playout.cpp
+++ b/ksirc/puke/playout.cpp
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
 
-#include "playout.h"
+#include "ptqlayout.h"
 #include "commands.h"
 
 PLayout::PLayout(TQObject *pobject)
@@ -16,7 +16,7 @@ PLayout::~PLayout()
   //  kdDebug(5008) << "PObject: in destructor" << endl;
   /*
   delete widget();
-  layout = 0;
+  tqlayout = 0;
   setWidget();
   */
 }
@@ -34,12 +34,12 @@ PObject *PLayout::createWidget(CreateArgs &ca)
   if((ca.parent != 0) &&
      (ca.parent->widget()->isWidgetType() == TRUE)){
     qbl = new TQBoxLayout((TQWidget *) ca.parent->widget(), (TQBoxLayout::Direction) direction, border);
-    //      kdDebug(5008) << "Creating layout with parent: " << parent.iWinId << endl;
+    //      kdDebug(5008) << "Creating tqlayout with parent: " << parent.iWinId << endl;
 
   }
   else{
     qbl = new TQBoxLayout((TQBoxLayout::Direction) direction, border);
-    //      kdDebug(5008) << "Creating layout NO PARENT" << endl;
+    //      kdDebug(5008) << "Creating tqlayout NO PARENT" << endl;
   }
   pw->setWidget(qbl);
   pw->setWidgetId(ca.pwI);
@@ -142,16 +142,16 @@ void PLayout::setWidget(TQObject *_layout)
      return;
   }
 
-  layout = (TQBoxLayout *) _layout;
+  tqlayout = (TQBoxLayout *) _layout;
   PObject::setWidget(_layout);
   
 }
 
 TQBoxLayout *PLayout::widget()
 {
-  return layout;
+  return tqlayout;
 }
 
 
-#include "playout.moc"
+#include "ptqlayout.moc"
 
diff --git a/ksirc/puke/playout.h b/ksirc/puke/playout.h
index 439a87a2..4124cb14 100644
--- a/ksirc/puke/playout.h
+++ b/ksirc/puke/playout.h
@@ -4,7 +4,7 @@
 class PLayout;
 
 #include <tqobject.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include "pmessage.h"
 #include "pobject.h"
 
@@ -36,7 +36,7 @@ public:
 
 private:
 
-  TQBoxLayout *layout;
+  TQBoxLayout *tqlayout;
 
 };
 
diff --git a/ksirc/puke/pobject.cpp b/ksirc/puke/pobject.cpp
index 9e46e042..ab729315 100644
--- a/ksirc/puke/pobject.cpp
+++ b/ksirc/puke/pobject.cpp
@@ -131,7 +131,7 @@ void PObject::manTerm() {
 
 void PObject::errorInvalidSet(TQObject *_w)
 { 
-  m_error = TQString("Tried setting a %1 to %2").arg(_w->className()).arg(className());
+  m_error = TQString("Tried setting a %1 to %2").tqarg(_w->className()).tqarg(className());
   m_hasError = true;
 }
 #include "pobject.moc"
diff --git a/ksirc/puke/pwidget.cpp b/ksirc/puke/pwidget.cpp
index b62f64c1..cf3ac667 100644
--- a/ksirc/puke/pwidget.cpp
+++ b/ksirc/puke/pwidget.cpp
@@ -90,7 +90,7 @@ void PWidget::messageHandler(int fd, PukeMessage *pm)
     emit outputMessage(fd, &pmRet);
     break;    
   case PUKE_WIDGET_REPAINT:
-    widget()->repaint(pm->iArg);
+    widget()->tqrepaint(pm->iArg);
     pmRet.iCommand = PUKE_WIDGET_REPAINT_ACK;
     pmRet.iWinId = pm->iWinId;
     pmRet.iArg = 0;
@@ -209,12 +209,12 @@ void PWidget::messageHandler(int fd, PukeMessage *pm)
       int *pos;
       pos = (int *) pm->cArg;
       TQColor bg(pos[0], pos[1], pos[2]);
-      TQColorGroup cg = TQColorGroup(widget()->colorGroup().foreground(),
+      TQColorGroup cg = TQColorGroup(widget()->tqcolorGroup().foreground(),
                                    bg,
-                                   widget()->colorGroup().light(),
-                                   widget()->colorGroup().dark(),
-                                   widget()->colorGroup().mid(),
-                                   widget()->colorGroup().text(),
+                                   widget()->tqcolorGroup().light(),
+                                   widget()->tqcolorGroup().dark(),
+                                   widget()->tqcolorGroup().mid(),
+                                   widget()->tqcolorGroup().text(),
                                    bg);
       widget()->setPalette(TQPalette(cg,cg,cg));
 
diff --git a/ksirc/puke/pwidget.pm b/ksirc/puke/pwidget.pm
index 5a73d393..56381db6 100644
--- a/ksirc/puke/pwidget.pm
+++ b/ksirc/puke/pwidget.pm
@@ -61,7 +61,7 @@ sub hide {
   $self->sendMessage('iCommand' => $::PUKE_WIDGET_HIDE);
 }
 
-sub repaint {
+sub tqrepaint {
   my $self = shift;
   
   my $erase = shift; # 1 for erase and reapint
diff --git a/ksirc/puke/small.pl b/ksirc/puke/small.pl
index 7e7b251d..fdeae902 100644
--- a/ksirc/puke/small.pl
+++ b/ksirc/puke/small.pl
@@ -1,7 +1,7 @@
 &docommand("/load pbase.pm");
 &docommand("/load pwidget.pm");
 &docommand("/load pframe.pm");
-&docommand("/load pboxlayout.pm");
+&docommand("/load pboxtqlayout.pm");
 &docommand("/load plined.pm");
 &docommand("/load pbutton.pm");
 &docommand("/load ppushbt.pm");
diff --git a/ksirc/puke/test.pl b/ksirc/puke/test.pl
index 4b4c3169..369a2dc9 100644
--- a/ksirc/puke/test.pl
+++ b/ksirc/puke/test.pl
@@ -1,7 +1,7 @@
 &docommand("/load pbase.pm");
 &docommand("/load pwidget.pm");
 &docommand("/load pframe.pm");
-&docommand("/load pboxlayout.pm");
+&docommand("/load pboxtqlayout.pm");
 &docommand("/load plined.pm");
 &docommand("/load pbutton.pm");
 &docommand("/load ppushbt.pm");
diff --git a/ksirc/puke/user_monitor.ks b/ksirc/puke/user_monitor.ks
index a0b2a56a..d73fa513 100644
--- a/ksirc/puke/user_monitor.ks
+++ b/ksirc/puke/user_monitor.ks
@@ -3,7 +3,7 @@
 &docommand("/load pframe.pm");
 &docommand("/load ptablevw.pm");
 &docommand("/load plistbox.pm");
-&docommand("/load pboxlayout.pm");
+&docommand("/load pboxtqlayout.pm");
 &docommand("/load plabel.pm");
 &docommand("/load pmenudta.pm");
 &docommand("/load ppopmenu.pm");