diff options
Diffstat (limited to 'dcop/dcopserver.cpp')
| -rw-r--r-- | dcop/dcopserver.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
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(); |