Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 1329ec6abbcb7b79cd960e0ca138f16598d5f11f)

9 files changed, 44 insertions, 44 deletions

diff --git a/ksirc/puke/controller.cpp b/ksirc/puke/controller.cpp
index 06d290fb..a854cd60 100644
--- a/ksirc/puke/controller.cpp
+++ b/ksirc/puke/controller.cpp
@@ -103,11 +103,11 @@ PukeController::PukeController(TQString sock, TQObject *parent, const char *name
                                           // accept() never blocks.
 
   qsnListen = new TQSocketNotifier(iListenFd, TQSocketNotifier::Read, this, TQString(name) + "_iListen");
-  connect(qsnListen, TQT_SIGNAL(activated(int)),
-	  this, TQT_SLOT(NewConnect(int)));
+  connect(qsnListen, TQ_SIGNAL(activated(int)),
+	  this, TQ_SLOT(NewConnect(int)));
 
-  connect(objFind, TQT_SIGNAL(inserted(TQObject *)),
-          this, TQT_SLOT(slotInserted(TQObject *)));
+  connect(objFind, TQ_SIGNAL(inserted(TQObject *)),
+          this, TQ_SLOT(slotInserted(TQObject *)));
 
   qidConnectFd.setAutoDelete(TRUE);
 
@@ -124,8 +124,8 @@ PukeController::PukeController(TQString sock, TQObject *parent, const char *name
    * Connect outputMessage to the acutal write buffer function
    * outputMessage signals from pobjects are chained until they finally reach us.
    */
-  connect(this, TQT_SIGNAL(outputMessage(int, PukeMessage *)),
-	  this,  TQT_SLOT(writeBuffer(int, PukeMessage *)));
+  connect(this, TQ_SIGNAL(outputMessage(int, PukeMessage *)),
+	  this,  TQ_SLOT(writeBuffer(int, PukeMessage *)));
 
   initHdlr(); // Setup message command handlers.
 
@@ -176,10 +176,10 @@ void PukeController::NewConnect(int)
   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)),
-	  this, TQT_SLOT(Traffic(int)));
-  connect(fds->sw, TQT_SIGNAL(activated(int)),
-	  this, TQT_SLOT(Writeable(int)));
+  connect(fds->sr, TQ_SIGNAL(activated(int)),
+	  this, TQ_SLOT(Traffic(int)));
+  connect(fds->sw, TQ_SIGNAL(activated(int)),
+	  this, TQ_SLOT(Writeable(int)));
   qidConnectFd.insert(cfd, fds);
   qsnListen->setEnabled(TRUE);
 
@@ -609,8 +609,8 @@ void PukeController::hdlrPukeFetchWidget(int fd, PukeMessage *pm)
   }
   ws->type = iType;
 
-  connect(ws->pwidget, TQT_SIGNAL(outputMessage(int, PukeMessage*)),
-	  this, TQT_SIGNAL(outputMessage(int, PukeMessage*)));
+  connect(ws->pwidget, TQ_SIGNAL(outputMessage(int, PukeMessage*)),
+	  this, TQ_SIGNAL(outputMessage(int, PukeMessage*)));
 
   // insertPBoject(fd, uiBaseWinId, ws);
   // The widget list has to exist since we have ourselves in the list
@@ -796,8 +796,8 @@ void PukeController::insertPObject(int fd, int iWinId, WidgetS *obj){
 
   // Now connect to the destroyed signal so we can remove the object from the lists
   // Once it is deleted
-  connect(obj->pwidget, TQT_SIGNAL(destroyed()),
-          this, TQT_SLOT(pobjectDestroyed()));
+  connect(obj->pwidget, TQ_SIGNAL(destroyed()),
+          this, TQ_SLOT(pobjectDestroyed()));
 }
 
 void PukeController::pobjectDestroyed(){
@@ -959,8 +959,8 @@ widgetId PukeController::createWidget(widgetId wI, PukeMessage *pm)
   }
   ws->type = iType;
 
-  connect(ws->pwidget, TQT_SIGNAL(outputMessage(int, PukeMessage*)),
-	  this, TQT_SIGNAL(outputMessage(int, PukeMessage*)));
+  connect(ws->pwidget, TQ_SIGNAL(outputMessage(int, PukeMessage*)),
+	  this, TQ_SIGNAL(outputMessage(int, PukeMessage*)));
 
   // insertPBoject(fd, uiBaseWinId, ws);
   // The widget list has to exist since we have ourselves in the list
diff --git a/ksirc/puke/pbutton.cpp b/ksirc/puke/pbutton.cpp
index edccbe81..6f128464 100644
--- a/ksirc/puke/pbutton.cpp
+++ b/ksirc/puke/pbutton.cpp
@@ -92,14 +92,14 @@ void PButton::setWidget(TQObject *_qb)
 
   button = (TQButton *) _qb;
   if(button != 0){
-    connect(button, TQT_SIGNAL(pressed()),
-	    this, TQT_SLOT(buttonPressed()));
-    connect(button, TQT_SIGNAL(released()),
-	    this, TQT_SLOT(buttonReleased()));
-    connect(button, TQT_SIGNAL(clicked()),
-	    this, TQT_SLOT(buttonClicked()));
-    connect(button, TQT_SIGNAL(toggled(bool)),
-	    this, TQT_SLOT(buttonToggled(bool)));
+    connect(button, TQ_SIGNAL(pressed()),
+	    this, TQ_SLOT(buttonPressed()));
+    connect(button, TQ_SIGNAL(released()),
+	    this, TQ_SLOT(buttonReleased()));
+    connect(button, TQ_SIGNAL(clicked()),
+	    this, TQ_SLOT(buttonClicked()));
+    connect(button, TQ_SIGNAL(toggled(bool)),
+	    this, TQ_SLOT(buttonToggled(bool)));
     
   }
   PWidget::setWidget(_qb);
diff --git a/ksirc/puke/plined.cpp b/ksirc/puke/plined.cpp
index 56a4ddc0..1817e0a9 100644
--- a/ksirc/puke/plined.cpp
+++ b/ksirc/puke/plined.cpp
@@ -111,10 +111,10 @@ void PLineEdit::setWidget(TQObject *_le)
 
   lineedit = (TQLineEdit *) _le;
   if(lineedit != 0){
-    connect(lineedit, TQT_SIGNAL(textChanged(const char *)),
-	    this, TQT_SLOT(updateText(const char *)));
-    connect(lineedit, TQT_SIGNAL(returnPressed()),
-	    this, TQT_SLOT(returnPress()));
+    connect(lineedit, TQ_SIGNAL(textChanged(const char *)),
+	    this, TQ_SLOT(updateText(const char *)));
+    connect(lineedit, TQ_SIGNAL(returnPressed()),
+	    this, TQ_SLOT(returnPress()));
   }
   PWidget::setWidget(_le);
 
diff --git a/ksirc/puke/plistbox.cpp b/ksirc/puke/plistbox.cpp
index d0b98305..b8f9b8b8 100644
--- a/ksirc/puke/plistbox.cpp
+++ b/ksirc/puke/plistbox.cpp
@@ -160,10 +160,10 @@ void PListBox::setWidget(TQObject *_lb)
 
   lb = (TQListBox *) _lb;
   if(lb != 0){
-    connect(lb, TQT_SIGNAL(highlighted(int)),
-            this, TQT_SLOT(highlighted(int)));
-    connect(lb, TQT_SIGNAL(selected(int)),
-            this, TQT_SLOT(selected(int)));
+    connect(lb, TQ_SIGNAL(highlighted(int)),
+            this, TQ_SLOT(highlighted(int)));
+    connect(lb, TQ_SIGNAL(selected(int)),
+            this, TQ_SLOT(selected(int)));
   }
   PFrame::setWidget(lb);
 
diff --git a/ksirc/puke/pmenudta.cpp b/ksirc/puke/pmenudta.cpp
index 576ebc39..1bf7f9bd 100644
--- a/ksirc/puke/pmenudta.cpp
+++ b/ksirc/puke/pmenudta.cpp
@@ -7,8 +7,8 @@ PMenuData::PMenuData(PObject *_child)
 : PObject()
 {
   child = _child;
-  connect(this, TQT_SIGNAL(outputMessage(int, PukeMessage*)),
-          child, TQT_SIGNAL(outputMessage(int, PukeMessage*)));
+  connect(this, TQ_SIGNAL(outputMessage(int, PukeMessage*)),
+          child, TQ_SIGNAL(outputMessage(int, PukeMessage*)));
 }
 
 PMenuData::~PMenuData()
diff --git a/ksirc/puke/pobject.cpp b/ksirc/puke/pobject.cpp
index 99be1274..28a305c1 100644
--- a/ksirc/puke/pobject.cpp
+++ b/ksirc/puke/pobject.cpp
@@ -83,14 +83,14 @@ void PObject::setWidget(TQObject *_o)
   // Disconnect everything from the object we where listning too
   // Just in case it fires something off, we don't want to get it
   if(widget() != 0){
-    disconnect(widget(), TQT_SIGNAL(destroyed()),
-               this, TQT_SLOT(swidgetDestroyed()));
+    disconnect(widget(), TQ_SIGNAL(destroyed()),
+               this, TQ_SLOT(swidgetDestroyed()));
   }
   
   obj = _o;
   if(obj != 0){
-    connect(widget(), TQT_SIGNAL(destroyed()),
-	    this, TQT_SLOT(swidgetDestroyed()));
+    connect(widget(), TQ_SIGNAL(destroyed()),
+	    this, TQ_SLOT(swidgetDestroyed()));
   }
 }
 
diff --git a/ksirc/puke/pobjfinder.cpp b/ksirc/puke/pobjfinder.cpp
index 2931ec77..27f5ce1e 100644
--- a/ksirc/puke/pobjfinder.cpp
+++ b/ksirc/puke/pobjfinder.cpp
@@ -19,8 +19,8 @@ PObjFinder::PObjFinder(PObject *parent)
   // We don't actually encase a widget since all the ObjFinder interface
   // is static
   setWidget(0x0);
-  connect(controller(), TQT_SIGNAL(inserted(TQObject *)),
-          this, TQT_SLOT(newObject(TQObject *)));
+  connect(controller(), TQ_SIGNAL(inserted(TQObject *)),
+          this, TQ_SLOT(newObject(TQObject *)));
 }
 
 PObjFinder::~PObjFinder()
diff --git a/ksirc/puke/ppopmenu.cpp b/ksirc/puke/ppopmenu.cpp
index d50f6610..fe8bb1f7 100644
--- a/ksirc/puke/ppopmenu.cpp
+++ b/ksirc/puke/ppopmenu.cpp
@@ -89,8 +89,8 @@ void PPopupMenu::setWidget(TQObject *_menu)
 
   menu = (TQPopupMenu *) _menu;
   if(menu != 0x0){
-    connect(menu, TQT_SIGNAL(activated(int)),
-            this, TQT_SLOT(got_activated(int)));
+    connect(menu, TQ_SIGNAL(activated(int)),
+            this, TQ_SLOT(got_activated(int)));
   }
   PFrame::setWidget(menu);
 }
diff --git a/ksirc/puke/pprogress.cpp b/ksirc/puke/pprogress.cpp
index e1a6203c..4666fa59 100644
--- a/ksirc/puke/pprogress.cpp
+++ b/ksirc/puke/pprogress.cpp
@@ -115,8 +115,8 @@ void PProgress::setWidget(TQObject *_f)
 
   ksp = (KSProgress *) _f;
   if(widget() != 0){
-    connect(widget(), TQT_SIGNAL(cancel()),
-            this, TQT_SLOT(cancelPressed()));
+    connect(widget(), TQ_SIGNAL(cancel()),
+            this, TQ_SLOT(cancelPressed()));
   }
   PWidget::setWidget(ksp);