Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

13 files changed, 106 insertions, 106 deletions

diff --git a/kpf/src/ActiveMonitor.cpp b/kpf/src/ActiveMonitor.cpp
index a783f0bf..f22f3b98 100644
--- a/kpf/src/ActiveMonitor.cpp
+++ b/kpf/src/ActiveMonitor.cpp
@@ -64,29 +64,29 @@ namespace KPF
     connect
       (
        view_,
-       TQT_SIGNAL(selectionChanged()),
-       TQT_SLOT(slotSelectionChanged())
+       TQ_SIGNAL(selectionChanged()),
+       TQ_SLOT(slotSelectionChanged())
       );
 
     connect
       (
        server_,
-       TQT_SIGNAL(connection(Server *)),
-       TQT_SLOT(slotConnection(Server *))
+       TQ_SIGNAL(connection(Server *)),
+       TQ_SLOT(slotConnection(Server *))
       );
 
     connect
       (
        server_,
-       TQT_SIGNAL(output(Server *, ulong)),
-       TQT_SLOT(slotOutput(Server *, ulong))
+       TQ_SIGNAL(output(Server *, ulong)),
+       TQ_SLOT(slotOutput(Server *, ulong))
       );
 
-    connect(server_, TQT_SIGNAL(finished(Server *)),  TQT_SLOT(slotFinished(Server *)));
-    connect(server_, TQT_SIGNAL(request(Server *)),   TQT_SLOT(slotRequest(Server *)));
-    connect(server_, TQT_SIGNAL(response(Server *)),  TQT_SLOT(slotResponse(Server *)));
+    connect(server_, TQ_SIGNAL(finished(Server *)),  TQ_SLOT(slotFinished(Server *)));
+    connect(server_, TQ_SIGNAL(request(Server *)),   TQ_SLOT(slotRequest(Server *)));
+    connect(server_, TQ_SIGNAL(response(Server *)),  TQ_SLOT(slotResponse(Server *)));
 
-    connect(&cullTimer_, TQT_SIGNAL(timeout()), TQT_SLOT(slotCull()));
+    connect(&cullTimer_, TQ_SIGNAL(timeout()), TQ_SLOT(slotCull()));
 
     cullTimer_.start(1000);
 
diff --git a/kpf/src/ActiveMonitorWindow.cpp b/kpf/src/ActiveMonitorWindow.cpp
index ac7fbe31..613dc5b7 100644
--- a/kpf/src/ActiveMonitorWindow.cpp
+++ b/kpf/src/ActiveMonitorWindow.cpp
@@ -52,7 +52,7 @@ namespace KPF
         "process-stop",
         0,
         monitor_,
-        TQT_SLOT(slotKillSelected()),
+        TQ_SLOT(slotKillSelected()),
         actionCollection(),
         "kill"
       );
diff --git a/kpf/src/Applet.cpp b/kpf/src/Applet.cpp
index dca2c4aa..da45c5f4 100644
--- a/kpf/src/Applet.cpp
+++ b/kpf/src/Applet.cpp
@@ -109,15 +109,15 @@ namespace KPF
     connect
       (
        WebServerManager::instance(),
-       TQT_SIGNAL(serverCreated(WebServer *)),
-       TQT_SLOT(slotServerCreated(WebServer *))
+       TQ_SIGNAL(serverCreated(WebServer *)),
+       TQ_SLOT(slotServerCreated(WebServer *))
       );
 
     connect
       (
        WebServerManager::instance(),
-       TQT_SIGNAL(serverDisabled(WebServer *)),
-       TQT_SLOT(slotServerDisabled(WebServer *))
+       TQ_SIGNAL(serverDisabled(WebServer *)),
+       TQ_SLOT(slotServerDisabled(WebServer *))
       );
 
     WebServerManager::instance()->loadConfig();
@@ -316,8 +316,8 @@ namespace KPF
       connect
         (
          wizard_,
-         TQT_SIGNAL(dying(ServerWizard *)),
-         TQT_SLOT(slotWizardDying(ServerWizard *))
+         TQ_SIGNAL(dying(ServerWizard *)),
+         TQ_SLOT(slotWizardDying(ServerWizard *))
         );
 
       wizard_->setLocation(location);
@@ -338,8 +338,8 @@ namespace KPF
       connect
         (
          wizard_,
-         TQT_SIGNAL(dying(ServerWizard *)),
-         TQT_SLOT(slotWizardDying(ServerWizard *))
+         TQ_SIGNAL(dying(ServerWizard *)),
+         TQ_SLOT(slotWizardDying(ServerWizard *))
         );
 
       wizard_->show();
@@ -438,15 +438,15 @@ namespace KPF
     connect
       (
        i,
-       TQT_SIGNAL(newServer()),
-       TQT_SLOT(slotNewServer())
+       TQ_SIGNAL(newServer()),
+       TQ_SLOT(slotNewServer())
       );
 
     connect
       (
        i,
-       TQT_SIGNAL(newServerAtLocation(const TQString &)),
-       TQT_SLOT(slotNewServerAtLocation(const TQString &))
+       TQ_SIGNAL(newServerAtLocation(const TQString &)),
+       TQ_SLOT(slotNewServerAtLocation(const TQString &))
       );
 
     itemList_.append(i);
diff --git a/kpf/src/AppletItem.cpp b/kpf/src/AppletItem.cpp
index e066200f..99e8e1d2 100644
--- a/kpf/src/AppletItem.cpp
+++ b/kpf/src/AppletItem.cpp
@@ -94,8 +94,8 @@ namespace KPF
     connect
       (
        monitorWindow_,
-       TQT_SIGNAL(dying(ActiveMonitorWindow *)),
-       TQT_SLOT(slotActiveMonitorWindowDying(ActiveMonitorWindow *))
+       TQ_SIGNAL(dying(ActiveMonitorWindow *)),
+       TQ_SLOT(slotActiveMonitorWindowDying(ActiveMonitorWindow *))
       );
   }
 
@@ -320,8 +320,8 @@ namespace KPF
     connect
       (
        monitorWindow_,
-       TQT_SIGNAL(dying(ActiveMonitorWindow *)),
-       TQT_SLOT(slotActiveMonitorWindowDying(ActiveMonitorWindow *))
+       TQ_SIGNAL(dying(ActiveMonitorWindow *)),
+       TQ_SLOT(slotActiveMonitorWindowDying(ActiveMonitorWindow *))
       );
 #endif
 
@@ -332,7 +332,7 @@ namespace KPF
     void
   AppletItem::removeServer()
   {
-    TQTimer::singleShot(0, this, TQT_SLOT(slotSuicide()));
+    TQTimer::singleShot(0, this, TQ_SLOT(slotSuicide()));
   }
 
     void
@@ -349,8 +349,8 @@ namespace KPF
     connect
       (
        configDialog_,
-       TQT_SIGNAL(dying(SingleServerConfigDialog *)),
-       TQT_SLOT(slotConfigDialogDying(SingleServerConfigDialog *))
+       TQ_SIGNAL(dying(SingleServerConfigDialog *)),
+       TQ_SLOT(slotConfigDialogDying(SingleServerConfigDialog *))
       );
 
     configDialog_->show();
diff --git a/kpf/src/BandwidthGraph.cpp b/kpf/src/BandwidthGraph.cpp
index 967d5048..8bb52e96 100644
--- a/kpf/src/BandwidthGraph.cpp
+++ b/kpf/src/BandwidthGraph.cpp
@@ -55,8 +55,8 @@ namespace KPF
     connect
       (
        server_,
-       TQT_SIGNAL(wholeServerOutput(ulong)),
-       TQT_SLOT(slotOutput(ulong))
+       TQ_SIGNAL(wholeServerOutput(ulong)),
+       TQ_SLOT(slotOutput(ulong))
       );
 
     if (UseOverlays == overlaySelect_)
@@ -64,15 +64,15 @@ namespace KPF
       connect
         (
          server_,
-         TQT_SIGNAL(contentionChange(bool)), this,
-         TQT_SLOT(slotServerContentionChange(bool))
+         TQ_SIGNAL(contentionChange(bool)), this,
+         TQ_SLOT(slotServerContentionChange(bool))
         );
 
       connect
         (
          server_,
-         TQT_SIGNAL(pauseChange(bool)), this,
-         TQT_SLOT(slotServerPauseChange(bool))
+         TQ_SIGNAL(pauseChange(bool)), this,
+         TQ_SLOT(slotServerPauseChange(bool))
         );
     }
 
diff --git a/kpf/src/ConfigDialogPage.cpp b/kpf/src/ConfigDialogPage.cpp
index c753ecae..178be7c4 100644
--- a/kpf/src/ConfigDialogPage.cpp
+++ b/kpf/src/ConfigDialogPage.cpp
@@ -113,8 +113,8 @@ namespace KPF
     connect
       (
        cb_customErrorMessages_,
-       TQT_SIGNAL(toggled(bool)),
-       TQT_SLOT(slotCustomErrorMessagesToggled(bool))
+       TQ_SIGNAL(toggled(bool)),
+       TQ_SLOT(slotCustomErrorMessagesToggled(bool))
       );
 #endif
 
@@ -122,8 +122,8 @@ namespace KPF
     connect
       (
        pb_errorMessages_,
-       TQT_SIGNAL(clicked()),
-       TQT_SLOT(slotConfigureErrorMessages())
+       TQ_SIGNAL(clicked()),
+       TQ_SLOT(slotConfigureErrorMessages())
       );
 #endif
 
@@ -197,22 +197,22 @@ namespace KPF
     connect
       (
         sb_listenPort_,
-        TQT_SIGNAL(valueChanged(int)),
-        TQT_SLOT(slotListenPortChanged(int))
+        TQ_SIGNAL(valueChanged(int)),
+        TQ_SLOT(slotListenPortChanged(int))
       );
 
     connect
       (
         sb_bandwidthLimit_,
-        TQT_SIGNAL(valueChanged(int)),
-        TQT_SLOT(slotBandwidthLimitChanged(int))
+        TQ_SIGNAL(valueChanged(int)),
+        TQ_SLOT(slotBandwidthLimitChanged(int))
       );
 
     connect
       (
         cb_followSymlinks_,
-        TQT_SIGNAL(toggled(bool)),
-        TQT_SLOT(slotFollowSymlinksToggled(bool))
+        TQ_SIGNAL(toggled(bool)),
+        TQ_SLOT(slotFollowSymlinksToggled(bool))
       );
 
 
diff --git a/kpf/src/DirSelectWidget.cpp b/kpf/src/DirSelectWidget.cpp
index 3b6acdd5..16070d39 100644
--- a/kpf/src/DirSelectWidget.cpp
+++ b/kpf/src/DirSelectWidget.cpp
@@ -52,8 +52,8 @@ namespace KPF
     connect
       (
         this,
-        TQT_SIGNAL(expanded(TQListViewItem *)),
-        TQT_SLOT(slotExpanded(TQListViewItem *))
+        TQ_SIGNAL(expanded(TQListViewItem *)),
+        TQ_SLOT(slotExpanded(TQListViewItem *))
       );
 
     TQListViewItem * root = new TQListViewItem(this, "/");
diff --git a/kpf/src/PropertiesDialogPlugin.cpp b/kpf/src/PropertiesDialogPlugin.cpp
index 43b9ccea..f6d95da5 100644
--- a/kpf/src/PropertiesDialogPlugin.cpp
+++ b/kpf/src/PropertiesDialogPlugin.cpp
@@ -201,15 +201,15 @@ namespace KPF
     connect
       (
        kapp->dcopClient(),
-       TQT_SIGNAL(applicationRegistered(const TQCString &)),
-       TQT_SLOT(slotApplicationRegistered(const TQCString &))
+       TQ_SIGNAL(applicationRegistered(const TQCString &)),
+       TQ_SLOT(slotApplicationRegistered(const TQCString &))
       );
 
     connect
       (
        kapp->dcopClient(),
-       TQT_SIGNAL(applicationRemoved(const TQCString &)),
-       TQT_SLOT(slotApplicationUnregistered(const TQCString &))
+       TQ_SIGNAL(applicationRemoved(const TQCString &)),
+       TQ_SLOT(slotApplicationUnregistered(const TQCString &))
       );
 
     d->kpfRunning = kapp->dcopClient()->isApplicationRegistered("kpf");
@@ -309,7 +309,7 @@ namespace KPF
 
     l->addStretch(1);
 
-    connect(d->pb_startKPF, TQT_SIGNAL(clicked()), TQT_SLOT(slotStartKPF()));
+    connect(d->pb_startKPF, TQ_SIGNAL(clicked()), TQ_SLOT(slotStartKPF()));
 
     return w;
   }
@@ -453,51 +453,51 @@ namespace KPF
     TQWhatsThis::add(d->le_serverName,       serverNameHelp);
     TQWhatsThis::add(d->cb_followSymlinks,   followSymlinksHelp);
 
-    connect(d->cb_share, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSharingToggled(bool)));
+    connect(d->cb_share, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSharingToggled(bool)));
 
     slotSharingToggled(false);
 
     connect
       (
         d->cb_share,
-        TQT_SIGNAL(toggled(bool)),
-        TQT_SLOT(slotChanged())
+        TQ_SIGNAL(toggled(bool)),
+        TQ_SLOT(slotChanged())
       );
 
     connect
       (
         d->sb_listenPort,
-        TQT_SIGNAL(valueChanged(int)),
-        TQT_SLOT(slotChanged())
+        TQ_SIGNAL(valueChanged(int)),
+        TQ_SLOT(slotChanged())
       );
 
     connect
       (
         d->sb_bandwidthLimit,
-        TQT_SIGNAL(valueChanged(int)),
-        TQT_SLOT(slotChanged())
+        TQ_SIGNAL(valueChanged(int)),
+        TQ_SLOT(slotChanged())
       );
 
 #if 0
     connect
       (
         d->sb_connectionLimit,
-        TQT_SIGNAL(valueChanged(int)),
-        TQT_SLOT(slotChanged())
+        TQ_SIGNAL(valueChanged(int)),
+        TQ_SLOT(slotChanged())
       );
 #endif
     connect
       (
         d->le_serverName,
-	TQT_SIGNAL(textChanged(const TQString&)),
-	TQT_SLOT(slotChanged())
+	TQ_SIGNAL(textChanged(const TQString&)),
+	TQ_SLOT(slotChanged())
       );
 
     connect
       (
         d->cb_followSymlinks,
-        TQT_SIGNAL(toggled(bool)),
-        TQT_SLOT(slotChanged())
+        TQ_SIGNAL(toggled(bool)),
+        TQ_SLOT(slotChanged())
       );
 
     return w;
@@ -512,7 +512,7 @@ namespace KPF
     kapp->dcopClient()
       ->send("kicker", "default", "addApplet(TQString)", TQString("kpfapplet.desktop"));
 
-    TQTimer::singleShot(4 * 1000, this, TQT_SLOT(slotStartKPFFailed()));
+    TQTimer::singleShot(4 * 1000, this, TQ_SLOT(slotStartKPFFailed()));
   }
 
     void
diff --git a/kpf/src/Server.cpp b/kpf/src/Server.cpp
index 0959d801..69a11519 100644
--- a/kpf/src/Server.cpp
+++ b/kpf/src/Server.cpp
@@ -57,34 +57,34 @@ namespace KPF
 
     d->socket.setSocket(socket);
 
-    connect(&(d->socket), TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead()));
+    connect(&(d->socket), TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotReadyRead()));
 
     connect
       (
        &(d->socket),
-       TQT_SIGNAL(bytesWritten(int)),
-       TQT_SLOT(slotBytesWritten(int))
+       TQ_SIGNAL(bytesWritten(int)),
+       TQ_SLOT(slotBytesWritten(int))
       );
 
     connect
       (
        &(d->socket),
-       TQT_SIGNAL(connectionClosed()),
-       TQT_SLOT(slotConnectionClosed())
+       TQ_SIGNAL(connectionClosed()),
+       TQ_SLOT(slotConnectionClosed())
       );
 
     connect
       (
        &(d->idleTimer),
-       TQT_SIGNAL(timeout()),
-       TQT_SLOT(slotTimeout())
+       TQ_SIGNAL(timeout()),
+       TQ_SLOT(slotTimeout())
       );
 
     connect
       (
        &(d->readTimer),
-       TQT_SIGNAL(timeout()),
-       TQT_SLOT(slotRead())
+       TQ_SIGNAL(timeout()),
+       TQ_SLOT(slotRead())
       );
 
     // If nothing happens for a bit, cancel ourselves.
@@ -207,7 +207,7 @@ namespace KPF
 
     TQStringList l(TQStringList::split(' ', line));
 
-    // A request usually looks like TQT_METHOD PATH PROTOCOL but we don't
+    // A request usually looks like METHOD PATH PROTOCOL but we don't
     // require PROTOCOL - we just assume HTTP/0.9 and act accordingly.
 
     if (l.count() == 2)
@@ -238,7 +238,7 @@ namespace KPF
     bool
   Server::checkRequest()
   {
-    // We only handle TQT_METHOD of GET or HEAD.
+    // We only handle METHOD of GET or HEAD.
 
     if (Request::Unsupported == d->request.method())
     {
diff --git a/kpf/src/ServerWizard.cpp b/kpf/src/ServerWizard.cpp
index 0cf84fd5..38c6c15a 100644
--- a/kpf/src/ServerWizard.cpp
+++ b/kpf/src/ServerWizard.cpp
@@ -244,8 +244,8 @@ namespace KPF
     connect
       (
        kur_root_,
-       TQT_SIGNAL(textChanged(const TQString &)),
-       TQT_SLOT(slotServerRootChanged(const TQString &))
+       TQ_SIGNAL(textChanged(const TQString &)),
+       TQ_SLOT(slotServerRootChanged(const TQString &))
       );
 
     // Used for setting the caption on the file dialog.
@@ -253,8 +253,8 @@ namespace KPF
     connect
       (
        kur_root_,
-       TQT_SIGNAL(openFileDialog(KURLRequester *)),
-       TQT_SLOT(slotOpenFileDialog(KURLRequester *))
+       TQ_SIGNAL(openFileDialog(KURLRequester *)),
+       TQ_SLOT(slotOpenFileDialog(KURLRequester *))
       );
 
     // This slot sets the 'Next' button on page 2 to enabled/disabled
@@ -263,8 +263,8 @@ namespace KPF
     connect
       (
        sb_listenPort_,
-       TQT_SIGNAL(valueChanged(int)),
-       TQT_SLOT(slotListenPortChanged(int))
+       TQ_SIGNAL(valueChanged(int)),
+       TQ_SLOT(slotListenPortChanged(int))
       );
 
     // Update 'Next' button on page 1.
diff --git a/kpf/src/SingleServerConfigDialog.cpp b/kpf/src/SingleServerConfigDialog.cpp
index afdc77a4..f272485e 100644
--- a/kpf/src/SingleServerConfigDialog.cpp
+++ b/kpf/src/SingleServerConfigDialog.cpp
@@ -52,13 +52,13 @@ namespace KPF
     connect
       (
         widget_,
-        TQT_SIGNAL(ok(bool)),
-        TQT_SLOT(slotOk(bool))
+        TQ_SIGNAL(ok(bool)),
+        TQ_SLOT(slotOk(bool))
       );
 
     setMainWidget(widget_);
 
-    connect(this, TQT_SIGNAL(finished()), TQT_SLOT(slotFinished()));
+    connect(this, TQ_SIGNAL(finished()), TQ_SLOT(slotFinished()));
 
     widget_->checkOk();
   }
diff --git a/kpf/src/StartingKPFDialog.cpp b/kpf/src/StartingKPFDialog.cpp
index 4db88b62..0ebe0228 100644
--- a/kpf/src/StartingKPFDialog.cpp
+++ b/kpf/src/StartingKPFDialog.cpp
@@ -80,14 +80,14 @@ namespace KPF
     connect
       (
        kapp->dcopClient(),
-       TQT_SIGNAL(applicationRegistered(const TQCString &)),
-       TQT_SLOT(slotApplicationRegistered(const TQCString &))
+       TQ_SIGNAL(applicationRegistered(const TQCString &)),
+       TQ_SLOT(slotApplicationRegistered(const TQCString &))
       );
 
     kapp->dcopClient()
       ->send("kicker", "default", "addApplet(TQString)", TQString("kpfapplet.desktop"));
 
-    connect(&d->timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
+    connect(&d->timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()));
 
     enableButtonOK(false);
     enableButtonCancel(true);
diff --git a/kpf/src/WebServer.cpp b/kpf/src/WebServer.cpp
index 20320a32..6d10d8bd 100644
--- a/kpf/src/WebServer.cpp
+++ b/kpf/src/WebServer.cpp
@@ -110,10 +110,10 @@ namespace KPF
     loadConfig();
     publish();
     
-    connect(&d->bindTimer,        TQT_SIGNAL(timeout()), TQT_SLOT(slotBind()));
-    connect(&d->writeTimer,       TQT_SIGNAL(timeout()), TQT_SLOT(slotWrite()));
-    connect(&d->resetOutputTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCheckOutput()));
-    connect(&d->backlogTimer,     TQT_SIGNAL(timeout()), TQT_SLOT(slotClearBacklog()));
+    connect(&d->bindTimer,        TQ_SIGNAL(timeout()), TQ_SLOT(slotBind()));
+    connect(&d->writeTimer,       TQ_SIGNAL(timeout()), TQ_SLOT(slotWrite()));
+    connect(&d->resetOutputTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotCheckOutput()));
+    connect(&d->backlogTimer,     TQ_SIGNAL(timeout()), TQ_SLOT(slotClearBacklog()));
 
     d->bindTimer        .start(  0, true);
     d->resetOutputTimer .start(1000 / SamplesPerSecond, false);
@@ -144,10 +144,10 @@ namespace KPF
 
     saveConfig();
     publish();
-    connect(&d->bindTimer,        TQT_SIGNAL(timeout()), TQT_SLOT(slotBind()));
-    connect(&d->writeTimer,       TQT_SIGNAL(timeout()), TQT_SLOT(slotWrite()));
-    connect(&d->resetOutputTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCheckOutput()));
-    connect(&d->backlogTimer,     TQT_SIGNAL(timeout()), TQT_SLOT(slotClearBacklog()));
+    connect(&d->bindTimer,        TQ_SIGNAL(timeout()), TQ_SLOT(slotBind()));
+    connect(&d->writeTimer,       TQ_SIGNAL(timeout()), TQ_SLOT(slotWrite()));
+    connect(&d->resetOutputTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotCheckOutput()));
+    connect(&d->backlogTimer,     TQ_SIGNAL(timeout()), TQ_SLOT(slotClearBacklog()));
 
     d->bindTimer        .start(  0, true);
     d->resetOutputTimer .start(1000 / SamplesPerSecond, false);
@@ -164,7 +164,7 @@ namespace KPF
   void WebServer::publish()
   { 
     d->service = new DNSSD::PublicService(d->serverName,"_http._tcp",d->listenPort);
-    connect(d->service,TQT_SIGNAL(published(bool)),this,TQT_SLOT(wasPublished(bool)));
+    connect(d->service,TQ_SIGNAL(published(bool)),this,TQ_SLOT(wasPublished(bool)));
     d->service->publishAsync();
   }
 
@@ -195,7 +195,7 @@ namespace KPF
     emit(contentionChange(d->portContention));
 
     if (!d->portContention)
-      connect(d->socket, TQT_SIGNAL(connection(int)), TQT_SLOT(slotConnection(int)));
+      connect(d->socket, TQ_SIGNAL(connection(int)), TQ_SLOT(slotConnection(int)));
 
     else
     {
@@ -277,18 +277,18 @@ namespace KPF
     connect
       (
        s,
-       TQT_SIGNAL(output(Server *, ulong)),
-       TQT_SLOT(slotOutput(Server *, ulong))
+       TQ_SIGNAL(output(Server *, ulong)),
+       TQ_SLOT(slotOutput(Server *, ulong))
       );
 
-    connect(s, TQT_SIGNAL(finished(Server *)),  TQT_SLOT(slotFinished(Server *)));
-    connect(s, TQT_SIGNAL(request(Server *)),   TQT_SIGNAL(request(Server *)));
-    connect(s, TQT_SIGNAL(response(Server *)),  TQT_SIGNAL(response(Server *)));
+    connect(s, TQ_SIGNAL(finished(Server *)),  TQ_SLOT(slotFinished(Server *)));
+    connect(s, TQ_SIGNAL(request(Server *)),   TQ_SIGNAL(request(Server *)));
+    connect(s, TQ_SIGNAL(response(Server *)),  TQ_SIGNAL(response(Server *)));
 
     d->serverList.append(s);
 
     connect
-      (s, TQT_SIGNAL(readyToWrite(Server *)), TQT_SLOT(slotReadyToWrite(Server *)));
+      (s, TQ_SIGNAL(readyToWrite(Server *)), TQ_SLOT(slotReadyToWrite(Server *)));
 
     emit(connection(s));