Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 1329ec6abbcb7b79cd960e0ca138f16598d5f11f)

4 files changed, 10 insertions, 10 deletions

diff --git a/kopete/protocols/testbed/testbedaccount.cpp b/kopete/protocols/testbed/testbedaccount.cpp
index 267f452b..810b8a6b 100644
--- a/kopete/protocols/testbed/testbedaccount.cpp
+++ b/kopete/protocols/testbed/testbedaccount.cpp
@@ -51,7 +51,7 @@ TDEActionMenu* TestbedAccount::actionMenu()
 
 	TDEAction *action;
 	
-	action = new TDEAction (i18n ("Show my own video..."), "testbed_showvideo", 0, this, TQT_SLOT (slotShowVideo ()), this, "actionShowVideo");
+	action = new TDEAction (i18n ("Show my own video..."), "testbed_showvideo", 0, this, TQ_SLOT (slotShowVideo ()), this, "actionShowVideo");
 	mActionMenu->insert(action);
 	action->setEnabled( isConnected() );
 
@@ -90,8 +90,8 @@ void TestbedAccount::connect( const Kopete::OnlineStatus& /* initialStatus */ )
 {
 	kdDebug ( 14210 ) << k_funcinfo << endl;
 	myself()->setOnlineStatus( TestbedProtocol::protocol()->testbedOnline );
-	TQObject::connect ( m_server, TQT_SIGNAL ( messageReceived( const TQString & ) ),
-			this, TQT_SLOT ( receivedMessage( const TQString & ) ) );
+	TQObject::connect ( m_server, TQ_SIGNAL ( messageReceived( const TQString & ) ),
+			this, TQ_SLOT ( receivedMessage( const TQString & ) ) );
 }
 
 void TestbedAccount::disconnect()
diff --git a/kopete/protocols/testbed/testbedcontact.cpp b/kopete/protocols/testbed/testbedcontact.cpp
index b53c4adb..7195f7bc 100644
--- a/kopete/protocols/testbed/testbedcontact.cpp
+++ b/kopete/protocols/testbed/testbedcontact.cpp
@@ -74,9 +74,9 @@ Kopete::ChatSession* TestbedContact::manager( CanCreateFlags )
 		TQPtrList<Kopete::Contact> contacts;
 		contacts.append(this);
 		m_msgManager = Kopete::ChatSessionManager::self()->create(account()->myself(), contacts, protocol());
-		connect(m_msgManager, TQT_SIGNAL(messageSent(Kopete::Message&, Kopete::ChatSession*)),
-				this, TQT_SLOT( sendMessage( Kopete::Message& ) ) );
-		connect(m_msgManager, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotChatSessionDestroyed()));
+		connect(m_msgManager, TQ_SIGNAL(messageSent(Kopete::Message&, Kopete::ChatSession*)),
+				this, TQ_SLOT( sendMessage( Kopete::Message& ) ) );
+		connect(m_msgManager, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotChatSessionDestroyed()));
 		return m_msgManager;
 	}
 }
@@ -87,7 +87,7 @@ TQPtrList<TDEAction> *TestbedContact::customContextMenuActions() //OBSOLETE
 	//FIXME!!!  this function is obsolete, we should use XMLGUI instead
 	/*m_actionCollection = new TDEActionCollection( this, "userColl" );
 	m_actionPrefs = new TDEAction(i18n( "&Contact Settings" ), 0, this,
-			TQT_SLOT( showContactSettings( )), m_actionCollection, "contactSettings" );
+			TQ_SLOT( showContactSettings( )), m_actionCollection, "contactSettings" );
 
 	return m_actionCollection;*/
 	return 0L;
diff --git a/kopete/protocols/testbed/testbedfakeserver.cpp b/kopete/protocols/testbed/testbedfakeserver.cpp
index 9a4116ca..40f724f1 100644
--- a/kopete/protocols/testbed/testbedfakeserver.cpp
+++ b/kopete/protocols/testbed/testbedfakeserver.cpp
@@ -40,7 +40,7 @@ void TestbedFakeServer::sendMessage( TQString contactId, TQString message )
 	TQString messageId = contactId + TQString::fromLatin1(": ");
 	TestbedIncomingMessage* msg = new TestbedIncomingMessage( this, messageId + message );
 	m_incomingMessages.append( msg );
-	TQTimer::singleShot( 1000, msg, TQT_SLOT( deliver() ) );
+	TQTimer::singleShot( 1000, msg, TQ_SLOT( deliver() ) );
 	
 	// This removes any delivered messages 
 	purgeMessages();
diff --git a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp
index 6022d8cb..df8a8a1a 100644
--- a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp
+++ b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp
@@ -34,7 +34,7 @@ TestbedWebcamDialog::TestbedWebcamDialog( const TQString &contactId, TQWidget *
 	setInitialSize( TQSize(320,290), false );
 	
 	setEscapeButton( KDialogBase::Close );
-//	TQObject::connect( this, TQT_SIGNAL( closeClicked() ), this, TQT_SIGNAL( closingWebcamDialog() ) );
+//	TQObject::connect( this, TQ_SIGNAL( closeClicked() ), this, TQ_SIGNAL( closingWebcamDialog() ) );
 
 	TQWidget *page = plainPage();
 	setMainWidget(page);
@@ -59,7 +59,7 @@ kdDebug() << "Just captured 1st frame" << endl;
 	mPixmap=TQPixmap(320,240,-1, TQPixmap::DefaultOptim);
 	if (mPixmap.convertFromImage(mImage,0) == true)
 		mImageContainer->updatePixmap(mPixmap);
-	connect(&qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateImage()) );
+	connect(&qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateImage()) );
 	qtimer.start(0,FALSE);
 }