Rename a number of old tq methods that are no longer tq specific

19 files changed, 60 insertions, 60 deletions

diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
index 3fccc218..c88e22b4 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
@@ -53,10 +53,10 @@ ConferenceTask::~ConferenceTask()
 
 void ConferenceTask::dumpConferenceEvent( ConferenceEvent & evt )
 {
-	client()->debug( TQString( "Conference Event - guid: %1 user: %2 timestamp: %3:%4:%5" ).tqarg
-			( evt.guid ).tqarg( evt.user.ascii() ).tqarg( evt.timeStamp.time().hour() ).tqarg
-			( evt.timeStamp.time().minute() ).tqarg( evt.timeStamp.time().second() ) ); 
- 	client()->debug( TQString( "                  flags: %1" ).tqarg( evt.flags, 8 ) );
+	client()->debug( TQString( "Conference Event - guid: %1 user: %2 timestamp: %3:%4:%5" ).arg
+			( evt.guid ).arg( evt.user.ascii() ).arg( evt.timeStamp.time().hour() ).arg
+			( evt.timeStamp.time().minute() ).arg( evt.timeStamp.time().second() ) ); 
+ 	client()->debug( TQString( "                  flags: %1" ).arg( evt.flags, 8 ) );
 }
 
 bool ConferenceTask::take( Transfer * transfer )
@@ -103,7 +103,7 @@ bool ConferenceTask::take( Transfer * transfer )
 				Q_ASSERT( incomingEvent->hasMessage() );
 				event.message = incomingEvent->message();
 				client()->debug( "ReceiveMessage" );
-				client()->debug( TQString( "message: %1" ).tqarg( event.message ) );
+				client()->debug( TQString( "message: %1" ).arg( event.message ) );
 				if ( !queueWhileAwaitingData( event ) )
 					emit message( event );
 				break;
@@ -119,7 +119,7 @@ bool ConferenceTask::take( Transfer * transfer )
 				Q_ASSERT( incomingEvent->hasMessage() );
 				event.message = incomingEvent->message();
 				client()->debug( "ConferenceInvite" );
-				client()->debug( TQString( "message: %1" ).tqarg( event.message ) );
+				client()->debug( TQString( "message: %1" ).arg( event.message ) );
 				if ( !queueWhileAwaitingData( event ) )
 					emit invited( event );
 				break;
@@ -139,14 +139,14 @@ bool ConferenceTask::take( Transfer * transfer )
 				Q_ASSERT( incomingEvent->hasMessage() );
 				event.message = incomingEvent->message();
 				client()->debug( "ReceiveAutoReply" );
-				client()->debug( TQString( "message: %1" ).tqarg( event.message.ascii() ) );
+				client()->debug( TQString( "message: %1" ).arg( event.message.ascii() ) );
 				emit autoReply( event );
 				break;
 			case GroupWise::ReceivedBroadcast:
 				Q_ASSERT( incomingEvent->hasMessage() );
 				event.message = incomingEvent->message();
 				client()->debug( "ReceivedBroadCast" );
-				client()->debug( TQString( "message: %1" ).tqarg( event.message ) );
+				client()->debug( TQString( "message: %1" ).arg( event.message ) );
 				if ( !queueWhileAwaitingData( event ) )
 					emit broadcast( event );
 				break;
@@ -154,11 +154,11 @@ bool ConferenceTask::take( Transfer * transfer )
 				Q_ASSERT( incomingEvent->hasMessage() );
 				event.message = incomingEvent->message();
 				client()->debug( "ReceivedSystemBroadCast" );
-				client()->debug( TQString( "message: %1" ).tqarg( event.message ) );
+				client()->debug( TQString( "message: %1" ).arg( event.message ) );
 				emit systemBroadcast( event );
 				break;
 			default:
-				client()->debug( TQString( "WARNING: didn't handle registered event %1, on conference %2" ).tqarg( incomingEvent->eventType() ).tqarg( event.guid.ascii() ) );
+				client()->debug( TQString( "WARNING: didn't handle registered event %1, on conference %2" ).arg( incomingEvent->eventType() ).arg( event.guid.ascii() ) );
 		}
 		dumpConferenceEvent( event );
 
@@ -181,7 +181,7 @@ void ConferenceTask::slotReceiveUserDetails( const GroupWise::ContactDetails & d
 		// if the details relate to event, try again to handle it
 		if ( details.dn == (*current).user )
 		{
-			client()->debug( TQString( " - got details for event involving %1" ).tqarg( (*current).user ) );
+			client()->debug( TQString( " - got details for event involving %1" ).arg( (*current).user ) );
 			switch ( (*current).type )
 			{
 				case GroupWise::ConferenceJoined:
@@ -220,7 +220,7 @@ bool ConferenceTask::queueWhileAwaitingData( const ConferenceEvent & event )
 	}
 	else
 	{
-		client()->debug( TQString( "ConferenceTask::queueWhileAwaitingData() - queueing event involving %1" ).tqarg( event.user ) );
+		client()->debug( TQString( "ConferenceTask::queueWhileAwaitingData() - queueing event involving %1" ).arg( event.user ) );
 		client()->userDetailsManager()->requestDetails( event.user );
 		m_pendingEvents.append( event );
 		return true;
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp
index 920eec3b..0d167236 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp
@@ -71,7 +71,7 @@ void CreateContactTask::onGo()
 	// create contacts on the server
 	for ( ; it != end; ++it )
 	{
-		client()->debug( TQString( " - contact is in folder %1 with id %2" ).tqarg( (*it).name ).tqarg( (*it).id ) );
+		client()->debug( TQString( " - contact is in folder %1 with id %2" ).arg( (*it).name ).arg( (*it).id ) );
 		CreateContactInstanceTask * ccit = new CreateContactInstanceTask( client()->rootTask() );
 		// 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
@@ -112,8 +112,8 @@ void CreateContactTask::slotContactAdded( const ContactItem & addedContact )
 		client()->debug( " - addedContact is not the one we were trying to add, ignoring it ( Account will update it )" );
 		return;
 	}
-	client()->debug( TQString( "CreateContactTask::slotContactAdded() - Contact Instance %1 was created on the server, with objectId %2 in folder %3" ).tqarg
-			( addedContact.displayName ).tqarg( addedContact.id ).tqarg( addedContact.parentId ) );
+	client()->debug( TQString( "CreateContactTask::slotContactAdded() - Contact Instance %1 was created on the server, with objectId %2 in folder %3" ).arg
+			( addedContact.displayName ).arg( addedContact.id ).arg( addedContact.parentId ) );
 			
 	if ( m_dn.isEmpty() )
 		m_dn = addedContact.dn;
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp
index 7744552c..a62cf022 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp
@@ -62,7 +62,7 @@ bool GetChatSearchResultsTask::take( Transfer * transfer )
 	// look for the status code
 	Field::FieldList responseFields = response->fields();
 	Field::SingleField * sf = responseFields.findSingleField( NM_A_UW_STATUS );
-	m_querytqStatus = (SearchResultCode)sf->value().toInt();
+	m_queryStatus = (SearchResultCode)sf->value().toInt();
 	
 	Field::MultiField * resultsArray = responseFields.findMultiField( NM_A_FA_RESULTS );
 	if ( !resultsArray )
@@ -82,12 +82,12 @@ bool GetChatSearchResultsTask::take( Transfer * transfer )
 		m_results.append( cd );
 	}
 	
-	if ( m_querytqStatus != DataRetrieved )
-		setError( m_querytqStatus );
+	if ( m_queryStatus != DataRetrieved )
+		setError( m_queryStatus );
 	else
 	{
 		kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << " we won!" << endl;
-		setSuccess( m_querytqStatus );
+		setSuccess( m_queryStatus );
 	}
 	return true;
 }
@@ -97,9 +97,9 @@ TQValueList< GroupWise::ChatroomSearchResult > GetChatSearchResultsTask::results
 	return m_results;
 }
 
-int GetChatSearchResultsTask::querytqStatus()
+int GetChatSearchResultsTask::queryStatus()
 {
-	return m_querytqStatus;
+	return m_queryStatus;
 }
 
 GroupWise::ChatroomSearchResult GetChatSearchResultsTask::extractChatDetails( Field::FieldList & fields )
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h
index bebe8ff7..5671a122 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h
@@ -42,11 +42,11 @@ class GetChatSearchResultsTask : public RequestTask
 		~GetChatSearchResultsTask();
 		void poll( int queryHandle);
 		bool take( Transfer * transfer );
-		int querytqStatus();
+		int queryStatus();
 		TQValueList< GroupWise::ChatroomSearchResult > results();
 	private:
 		GroupWise::ChatroomSearchResult extractChatDetails( Field::FieldList & fields );
-		SearchResultCode m_querytqStatus;
+		SearchResultCode m_queryStatus;
 		TQValueList< GroupWise::ChatroomSearchResult > m_results;
 };
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp
index 86179b62..2b77e33e 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp
@@ -61,7 +61,7 @@ bool GetStatusTask::take( Transfer * transfer )
 		// TODO: Check that the change to sending DNs above has fixed this problem.
 		status = sf->value().toInt();
 		// unfortunately getstatus doesn't give us an away message so we pass TQString() here
-		emit gottqStatus( m_userDN, status, TQString() );
+		emit gotStatus( m_userDN, status, TQString() );
 		setSuccess();
 	}	
 	else
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h
index bd291c62..aec5050f 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h
@@ -37,7 +37,7 @@ public:
 	void userDN( const TQString & dn );
 	bool take( Transfer * transfer );
 signals:
-	void gottqStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText );
+	void gotStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText );
 private:
 	TQString m_userDN;
 };
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp
index ed4f6bfd..b7b1f1cc 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp
@@ -128,14 +128,14 @@ bool JoinConferenceTask::take( Transfer * transfer )
 
 void JoinConferenceTask::slotReceiveUserDetails( const ContactDetails & details )
 {
-	client()->debug( TQString( "JoinConferenceTask::slotReceiveUserDetails() - got %1" ).tqarg( details.dn ) );
+	client()->debug( TQString( "JoinConferenceTask::slotReceiveUserDetails() - got %1" ).arg( details.dn ) );
 	TQStringList::Iterator it = m_unknowns.begin();
 	TQStringList::Iterator end = m_unknowns.end();
 	while( it != end )
 	{
 		TQString current = *it;
 		++it;
-		client()->debug( TQString( " - can we remove %1?" ).tqarg(current ) );
+		client()->debug( TQString( " - can we remove %1?" ).arg(current ) );
 		if ( current == details.dn )
 		{
 			client()->debug( " - it's gone!" );
@@ -143,7 +143,7 @@ void JoinConferenceTask::slotReceiveUserDetails( const ContactDetails & details
 			break;
 		}
 	}
-	client()->debug( TQString( " - now %1 unknowns").tqarg( m_unknowns.count() ) );
+	client()->debug( TQString( " - now %1 unknowns").arg( m_unknowns.count() ) );
 	if ( m_unknowns.empty() )
 	{
 		client()->debug( " - finished()" );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp
index f3d55583..6a28124f 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp
@@ -36,7 +36,7 @@ LoginTask::~LoginTask()
 
 void LoginTask::initialise()
 {
-	TQString command = TQString::tqfromLatin1("login:%1:%2").tqarg( client()->host() ).tqarg( client()->port() );
+	TQString command = TQString::fromLatin1("login:%1:%2").arg( client()->host() ).arg( client()->port() );
 	
 	Field::FieldList lst;
 	lst.append( new Field::SingleField( NM_A_SZ_USERID, 0, NMFIELD_TYPE_UTF8, client()->userId() ) );
@@ -123,7 +123,7 @@ void LoginTask::extractFolder( Field::MultiField * folderContainer )
 	current = fl.findSingleField( NM_A_SZ_PARENT_ID );
 	folder.parentId = current->value().toInt();
 	
-	client()->debug( TQString( "Got folder: %1, obj: %2, parent: %3, seq: %3." ).tqarg( folder.name ).tqarg(  folder.id ).tqarg( folder.parentId ).tqarg( folder.sequence ) );
+	client()->debug( TQString( "Got folder: %1, obj: %2, parent: %3, seq: %3." ).arg( folder.name ).arg(  folder.id ).arg( folder.parentId ).arg( folder.sequence ) );
 	// tell the world about it
 	emit gotFolder( folder );
 }
@@ -319,21 +319,21 @@ void LoginTask::extractCustomStatuses( Field::FieldList & fields )
 				Field::MultiField * mf2 = dynamic_cast<Field::MultiField *>( *custStatIt );
 				if ( mf2 && ( mf2->tag() == NM_A_FA_STATUS ) )
 				{
-					GroupWise::CustomtqStatus custom;
+					GroupWise::CustomStatus custom;
 					Field::FieldList fl2 = mf2->fields();
 					for ( Field::FieldListIterator custContentIt = fl2.begin(); custContentIt != fl2.end(); ++custContentIt )
 					{
 						if ( Field::SingleField * sf3 = dynamic_cast<Field::SingleField *>( *custContentIt ) )
 						{
 							if ( sf3->tag() == NM_A_SZ_TYPE )
-								custom.status = (GroupWise::tqStatus)sf3->value().toInt();
+								custom.status = (GroupWise::Status)sf3->value().toInt();
 							else if ( sf3->tag() == NM_A_SZ_DISPLAY_NAME )
 								custom.name = sf3->value().toString();
 							else if ( sf3->tag() == NM_A_SZ_MESSAGE_BODY )
 								custom.autoReply = sf3->value().toString();
 						}
 					}
-					emit gotCustomtqStatus( custom );
+					emit gotCustomStatus( custom );
 				}
 			}
 		}
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h
index f37add97..fdeaeb9d 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h
@@ -58,7 +58,7 @@ signals:
 	void gotContact( const ContactItem & );
 	void gotContactUserDetails( const GroupWise::ContactDetails & );
 	void gotPrivacySettings( bool locked, bool defaultDeny, const TQStringList & allowList, const TQStringList & denyList );
-	void gotCustomtqStatus( const GroupWise::CustomtqStatus & );
+	void gotCustomStatus( const GroupWise::CustomStatus & );
 	void gotKeepalivePeriod( int );
 };
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp
index 5a1eb414..12c7382a 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp
@@ -38,7 +38,7 @@ void NeedFolderTask::slotFolderAdded( const FolderItem & addedFolder )
 	// if this is the folder we were trying to create
 	if ( m_folderDisplayName == addedFolder.name )
 	{
-		client()->debug( TQString( "NeedFolderTask::slotFolderAdded() - Folder %1 was created on the server, now has objectId %2" ).tqarg( addedFolder.name ).tqarg( addedFolder.id ) );
+		client()->debug( TQString( "NeedFolderTask::slotFolderAdded() - Folder %1 was created on the server, now has objectId %2" ).arg( addedFolder.name ).arg( addedFolder.id ) );
 		m_folderId = addedFolder.id;
 	}
 }
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp
index 38870112..d65a5a20 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp
@@ -59,7 +59,7 @@ bool PollSearchResultsTask::take( Transfer * transfer )
 	// look for the status code
 	Field::FieldList responseFields = response->fields();
 	Field::SingleField * sf = responseFields.findSingleField( NM_A_SZ_STATUS );
-	m_querytqStatus = sf->value().toInt();
+	m_queryStatus = sf->value().toInt();
 	
 	Field::MultiField * resultsArray = responseFields.findMultiField( NM_A_FA_RESULTS );
 	if ( !resultsArray )
@@ -90,10 +90,10 @@ bool PollSearchResultsTask::take( Transfer * transfer )
 	// followed by NM_A_FA_RESULTS, looks like a getdetails
 	// add an accessor to get at the results list of ContactItems, probably
 	
-	if ( m_querytqStatus != 2 )
-		setError( m_querytqStatus );
+	if ( m_queryStatus != 2 )
+		setError( m_queryStatus );
 	else
-		setSuccess( m_querytqStatus );
+		setSuccess( m_queryStatus );
 	return true;
 }
 
@@ -102,9 +102,9 @@ TQValueList< GroupWise::ContactDetails > PollSearchResultsTask::results()
 	return m_results;
 }
 
-int PollSearchResultsTask::querytqStatus()
+int PollSearchResultsTask::queryStatus()
 {
-	return m_querytqStatus;
+	return m_queryStatus;
 }
 
 GroupWise::ContactDetails PollSearchResultsTask::extractUserDetails( Field::FieldList & fields )
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h
index ccf0560b..c69b7e0c 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h
@@ -42,11 +42,11 @@ public:
 	~PollSearchResultsTask();
 	void poll( const TQString & queryHandle);
 	bool take( Transfer * transfer );
-	int querytqStatus();
+	int queryStatus();
 	TQValueList< GroupWise::ContactDetails > results();
 GroupWise::ContactDetails extractUserDetails( Field::FieldList & fields );
 private:
-	int m_querytqStatus;
+	int m_queryStatus;
 	TQValueList< GroupWise::ContactDetails > m_results;
 };
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp
index 7d4b41aa..44f54124 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp
@@ -50,7 +50,7 @@ void RequestTask::onGo()
 {
 	if ( transfer() )
 	{
-		client()->debug( TQString( "%1::onGo() - sending %2 fields" ).tqarg( className() ).tqarg( static_cast<Request *>( transfer() )->command() ) );
+		client()->debug( TQString( "%1::onGo() - sending %2 fields" ).arg( className() ).arg( static_cast<Request *>( transfer() )->command() ) );
 		send( static_cast<Request *>( transfer() ) );
 	}
 	else
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp
index 946450e9..87694eb4 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp
@@ -91,9 +91,9 @@ void SearchChatTask::slotPollForResults()
 void SearchChatTask::slotGotPollResults()
 {
 	GetChatSearchResultsTask * gcsrt = (GetChatSearchResultsTask *)sender();
-	kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << gcsrt->querytqStatus() << endl;
+	kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << gcsrt->queryStatus() << endl;
 	m_polls++;
-	switch ( gcsrt->querytqStatus() )
+	switch ( gcsrt->queryStatus() )
 	{
 		case GetChatSearchResultsTask::GettingData:
 			if ( m_polls < GW_POLL_MAXIMUM ) // restart timer
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp
index 3dde5297..1b64c47d 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp
@@ -50,7 +50,7 @@ SearchUserTask::~SearchUserTask()
 
 void SearchUserTask::search( const TQValueList<UserSearchQueryTerm> & query )
 {
-	m_queryHandle = TQString::number( TQDateTime::tqcurrentDateTime().toTime_t () );
+	m_queryHandle = TQString::number( TQDateTime::currentDateTime().toTime_t () );
 	Field::FieldList lst;
 	if ( query.isEmpty() )
 	{
@@ -102,9 +102,9 @@ void SearchUserTask::slotPollForResults()
 void SearchUserTask::slotGotPollResults()
 {
 	PollSearchResultsTask * psrt = (PollSearchResultsTask *)sender();
-	kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << psrt->querytqStatus() << endl;
+	kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << psrt->queryStatus() << endl;
 	m_polls++;
-	switch ( psrt->querytqStatus() )
+	switch ( psrt->queryStatus() )
 	{
 		case PollSearchResultsTask::Pending:
 		case PollSearchResultsTask::InProgess:
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp
index 817df4a6..bf463407 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp
@@ -30,20 +30,20 @@ SetStatusTask::~SetStatusTask()
 {
 }
 
-void SetStatusTask::status( tqStatus newtqStatus, const TQString &awayMessage, const TQString &autoReply )
+void SetStatusTask::status( Status newStatus, const TQString &awayMessage, const TQString &autoReply )
 {
-	if ( newtqStatus > GroupWise::Invalid )
+	if ( newStatus > GroupWise::Invalid )
 	{
 		setError( 1, "Invalid Status" );
 		return;
 	}
 	
-	m_status = newtqStatus;
+	m_status = newStatus;
 	m_awayMessage = awayMessage;
 	m_autoReply = autoReply;
 	
 	Field::FieldList lst;
-	lst.append( new Field::SingleField( NM_A_SZ_STATUS, 0, NMFIELD_TYPE_UTF8, TQString::number( newtqStatus ) ) );
+	lst.append( new Field::SingleField( NM_A_SZ_STATUS, 0, NMFIELD_TYPE_UTF8, TQString::number( newStatus ) ) );
 	if ( !awayMessage.isNull() )
 		lst.append( new Field::SingleField( NM_A_SZ_STATUS_TEXT, 0, NMFIELD_TYPE_UTF8, awayMessage ) );
 	if ( !autoReply.isNull() )
@@ -51,7 +51,7 @@ void SetStatusTask::status( tqStatus newtqStatus, const TQString &awayMessage, c
 	createTransfer( "setstatus", lst );
 }
 
-tqStatus SetStatusTask::requestedtqStatus() const
+Status SetStatusTask::requestedStatus() const
 {
 	return m_status;
 }
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h
index 0c316220..4a7a753d 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h
@@ -34,12 +34,12 @@ Q_OBJECT
 public:
 	SetStatusTask(Task* parent);
 	~SetStatusTask();
-	void status( GroupWise::tqStatus newtqStatus, const TQString &awayMessage, const TQString &autoReply );
-	GroupWise::tqStatus requestedtqStatus() const;
+	void status( GroupWise::Status newStatus, const TQString &awayMessage, const TQString &autoReply );
+	GroupWise::Status requestedStatus() const;
 	TQString awayMessage() const;
 	TQString autoReply() const; 
 private:
-	GroupWise::tqStatus m_status;
+	GroupWise::Status m_status;
 	TQString m_awayMessage;
 	TQString m_autoReply;
 };
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp
index 7076324a..e7272402 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp
@@ -37,8 +37,8 @@ bool StatusTask::take( Transfer * transfer )
 	if ( forMe( transfer, event ) )
 	{
 		client()->debug( "Got a status change!" );
-		client()->debug( TQString( "%1 changed status to %2, message: %3" ).tqarg( event->source() ).tqarg( event->status() ).tqarg( event->statusText() ) );
-		emit gottqStatus( event->source().lower(), event->status(), event->statusText() );
+		client()->debug( TQString( "%1 changed status to %2, message: %3" ).arg( event->source() ).arg( event->status() ).arg( event->statusText() ) );
+		emit gotStatus( event->source().lower(), event->status(), event->statusText() );
 		return true;
 	}
 	else
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h
index de5839d7..cc14bace 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h
@@ -35,7 +35,7 @@ public:
 	~StatusTask();
 	bool take( Transfer * transfer );
 signals:
-	void gottqStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText );
+	void gotStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText );
 };
 
 #endif