Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 13 insertions, 13 deletions

diff --git a/tdeinit/tdelauncher.cpp b/tdeinit/tdelauncher.cpp
index bfdf677f0..8325f3acb 100644
--- a/tdeinit/tdelauncher.cpp
+++ b/tdeinit/tdelauncher.cpp
@@ -69,7 +69,7 @@ template class TQPtrList<IdleSlave>;
 IdleSlave::IdleSlave(TDESocket *socket)
 {
    mConn.init(socket);
-   mConn.connect(this, TQT_SLOT(gotInput()));
+   mConn.connect(this, TQ_SLOT(gotInput()));
    mConn.send( CMD_SLAVE_STATUS );
    mPid = 0;
    mBirthDate = time(0);
@@ -172,12 +172,12 @@ TDELauncher::TDELauncher(int _tdeinitSocket, bool new_startup)
 #ifdef Q_WS_X11
    mCached_dpy = NULL;
 #endif
-   connect(&mAutoTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoStart()));
+   connect(&mAutoTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoStart()));
    requestList.setAutoDelete(true);
    mSlaveWaitRequest.setAutoDelete(true);
    dcopClient()->setNotifications( true );
-   connect(dcopClient(), TQT_SIGNAL( applicationRegistered( const TQCString &)),
-           this, TQT_SLOT( slotAppRegistered( const TQCString &)));
+   connect(dcopClient(), TQ_SIGNAL( applicationRegistered( const TQCString &)),
+           this, TQ_SLOT( slotAppRegistered( const TQCString &)));
    dcopClient()->connectDCOPSignal( "DCOPServer", "", "terminateTDE()",
                                     objId(), "terminateTDE()", false );
 
@@ -195,14 +195,14 @@ TDELauncher::TDELauncher(int _tdeinitSocket, bool new_startup)
    domainname.unlink();
 #endif
    mPoolSocket = new TDEServerSocket(static_cast<const char*>(TQFile::encodeName(mPoolSocketName)));
-   connect(mPoolSocket, TQT_SIGNAL(accepted( TDESocket *)),
-           TQT_SLOT(acceptSlave(TDESocket *)));
+   connect(mPoolSocket, TQ_SIGNAL(accepted( TDESocket *)),
+           TQ_SLOT(acceptSlave(TDESocket *)));
 
-   connect(&mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(idleTimeout()));
+   connect(&mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(idleTimeout()));
 
    tdeinitNotifier = new TQSocketNotifier(tdeinitSocket, TQSocketNotifier::Read);
-   connect(tdeinitNotifier, TQT_SIGNAL( activated( int )),
-           this, TQT_SLOT( slotKDEInitData( int )));
+   connect(tdeinitNotifier, TQ_SIGNAL( activated( int )),
+           this, TQ_SLOT( slotKDEInitData( int )));
    tdeinitNotifier->setEnabled( true );
    lastRequest = 0;
    bProcessingQueue = false;
@@ -1184,7 +1184,7 @@ TDELauncher::queueRequest(TDELaunchRequest *request)
    if (!bProcessingQueue)
    {
       bProcessingQueue = true;
-      TQTimer::singleShot(0, this, TQT_SLOT( slotDequeue() ));
+      TQTimer::singleShot(0, this, TQ_SLOT( slotDequeue() ));
    }
 }
 
@@ -1358,9 +1358,9 @@ TDELauncher::acceptSlave(TDESocket *slaveSocket)
     IdleSlave *slave = new IdleSlave(slaveSocket);
     // Send it a SLAVE_STATUS command.
     mSlaveList.append(slave);
-    connect(slave, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotSlaveGone()));
-    connect(slave, TQT_SIGNAL(statusUpdate(IdleSlave *)),
-	    this, TQT_SLOT(slotSlaveStatus(IdleSlave *)));
+    connect(slave, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotSlaveGone()));
+    connect(slave, TQ_SIGNAL(statusUpdate(IdleSlave *)),
+	    this, TQ_SLOT(slotSlaveStatus(IdleSlave *)));
     if (!mTimer.isActive())
     {
        mTimer.start(1000*10);