Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

8 files changed, 20 insertions, 20 deletions

diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
index c88e22b4..496af2cc 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
@@ -42,8 +42,8 @@ ConferenceTask::ConferenceTask( Task* parent )
 	registerEvent( GroupWise::ReceivedSystemBroadcast );
 
 	// listen to the UserDetailsManager telling us that user details are available
-	connect( client()->userDetailsManager(), TQT_SIGNAL( gotContactDetails( const GroupWise::ContactDetails & ) ), 
-		TQT_SLOT( slotReceiveUserDetails( const GroupWise::ContactDetails & ) ) );
+	connect( client()->userDetailsManager(), TQ_SIGNAL( gotContactDetails( const GroupWise::ContactDetails & ) ), 
+		TQ_SLOT( slotReceiveUserDetails( const GroupWise::ContactDetails & ) ) );
 }
 
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp
index d41db4a9..31c077f7 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp
@@ -24,7 +24,7 @@
 CreateContactInstanceTask::CreateContactInstanceTask(Task* parent) : NeedFolderTask(parent)
 {
 	// make the client tell the client app (Kopete) when we receive a contact
-	connect( this, TQT_SIGNAL( gotContactAdded( const ContactItem & ) ), client(), TQT_SIGNAL( contactReceived( const ContactItem & ) ) );
+	connect( this, TQ_SIGNAL( gotContactAdded( const ContactItem & ) ), client(), TQ_SIGNAL( contactReceived( const ContactItem & ) ) );
 }
 
 CreateContactInstanceTask::~CreateContactInstanceTask()
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp
index 0d167236..2c3daf55 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp
@@ -76,8 +76,8 @@ void CreateContactTask::onGo()
 		// the add contact action may cause other contacts' sequence numbers to change
 		// CreateContactInstanceTask signals these changes, so we propagate the signal via the Client, to the GroupWiseAccount
 		// This updates our local versions of those contacts using the same mechanism by which they are updated at login.
-		connect( ccit, TQT_SIGNAL( gotContactAdded( const ContactItem & ) ), TQT_SLOT( slotContactAdded( const ContactItem & ) ) );
-        connect( ccit, TQT_SIGNAL( finished() ), TQT_SLOT( slotCheckContactInstanceCreated() ) );
+		connect( ccit, TQ_SIGNAL( gotContactAdded( const ContactItem & ) ), TQ_SLOT( slotContactAdded( const ContactItem & ) ) );
+        connect( ccit, TQ_SIGNAL( finished() ), TQ_SLOT( slotCheckContactInstanceCreated() ) );
 		if ( (*it).id == 0 ) // caller asserts that this isn't on the server...
 		{
 			ccit->contactFromDNAndFolder( m_userId, m_displayName, m_firstSequenceNumber++, ( *it ).name );
@@ -92,8 +92,8 @@ void CreateContactTask::onGo()
 	{
 		client()->debug( " - contact is in top level folder " );
 		CreateContactInstanceTask * ccit = new CreateContactInstanceTask( client()->rootTask() );
-		connect( ccit, TQT_SIGNAL( gotContactAdded( const ContactItem & ) ), TQT_SLOT( slotContactAdded( const ContactItem & ) ) );
-        connect( ccit, TQT_SIGNAL( finished() ), TQT_SLOT( slotCheckContactInstanceCreated() ) );
+		connect( ccit, TQ_SIGNAL( gotContactAdded( const ContactItem & ) ), TQ_SLOT( slotContactAdded( const ContactItem & ) ) );
+        connect( ccit, TQ_SIGNAL( finished() ), TQ_SLOT( slotCheckContactInstanceCreated() ) );
 		ccit->contactFromDN( m_userId, m_displayName, 0 );
 		ccit->go( true );
 	}
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp
index b7b1f1cc..a606008e 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp
@@ -113,8 +113,8 @@ bool JoinConferenceTask::take( Transfer * transfer )
 			{
 				client()->debug( "JoinConferenceTask::slotReceiveUserDetails(), requesting details" );
 				connect( client()->userDetailsManager(), 
-						TQT_SIGNAL( gotContactDetails( const GroupWise::ContactDetails & ) ),
-						TQT_SLOT( slotReceiveUserDetails( const GroupWise::ContactDetails & ) ) );
+						TQ_SIGNAL( gotContactDetails( const GroupWise::ContactDetails & ) ),
+						TQ_SLOT( slotReceiveUserDetails( const GroupWise::ContactDetails & ) ) );
 				client()->userDetailsManager()->requestDetails( m_unknowns );
 			}
 		}
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp
index 4a24f44f..c70eb37e 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp
@@ -25,7 +25,7 @@
 MoveContactTask::MoveContactTask(Task* parent): NeedFolderTask(parent)
 {
 	// make the client tell the client app (Kopete) when we receive a contact
-	connect( this, TQT_SIGNAL( gotContactAdded( const ContactItem & ) ), client(), TQT_SIGNAL( contactReceived( const ContactItem & ) ) );
+	connect( this, TQ_SIGNAL( gotContactAdded( const ContactItem & ) ), client(), TQ_SIGNAL( contactReceived( const ContactItem & ) ) );
 }
 
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp
index 12c7382a..c1cb696c 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp
@@ -27,9 +27,9 @@ void NeedFolderTask::createFolder()
 {
 	CreateFolderTask * cct = new CreateFolderTask( client()->rootTask() );
 	cct->folder( 0, m_folderSequence, m_folderDisplayName );
-	connect( cct, TQT_SIGNAL( gotFolderAdded( const FolderItem & ) ), client(), TQT_SIGNAL( folderReceived( const FolderItem & ) ) );
-	connect( cct, TQT_SIGNAL( gotFolderAdded( const FolderItem & ) ), TQT_SLOT( slotFolderAdded( const FolderItem & ) ) );
-	connect( cct, TQT_SIGNAL( finished() ), TQT_SLOT( slotFolderTaskFinished() ) );
+	connect( cct, TQ_SIGNAL( gotFolderAdded( const FolderItem & ) ), client(), TQ_SIGNAL( folderReceived( const FolderItem & ) ) );
+	connect( cct, TQ_SIGNAL( gotFolderAdded( const FolderItem & ) ), TQ_SLOT( slotFolderAdded( const FolderItem & ) ) );
+	connect( cct, TQ_SIGNAL( finished() ), TQ_SLOT( slotFolderTaskFinished() ) );
 	cct->go( true );
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp
index 87694eb4..10a1ba82 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp
@@ -75,7 +75,7 @@ bool SearchChatTask::take( Transfer * transfer )
 	m_objectId = sf->value().toInt();
 
 	// now start the results poll timer
-	TQTimer::singleShot( GW_POLL_INITIAL_DELAY, this, TQT_SLOT( slotPollForResults() ) );
+	TQTimer::singleShot( GW_POLL_INITIAL_DELAY, this, TQ_SLOT( slotPollForResults() ) );
 	return true;
 }
 
@@ -84,7 +84,7 @@ void SearchChatTask::slotPollForResults()
 	//create a PollSearchResultsTask
 	GetChatSearchResultsTask * gcsrt = new GetChatSearchResultsTask( client()->rootTask() );
 	gcsrt->poll( m_objectId );
-	connect( gcsrt, TQT_SIGNAL( finished() ), TQT_SLOT( slotGotPollResults() ) );
+	connect( gcsrt, TQ_SIGNAL( finished() ), TQ_SLOT( slotGotPollResults() ) );
 	gcsrt->go( true );
 }
 
@@ -97,14 +97,14 @@ void SearchChatTask::slotGotPollResults()
 	{
 		case GetChatSearchResultsTask::GettingData:
 			if ( m_polls < GW_POLL_MAXIMUM ) // restart timer
-				TQTimer::singleShot( GW_POLL_FREQUENCY_MS, this, TQT_SLOT( slotPollForResults() ) );
+				TQTimer::singleShot( GW_POLL_FREQUENCY_MS, this, TQ_SLOT( slotPollForResults() ) );
 			else
 				setSuccess( gcsrt->statusCode() );
 			break;
 		case GetChatSearchResultsTask::DataRetrieved:
 			// got some results, there may be more.
 			m_results += gcsrt->results();
-            TQTimer::singleShot( 0, this, TQT_SLOT( slotPollForResults() ) );
+            TQTimer::singleShot( 0, this, TQ_SLOT( slotPollForResults() ) );
 			break;
 		case GetChatSearchResultsTask::Completed:
 			m_results += gcsrt->results();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp
index 1b64c47d..e968c75c 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp
@@ -86,7 +86,7 @@ bool SearchUserTask::take( Transfer * transfer )
 		return true;
 	}
 	// now start the results poll timer
-	TQTimer::singleShot( GW_POLL_INITIAL_DELAY, this, TQT_SLOT( slotPollForResults() ) );
+	TQTimer::singleShot( GW_POLL_INITIAL_DELAY, this, TQ_SLOT( slotPollForResults() ) );
 	return true;
 }
 
@@ -95,7 +95,7 @@ void SearchUserTask::slotPollForResults()
 	//create a PollSearchResultsTask
 	PollSearchResultsTask * psrt = new PollSearchResultsTask( client()->rootTask() );
 	psrt->poll( m_queryHandle );
-	connect( psrt, TQT_SIGNAL( finished() ), TQT_SLOT( slotGotPollResults() ) );
+	connect( psrt, TQ_SIGNAL( finished() ), TQ_SLOT( slotGotPollResults() ) );
 	psrt->go( true );
 }
 
@@ -109,7 +109,7 @@ void SearchUserTask::slotGotPollResults()
 		case PollSearchResultsTask::Pending:
 		case PollSearchResultsTask::InProgess:
 			if ( m_polls < GW_POLL_MAXIMUM ) // restart timer
-				TQTimer::singleShot( GW_POLL_FREQUENCY_MS, this, TQT_SLOT( slotPollForResults() ) );
+				TQTimer::singleShot( GW_POLL_FREQUENCY_MS, this, TQ_SLOT( slotPollForResults() ) );
 			else
 				setSuccess( psrt->statusCode() );
 			break;