Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1157648 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 30 insertions, 30 deletions

diff --git a/ksirc/puke/controller.cpp b/ksirc/puke/controller.cpp
index 1e798be7..04017529 100644
--- a/ksirc/puke/controller.cpp
+++ b/ksirc/puke/controller.cpp
@@ -16,7 +16,7 @@
 
 using namespace std; // iostream.h include cstring which puts strlen into 
                      // std:: namespace, which breaks Qt's strlen() call 
-                     // in qcstring.h (in gcc3's libstdc++)
+                     // in tqcstring.h (in gcc3's libstdc++)
 
 #include <klibloader.h>
 #include <kdebug.h>
@@ -50,7 +50,7 @@ using namespace std; // iostream.h include cstring which puts strlen into
 
 uint PukeController::uiBaseWinId = 10; // Gives a little seperation from the controller id
 
-PukeController::PukeController(QString sock, QObject *parent, const char *name) : PObject( parent, name )
+PukeController::PukeController(TQString sock, TQObject *parent, const char *name) : PObject( parent, name )
 {
   int len, prev_umask;
   struct sockaddr_un unix_addr;
@@ -102,12 +102,12 @@ PukeController::PukeController(QString sock, QObject *parent, const char *name)
   fcntl(iListenFd, F_SETFL, O_NONBLOCK);  // Set it non-block so that
                                           // accept() never blocks.
 
-  qsnListen = new QSocketNotifier(iListenFd, QSocketNotifier::Read, this, QString(name) + "_iListen");
-  connect(qsnListen, SIGNAL(activated(int)),
-	  this, SLOT(NewConnect(int)));
+  qsnListen = new TQSocketNotifier(iListenFd, TQSocketNotifier::Read, this, TQString(name) + "_iListen");
+  connect(qsnListen, TQT_SIGNAL(activated(int)),
+	  this, TQT_SLOT(NewConnect(int)));
 
-  connect(objFind, SIGNAL(inserted(QObject *)),
-          this, SLOT(slotInserted(QObject *)));
+  connect(objFind, TQT_SIGNAL(inserted(TQObject *)),
+          this, TQT_SLOT(slotInserted(TQObject *)));
 
   qidConnectFd.setAutoDelete(TRUE);
 
@@ -124,8 +124,8 @@ PukeController::PukeController(QString sock, QObject *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, SIGNAL(outputMessage(int, PukeMessage *)),
-	  this,  SLOT(writeBuffer(int, PukeMessage *)));
+  connect(this, TQT_SIGNAL(outputMessage(int, PukeMessage *)),
+	  this,  TQT_SLOT(writeBuffer(int, PukeMessage *)));
 
   initHdlr(); // Setup message command handlers.
 
@@ -142,7 +142,7 @@ PukeController::PukeController(QString sock, QObject *parent, const char *name)
 }
 
 void
-PukeController::slotInserted(QObject *obj)
+PukeController::slotInserted(TQObject *obj)
 {
   emit inserted(obj);
 }
@@ -154,7 +154,7 @@ PukeController::~PukeController()
   unlink(qsPukeSocket);
 }
 
-QStrList PukeController::allObjects()
+TQStrList PukeController::allObjects()
 {
   return objFinder::allObjects();
 }
@@ -174,12 +174,12 @@ void PukeController::NewConnect(int)
                                     // cfd() never blocks.
 
   fdStatus *fds = new fdStatus();
-  fds->sr = new QSocketNotifier(cfd, QSocketNotifier::Read, this);
-  fds->sw = new QSocketNotifier(cfd, QSocketNotifier::Write, this);
-  connect(fds->sr, SIGNAL(activated(int)),
-	  this, SLOT(Traffic(int)));
-  connect(fds->sw, SIGNAL(activated(int)),
-	  this, SLOT(Writeable(int)));
+  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)));
   qidConnectFd.insert(cfd, fds);
   qsnListen->setEnabled(TRUE);
 
@@ -350,7 +350,7 @@ void PukeController::Traffic(int fd)
 }
 
 
-void PukeController::ServMessage(QString, int, QString) 
+void PukeController::ServMessage(TQString, int, TQString) 
 {
 
 }
@@ -585,7 +585,7 @@ void PukeController::hdlrPukeFetchWidget(int fd, PukeMessage *pm)
 
   // Let's go looking for the widget
   // Match any class with the right name
-  QObject *obj = 0x0;
+  TQObject *obj = 0x0;
   if(parent() && (strcmp(name, parent()->name()) == 0)){
     obj = parent();
   }
@@ -609,8 +609,8 @@ void PukeController::hdlrPukeFetchWidget(int fd, PukeMessage *pm)
   }
   ws->type = iType;
 
-  connect(ws->pwidget, SIGNAL(outputMessage(int, PukeMessage*)),
-	  this, SIGNAL(outputMessage(int, PukeMessage*)));
+  connect(ws->pwidget, TQT_SIGNAL(outputMessage(int, PukeMessage*)),
+	  this, TQT_SIGNAL(outputMessage(int, PukeMessage*)));
 
   // insertPBoject(fd, uiBaseWinId, ws);
   // The widget list has to exist since we have ourselves in the list
@@ -637,7 +637,7 @@ void PukeController::hdlrPukeDeleteWidget(int fd, PukeMessage *pm)
     throw(errorCommandFailed(PUKE_INVALID, INVALID_DEL_NO_CONTROL));
 
   /*
-  QIntDict<WidgetS> *qidWS = WidgetList[fd];
+  TQIntDict<WidgetS> *qidWS = WidgetList[fd];
   if(qidWS == 0){
     kdDebug(5008) << "WidgetRunner:: no such set of widget descriptors?" << endl;
     throw(errorCommandFailed(PUKE_INVALID, INVALID_DEL_NO_SUCH_CONNECTION));
@@ -691,7 +691,7 @@ void PukeController::closefd(int fd)
   /*
    * Now let's remove all traces of the widgets
    */
-  QIntDict<WidgetS> *qidWS = WidgetList[fd];
+  TQIntDict<WidgetS> *qidWS = WidgetList[fd];
   if(qidWS == 0){
     kdDebug(5008) << "WidgetRunner:: Close called twice?" << endl;
     bClosing = FALSE;
@@ -702,7 +702,7 @@ void PukeController::closefd(int fd)
 
   do {
 
-    QIntDictIterator<WidgetS> it(*qidWS);
+    TQIntDictIterator<WidgetS> it(*qidWS);
     if(it.count() == 0){
       kdDebug(5008) << "WidgetRunner: nothing left to delete\n" << endl;
       break;
@@ -778,7 +778,7 @@ PWidget *PukeController::id2pwidget(widgetId *pwi){
 void PukeController::insertPObject(int fd, int iWinId, WidgetS *obj){ 
   // If no widget list exists for this fd, create one
   if(WidgetList[fd] == NULL){
-    QIntDict<WidgetS> *qidWS = new QIntDict<WidgetS>;
+    TQIntDict<WidgetS> *qidWS = new TQIntDict<WidgetS>;
     qidWS->setAutoDelete(TRUE);
     WidgetList.insert(fd, qidWS);
   }
@@ -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, SIGNAL(destroyed()),
-          this, SLOT(pobjectDestroyed()));
+  connect(obj->pwidget, TQT_SIGNAL(destroyed()),
+          this, TQT_SLOT(pobjectDestroyed()));
 }
 
 void PukeController::pobjectDestroyed(){
@@ -868,7 +868,7 @@ void PukeController::messageHandler(int fd, PukeMessage *pm) {
       return;
     }
 
-    QString libName = "ksirc/lib"+QString::fromLatin1(pm->cArg);
+    TQString libName = "ksirc/lib"+TQString::fromLatin1(pm->cArg);
     if (libName.right(3) == ".so")
        libName = libName.left(libName.length()-2)+"la";
 
@@ -959,8 +959,8 @@ widgetId PukeController::createWidget(widgetId wI, PukeMessage *pm)
   }
   ws->type = iType;
 
-  connect(ws->pwidget, SIGNAL(outputMessage(int, PukeMessage*)),
-	  this, SIGNAL(outputMessage(int, PukeMessage*)));
+  connect(ws->pwidget, TQT_SIGNAL(outputMessage(int, PukeMessage*)),
+	  this, TQT_SIGNAL(outputMessage(int, PukeMessage*)));
 
   // insertPBoject(fd, uiBaseWinId, ws);
   // The widget list has to exist since we have ourselves in the list