Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

5 files changed, 32 insertions, 32 deletions

diff --git a/dcop/dcop_deadlock_test.cpp b/dcop/dcop_deadlock_test.cpp
index 6b32688ef..515aca6a1 100644
--- a/dcop/dcop_deadlock_test.cpp
+++ b/dcop/dcop_deadlock_test.cpp
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 MyDCOPObject::MyDCOPObject(const TQCString &name, const TQCString &remoteName) 
 : TQObject(0, name), DCOPObject(name), m_remoteName(remoteName)
 {
-  connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()));
+  connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout()));
 }
 
 bool MyDCOPObject::process(const TQCString &fun, const TQByteArray &data,
diff --git a/dcop/dcopclient.cpp b/dcop/dcopclient.cpp
index 0aae67b7a..d309014ee 100644
--- a/dcop/dcopclient.cpp
+++ b/dcop/dcopclient.cpp
@@ -334,10 +334,10 @@ void DCOPClient::handleAsyncReply(ReplyStruct *replyStruct)
 {
     if (replyStruct->replyObject)
     {
-        TQObject::connect(this, TQT_SIGNAL(callBack(int, const TQCString&, const TQByteArray &)),
+        TQObject::connect(this, TQ_SIGNAL(callBack(int, const TQCString&, const TQByteArray &)),
                replyStruct->replyObject, replyStruct->replySlot);
         emit callBack(replyStruct->replyId, *(replyStruct->replyType), *(replyStruct->replyData));
-        TQObject::disconnect(this, TQT_SIGNAL(callBack(int, const TQCString&, const TQByteArray &)),
+        TQObject::disconnect(this, TQ_SIGNAL(callBack(int, const TQCString&, const TQByteArray &)),
                replyStruct->replyObject, replyStruct->replySlot);
     }
     delete replyStruct;
@@ -625,8 +625,8 @@ DCOPClient::DCOPClient()
     d->qt_bridge_enabled = true;
     d->transactionList = 0L;
     d->transactionId = 0;
-    TQObject::connect( &d->postMessageTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( processPostedMessagesInternal() ) );
-    TQObject::connect( &d->eventLoopTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( eventLoopTimeout() ) );
+    TQObject::connect( &d->postMessageTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( processPostedMessagesInternal() ) );
+    TQObject::connect( &d->eventLoopTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( eventLoopTimeout() ) );
 
     if ( !mainClient() )
         setMainClient( this );
@@ -693,8 +693,8 @@ void DCOPClient::bindToApp()
             delete d->notifier;
         d->notifier = new TQSocketNotifier(socket(),
                                           TQSocketNotifier::Read, 0, 0);
-        TQObject::connect(d->notifier, TQT_SIGNAL(activated(int)),
-                TQT_SLOT(processSocketData(int)));
+        TQObject::connect(d->notifier, TQ_SIGNAL(activated(int)),
+                TQ_SLOT(processSocketData(int)));
     }
 }
 
@@ -1856,7 +1856,7 @@ int DCOPClient::callAsync(const TQCString &remApp, const TQCString &remObjId,
     if (replyStruct->transactionId == 0)
     {
         // Call is finished already
-        TQTimer::singleShot(0, this, TQT_SLOT(asyncReplyReady()));
+        TQTimer::singleShot(0, this, TQ_SLOT(asyncReplyReady()));
         d->asyncReplyQueue.append(replyStruct);
     }
 
diff --git a/dcop/dcopserver.cpp b/dcop/dcopserver.cpp
index a565df405..99c3cba67 100644
--- a/dcop/dcopserver.cpp
+++ b/dcop/dcopserver.cpp
@@ -306,8 +306,8 @@ tqWarning("[dcopserver] waitForOutputReady fd = %d datasize = %d start = %d", so
    if (!outputBufferNotifier)
    {
       outputBufferNotifier = new TQSocketNotifier(socket(), Write);
-      connect(outputBufferNotifier, TQT_SIGNAL(activated(int)),
-              the_server, TQT_SLOT(slotOutputReady(int)));
+      connect(outputBufferNotifier, TQ_SIGNAL(activated(int)),
+              the_server, TQ_SLOT(slotOutputReady(int)));
    }
    outputBufferNotifier->setEnabled(true);
    return;
@@ -1055,16 +1055,16 @@ DCOPServer::DCOPServer(bool _suicide)
     for ( int i = 0; i < numTransports; i++) {
 	con = new DCOPListener( listenObjs[i] );
 	listener.append( con );
-	connect( con, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( newClient(int) ) );
+	connect( con, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( newClient(int) ) );
     }
     char c = 0;
     write(ready[1], &c, 1); // dcopserver is started
     close(ready[1]);
 
     m_timer =  new TQTimer(this);
-    connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTerminate()) );
+    connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTerminate()) );
     m_deadConnectionTimer = new TQTimer(this);
-    connect( m_deadConnectionTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCleanDeadConnections()) );
+    connect( m_deadConnectionTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCleanDeadConnections()) );
 
 #ifdef Q_OS_WIN
 	char szEventName[256];
@@ -1183,7 +1183,7 @@ void DCOPServer::newClient( int /*socket*/ )
 void* DCOPServer::watchConnection( IceConn iceConn )
 {
     DCOPConnection* con = new DCOPConnection( iceConn );
-    connect( con, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( processData(int) ) );
+    connect( con, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( processData(int) ) );
 
     clients.insert(iceConn, con );
     fd_clients.insert( IceConnectionNumber(iceConn), con);
@@ -1293,8 +1293,8 @@ void DCOPServer::slotTerminate()
 #endif
     TQByteArray data;
     dcopSignals->emitSignal(0L /* dcopserver */, "terminateTDE()", data, false);
-    disconnect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTerminate()) );
-    connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSuicide()) );
+    disconnect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTerminate()) );
+    connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSuicide()) );
     system(findDcopserverShutdown()+" --nokill");
 }
 
@@ -1321,8 +1321,8 @@ void DCOPServer::slotShutdown()
        TQByteArray data;
        dcopSignals->emitSignal(0L /* dcopserver */, "terminateTDE()", data, false);
        m_timer->start( 10000 ); // if within 10 seconds nothing happens, we'll terminate
-       disconnect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTerminate()) );
-       connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotExit()) );
+       disconnect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTerminate()) );
+       connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotExit()) );
        if (appIds.isEmpty())
          slotExit(); // Exit now
     }
@@ -1779,7 +1779,7 @@ extern "C" DCOP_EXPORT int kdemain( int argc, char* argv[] )
 	SetConsoleCtrlHandler(DCOPServer::dcopServerConsoleProc,TRUE);
 #else
 	TQSocketNotifier DEATH(pipeOfDeath[0], TQSocketNotifier::Read, 0, 0);
-		server->connect(&DEATH, TQT_SIGNAL(activated(int)), TQT_SLOT(slotShutdown()));
+		server->connect(&DEATH, TQ_SIGNAL(activated(int)), TQ_SLOT(slotShutdown()));
 #endif
 
     int ret = a.exec();
diff --git a/dcop/testdcop.cpp b/dcop/testdcop.cpp
index 1a18eaff3..583a0255b 100644
--- a/dcop/testdcop.cpp
+++ b/dcop/testdcop.cpp
@@ -84,13 +84,13 @@ tqDebug("countDown() countDownAction = %p", countDownAction);
     {
        countDownCount = 10;       
        countDownAction = client->beginTransaction();
-       TQTimer::singleShot(1000, this, TQT_SLOT(slotTimeout()));
+       TQTimer::singleShot(1000, this, TQ_SLOT(slotTimeout()));
     }
     else
     {
        countDownCount2 = 10;       
        countDownAction2 = client->beginTransaction();
-       TQTimer::singleShot(1000, this, TQT_SLOT(slotTimeout2()));
+       TQTimer::singleShot(1000, this, TQ_SLOT(slotTimeout2()));
     }
     return true;
   }
@@ -113,7 +113,7 @@ void MyDCOPObject::slotTimeout()
   }
   else
   {
-     TQTimer::singleShot(1000, this, TQT_SLOT(slotTimeout()));
+     TQTimer::singleShot(1000, this, TQ_SLOT(slotTimeout()));
   }
 }
 
@@ -132,7 +132,7 @@ void MyDCOPObject::slotTimeout2()
   }
   else
   {
-     TQTimer::singleShot(1000, this, TQT_SLOT(slotTimeout2()));
+     TQTimer::singleShot(1000, this, TQ_SLOT(slotTimeout2()));
   }
 }
 
@@ -146,7 +146,7 @@ QCStringList MyDCOPObject::functions()
 TestObject::TestObject(const TQCString& app)
  :  m_app(app)
 {
-   TQTimer::singleShot(2500, this, TQT_SLOT(slotTimeout()));
+   TQTimer::singleShot(2500, this, TQ_SLOT(slotTimeout()));
 }
 
 void TestObject::slotTimeout()
@@ -191,10 +191,10 @@ int main(int argc, char **argv)
       TQCString appId = argv[1];
       TestObject obj(appId);
       tqWarning("#1 Calling countDown");
-      int result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQT_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&)));
+      int result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQ_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&)));
       tqDebug("#1 countDown() call id = %d", result);
       tqWarning("#2 Calling countDown");
-      result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQT_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&)));
+      result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQ_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&)));
       tqDebug("#2 countDown() call id = %d", result);
       app.exec();
 
@@ -234,11 +234,11 @@ int main(int argc, char **argv)
   int n = client->registeredApplications().count();
   tqDebug("number of attached applications = %d", n );
 
-  TQObject::connect( client, TQT_SIGNAL( applicationRegistered( const TQCString&)),
-                    obj1, TQT_SLOT( registered( const TQCString& )));
+  TQObject::connect( client, TQ_SIGNAL( applicationRegistered( const TQCString&)),
+                    obj1, TQ_SLOT( registered( const TQCString& )));
 
-  TQObject::connect( client, TQT_SIGNAL( applicationRemoved( const TQCString&)),
-                    obj1, TQT_SLOT( unregistered( const TQCString& )));
+  TQObject::connect( client, TQ_SIGNAL( applicationRemoved( const TQCString&)),
+                    obj1, TQ_SLOT( unregistered( const TQCString& )));
 
   // Enable the above signals
   client->setNotifications( true );
diff --git a/dcop/tests/driver.cpp b/dcop/tests/driver.cpp
index a129d7d6f..74dee9edd 100644
--- a/dcop/tests/driver.cpp
+++ b/dcop/tests/driver.cpp
@@ -39,7 +39,7 @@ void Driver::test()
 	}
 
 	++count;
-	TQTimer::singleShot( 100, this, TQT_SLOT( test() ) );
+	TQTimer::singleShot( 100, this, TQ_SLOT( test() ) );
 }
 
 #include "driver.moc"
@@ -58,7 +58,7 @@ int main(int argc, char** argv)
 	app.dcopClient()->attach(  );
 	app.dcopClient()->registerAs( "TestAppDriver" );
 	Driver * object = new Driver( appname );
-	TQTimer::singleShot( 10, object, TQT_SLOT( test() ) );
+	TQTimer::singleShot( 10, object, TQ_SLOT( test() ) );
 	return app.exec();
 }