Rename old tq methods that no longer need a unique name

6 files changed, 16 insertions, 16 deletions

diff --git a/ksirc/puke/controller.cpp b/ksirc/puke/controller.cpp
index 20c020c7..5a646973 100644
--- a/ksirc/puke/controller.cpp
+++ b/ksirc/puke/controller.cpp
@@ -173,7 +173,7 @@ void PukeController::NewConnect(int)
   fcntl(cfd, F_SETFL, O_NONBLOCK);  // Set it non-block so that
                                     // cfd() never blocks.
 
-  fdtqStatus *fds = new fdtqStatus();
+  fdStatus *fds = new fdStatus();
   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::tqfromLatin1(pm->cArg);
+    TQString libName = "ksirc/lib"+TQString::fromLatin1(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 92c8be98..c2a086f7 100644
--- a/ksirc/puke/controller.h
+++ b/ksirc/puke/controller.h
@@ -27,7 +27,7 @@ typedef struct {
   TQString server;
   bool writeable;
   TQSocketNotifier *sr,*sw;
-} fdtqStatus;
+} fdStatus;
 
 
 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<fdtqStatus> qidConnectFd;
+  TQIntDict<fdStatus> qidConnectFd;
 
   /**
    * Controller ID is defined as 1
diff --git a/ksirc/puke/dcc_status.pm b/ksirc/puke/dcc_status.pm
index 799c8cf5..410437e7 100644
--- a/ksirc/puke/dcc_status.pm
+++ b/ksirc/puke/dcc_status.pm
@@ -123,7 +123,7 @@ sub sendClicked {
 
 use vars qw(@ISA $KSIRC_DCC %KSIRC_DCC);
 
-package DCCtqStatus;
+package DCCStatus;
 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 DCCtqStatus;
+    $KSIRC_DCCSTATUS = new DCCStatus;
     $KSIRC_DCCSTATUS->resize(400, 275);
   }
 
@@ -473,13 +473,13 @@ addhook("dcc_disconnect", "ksirc_dcc_disconnect");
 
 
 &print("*I* Done DCC Status");
-#$::test = new DCCtqStatus;
+#$::test = new DCCStatus;
 #$::test->resize(400, 275);
 #$::test->show();
 
 sub popup_dccstatus{
   if($KSIRC_DCCSTATUS == undef){
-    $KSIRC_DCCSTATUS = new DCCtqStatus;
+    $KSIRC_DCCSTATUS = new DCCStatus;
     $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 DCCtqStatus;
+    $KSIRC_DCCSTATUS = new DCCStatus;
     $KSIRC_DCCSTATUS->resize(400, 275);
   }
   $KSIRC_DCCSTATUS->sendClicked();
diff --git a/ksirc/puke/plabel.cpp b/ksirc/puke/plabel.cpp
index 41a68636..7567ac08 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()->tqsetAlignment(pm->iArg);
+    widget()->setAlignment(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 efdcf490..bc557b5e 100644
--- a/ksirc/puke/plabel.pm
+++ b/ksirc/puke/plabel.pm
@@ -83,7 +83,7 @@ sub text {
 
 
 
-sub tqsetAlignment {
+sub setAlignment {
   my $self = shift;
   
   my $align = shift;
diff --git a/ksirc/puke/pwidget.cpp b/ksirc/puke/pwidget.cpp
index cf3ac667..af041c19 100644
--- a/ksirc/puke/pwidget.cpp
+++ b/ksirc/puke/pwidget.cpp
@@ -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()->tqcolorGroup().foreground(),
+      TQColorGroup cg = TQColorGroup(widget()->colorGroup().foreground(),
                                    bg,
-                                   widget()->tqcolorGroup().light(),
-                                   widget()->tqcolorGroup().dark(),
-                                   widget()->tqcolorGroup().mid(),
-                                   widget()->tqcolorGroup().text(),
+                                   widget()->colorGroup().light(),
+                                   widget()->colorGroup().dark(),
+                                   widget()->colorGroup().mid(),
+                                   widget()->colorGroup().text(),
                                    bg);
       widget()->setPalette(TQPalette(cg,cg,cg));