Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

5 files changed, 16 insertions, 16 deletions

diff --git a/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp b/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp
index 77563c05..070e69cc 100644
--- a/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp
@@ -10,12 +10,12 @@ ClientStreamTest::ClientStreamTest(int argc, char ** argv) : TQApplication( argc
 	myConnector->setOptHostPort( "login.oscar.aol.com", 5190 );
 	myTestObject = new ClientStream( myConnector, myConnector);
 	// notify when the transport layer is connected
-	connect( myTestObject, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) );
+	connect( myTestObject, TQ_SIGNAL( connected() ), TQ_SLOT( slotConnected() ) );
 	// notify and start sending
-	//connect( myTestObject, TQT_SIGNAL( warning(int) ), TQT_SLOT( slotWarning(int) ) );
+	//connect( myTestObject, TQ_SIGNAL( warning(int) ), TQ_SLOT( slotWarning(int) ) );
 
 	// do test once the event loop is running
-	TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) );
+	TQTimer::singleShot( 0, this, TQ_SLOT( slotDoTest() ) );
 	connected = false;
 }
 
diff --git a/kopete/protocols/oscar/liboscar/tests/logintest.cpp b/kopete/protocols/oscar/liboscar/tests/logintest.cpp
index d1025059..4cba0a56 100644
--- a/kopete/protocols/oscar/liboscar/tests/logintest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/logintest.cpp
@@ -10,13 +10,13 @@ LoginTest::LoginTest(int argc, char ** argv) : TQApplication( argc, argv )
 	myTestObject = new ClientStream( myConnector, myConnector);
 	
 	// notify when the transport layer is connected
-	//connect( myTestObject, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) );
+	//connect( myTestObject, TQ_SIGNAL( connected() ), TQ_SLOT( slotConnected() ) );
 	myClient = new Client();
 	
 	myConnection = new Connection( myConnector, myTestObject, "AUTHORIZER" );
 	myConnection->setClient( myClient );
 	// do test once the event loop is running
-	TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) );
+	TQTimer::singleShot( 0, this, TQ_SLOT( slotDoTest() ) );
 	connected = false;
 }
 
diff --git a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp
index 410b6021..a8e667a3 100644
--- a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp
@@ -10,13 +10,13 @@ LoginTest::LoginTest(int argc, char ** argv) : TQApplication( argc, argv )
 	myTestObject = new ClientStream( myConnector, myConnector);
 	
 	// notify when the transport layer is connected
-	//connect( myTestObject, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) );
+	//connect( myTestObject, TQ_SIGNAL( connected() ), TQ_SLOT( slotConnected() ) );
 	myClient = new Client();
 	
 	myConnection = new Connection( myConnector, myTestObject, "AUTHORIZER" );
 	myConnection->setClient( myClient );
 	// do test once the event loop is running
-	TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) );
+	TQTimer::singleShot( 0, this, TQ_SLOT( slotDoTest() ) );
 	connected = false;
 }
 
@@ -36,7 +36,7 @@ void LoginTest::slotDoTest()
 	myClient->setIsIcq( true );
 	myClient->start( server, 5190, "userid", "password" );
 	myClient->connectToServer( myConnection, server, true );
-	TQTimer::singleShot( 10000, this, TQT_SLOT(runAddGroupTest() ) );
+	TQTimer::singleShot( 10000, this, TQ_SLOT(runAddGroupTest() ) );
 	connected = true;
 }
 
@@ -59,7 +59,7 @@ void LoginTest::runAddGroupTest()
 	tqDebug( "running ssi group add test" );
 	TQString group = TQString::fromLatin1( "dummygroup" );
 	myClient->addGroup( group );
-	TQTimer::singleShot( 5000, this, TQT_SLOT( runDelGroupTest() ) );
+	TQTimer::singleShot( 5000, this, TQ_SLOT( runDelGroupTest() ) );
 }
 
 void LoginTest::runDelGroupTest()
diff --git a/kopete/protocols/oscar/liboscar/tests/tdeunittest.cpp b/kopete/protocols/oscar/liboscar/tests/tdeunittest.cpp
index d634f5b9..0c917fd2 100644
--- a/kopete/protocols/oscar/liboscar/tests/tdeunittest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/tdeunittest.cpp
@@ -51,7 +51,7 @@ void KUnitTest::registerTests()
 
 KUnitTest::KUnitTest()
 {
-    TQTimer::singleShot( 0, this, TQT_SLOT(checkRun()) );
+    TQTimer::singleShot( 0, this, TQ_SLOT(checkRun()) );
 
     m_tests.setAutoDelete( TRUE );
 //    m_qtests.setAutoDelete( TRUE );
@@ -153,8 +153,8 @@ int KUnitTest::runTests()
 //void KUnitTest::addTester( TQTester *test )
 //{
 //    m_qtests.insert( test, test );
-//    connect( test, TQT_SIGNAL(destroyed(TQObject*)),
-//             TQT_SLOT(qtesterDone(TQObject* )) );
+//    connect( test, TQ_SIGNAL(destroyed(TQObject*)),
+//             TQ_SLOT(qtesterDone(TQObject* )) );
 //}
 
 void KUnitTest::qtesterDone( TQObject *obj )
diff --git a/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp b/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp
index 8d75b79d..2c9fd0a9 100644
--- a/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp
@@ -10,13 +10,13 @@ LoginTest::LoginTest(int argc, char ** argv) : TQApplication( argc, argv )
 	myTestObject = new ClientStream( myConnector, myConnector);
 	
 	// notify when the transport layer is connected
-	//connect( myTestObject, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) );
+	//connect( myTestObject, TQ_SIGNAL( connected() ), TQ_SLOT( slotConnected() ) );
 	myClient = new Client();
 	
 	myConnection = new Connection( myConnector, myTestObject, "AUTHORIZER" );
 	myConnection->setClient( myClient );
 	// do test once the event loop is running
-	TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) );
+	TQTimer::singleShot( 0, this, TQ_SLOT( slotDoTest() ) );
 	connected = false;
 }
 
@@ -36,8 +36,8 @@ void LoginTest::slotDoTest()
 	myClient->setIsIcq( true );
 	myClient->start( server, 5190, "userid", "password" );
 	myClient->connectToServer( myConnection, server, true );
-	//TQObject::connect( myClient, TQT_SIGNAL( userIsOnline( const TQString& ) ), this, TQT_SLOT( runUserInfoTest()));
-	//TQTimer::singleShot( 6000, this, TQT_SLOT(runUserInfoTest() ) );
+	//TQObject::connect( myClient, TQ_SIGNAL( userIsOnline( const TQString& ) ), this, TQ_SLOT( runUserInfoTest()));
+	//TQTimer::singleShot( 6000, this, TQ_SLOT(runUserInfoTest() ) );
 	connected = true;
 }