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

This reverts commit 808e453c56036211f57482ed847d54aca01bba68.

40 files changed, 150 insertions, 150 deletions

diff --git a/kopete/protocols/groupwise/libgroupwise/client.cpp b/kopete/protocols/groupwise/libgroupwise/client.cpp
index 5df0d1de..e7395157 100644
--- a/kopete/protocols/groupwise/libgroupwise/client.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/client.cpp
@@ -63,7 +63,7 @@ public:
 	UserDetailsManager * userDetailsMgr;
 	PrivacyManager * privacyMgr;
 	uint protocolVersion;
-	TQValueList<GroupWise::CustomStatus> customStatuses;
+	TQValueList<GroupWise::CustomtqStatus> customStatuses;
 	TQTimer * keepAliveTimer;
 };
 
@@ -151,8 +151,8 @@ void Client::start( const TQString &host, const uint port, const TQString &userI
 	connect( login, TQT_SIGNAL( gotPrivacySettings( bool, bool, const TQStringList &, const TQStringList & ) ),
 			privacyManager(), TQT_SLOT( slotGotPrivacySettings( bool, bool, const TQStringList &, const TQStringList & ) ) );
 
-	connect( login, TQT_SIGNAL( gotCustomStatus( const GroupWise::CustomStatus & ) ), 
-			TQT_SLOT( lt_gotCustomStatus( const GroupWise::CustomStatus & ) ) );
+	connect( login, TQT_SIGNAL( gotCustomtqStatus( const GroupWise::CustomtqStatus & ) ), 
+			TQT_SLOT( lt_gotCustomtqStatus( const GroupWise::CustomtqStatus & ) ) );
 
 	connect( login, TQT_SIGNAL( gotKeepalivePeriod( int ) ), TQT_SLOT( lt_gotKeepalivePeriod( int ) ) );
 
@@ -185,7 +185,7 @@ int Client::port()
 	return d->port;
 }
 
-TQValueList<GroupWise::CustomStatus> Client::customStatuses()
+TQValueList<GroupWise::CustomtqStatus> Client::customStatuses()
 {
 	return d->customStatuses;
 }
@@ -194,7 +194,7 @@ void Client::initialiseEventTasks()
 {
 	// The StatusTask handles incoming status changes
 	StatusTask * st = new StatusTask( d->root ); // FIXME - add an additional EventRoot?
-	connect( st, TQT_SIGNAL( gotStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) );
+	connect( st, TQT_SIGNAL( gottqStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) );
 	// The ConferenceTask handles incoming conference events, messages, joins, leaves, etc
 	ConferenceTask * ct = new ConferenceTask( d->root ); 
 	connect( ct, TQT_SIGNAL( message( const ConferenceEvent & ) ), TQT_SLOT( ct_messageReceived( const ConferenceEvent & ) ) );
@@ -216,9 +216,9 @@ void Client::initialiseEventTasks()
 	connect( cont, TQT_SIGNAL( connectedElsewhere() ), TQT_SIGNAL( connectedElsewhere() ) );
 }
 
-void Client::setStatus( GroupWise::Status status, const TQString & reason, const TQString & autoReply )
+void Client::settqStatus( GroupWise::tqStatus status, const TQString & reason, const TQString & autoReply )
 {
-	debug( TQString("Setting status to %1").arg( status ) );;
+	debug( TQString("Setting status to %1").tqarg( status ) );;
 	SetStatusTask * sst = new SetStatusTask( d->root );
 	sst->status( status, reason, autoReply );
 	connect( sst, TQT_SIGNAL( finished() ), this, TQT_SLOT( sst_statusChanged() ) );
@@ -226,11 +226,11 @@ void Client::setStatus( GroupWise::Status status, const TQString & reason, const
 	// TODO: set status change in progress flag
 }
 
-void Client::requestStatus( const TQString & userDN )
+void Client::requesttqStatus( const TQString & userDN )
 {
 	GetStatusTask * gst = new GetStatusTask( d->root );
 	gst->userDN( userDN );
-	connect( gst, TQT_SIGNAL( gotStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) );
+	connect( gst, TQT_SIGNAL( gottqStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) );
 	gst->go( true );
 }
 
@@ -306,7 +306,7 @@ void Client::sendInvitation( const GroupWise::ConferenceGuid & guid, const TQStr
 // SLOTS //
 void Client::streamError( int error )
 {
-	debug( TQString( "CLIENT ERROR (Error %1)" ).arg( error ) );
+	debug( TQString( "CLIENT ERROR (Error %1)" ).tqarg( error ) );
 }
 
 void Client::streamReadyRead()
@@ -348,7 +348,7 @@ void Client::sst_statusChanged()
 	const SetStatusTask * sst = (SetStatusTask *)sender();
 	if ( sst->success() )
 	{
-		emit ourStatusChanged( sst->requestedStatus(), sst->awayMessage(), sst->autoReply() );
+		emit ourStatusChanged( sst->requestedtqStatus(), sst->awayMessage(), sst->autoReply() );
 	}
 }
 
@@ -390,19 +390,19 @@ void Client::jct_joinConfCompleted()
 {
 	const JoinConferenceTask * jct = ( JoinConferenceTask * )sender();
 #ifdef LIBGW_DEBUG
-	debug( TQString( "Joined conference %1, participants are: " ).arg( jct->guid() ) );
+	debug( TQString( "Joined conference %1, participants are: " ).tqarg( jct->guid() ) );
 	TQStringList parts = jct->participants();
 	for ( TQStringList::Iterator it = parts.begin(); it != parts.end(); ++it )
-		debug( TQString( " - %1" ).arg(*it) );
+		debug( TQString( " - %1" ).tqarg(*it) );
 	debug( "invitees are: " );
 	TQStringList invitees = jct->invitees();
 	for ( TQStringList::Iterator it = invitees.begin(); it != invitees.end(); ++it )
-		debug( TQString( " - %1" ).arg(*it) );
+		debug( TQString( " - %1" ).tqarg(*it) );
 #endif
 	emit conferenceJoined( jct->guid(), jct->participants(), jct->invitees() );
 }
 
-void Client::lt_gotCustomStatus( const GroupWise::CustomStatus & custom )
+void Client::lt_gotCustomtqStatus( const GroupWise::CustomtqStatus & custom )
 {
 	d->customStatuses.append( custom );
 }
@@ -431,7 +431,7 @@ TQString Client::password()
 
 TQString Client::userAgent()
 {
-	return TQString::fromLatin1( "%1/%2 (%3)" ).arg( d->clientName, d->clientVersion, d->osname );
+	return TQString::tqfromLatin1( "%1/%2 (%3)" ).tqarg( d->clientName, d->clientVersion, d->osname );
 }
 
 TQCString Client::ipAddress()
@@ -457,7 +457,7 @@ void Client::send( Request * request )
 		return;
 	}
 // 	TQString out = request.toString();
-// 	debug(TQString("Client: outgoing: [\n%1]\n").arg(out));
+// 	debug(TQString("Client: outgoing: [\n%1]\n").tqarg(out));
 // 	xmlOutgoing(out);
 
 	d->stream->write( request );
diff --git a/kopete/protocols/groupwise/libgroupwise/client.h b/kopete/protocols/groupwise/libgroupwise/client.h
index 542d32eb..8bdd236d 100644
--- a/kopete/protocols/groupwise/libgroupwise/client.h
+++ b/kopete/protocols/groupwise/libgroupwise/client.h
@@ -92,7 +92,7 @@ fd		 * @param password
 		 * @param reason custom status name for away statuses
 		 * @param autoReply auto reply message for use in this status
 		 */
-		void setStatus( GroupWise::Status status, const TQString & reason, const TQString & autoReply );
+		void settqStatus( GroupWise::tqStatus status, const TQString & reason, const TQString & autoReply );
 
 		/**
 		 * Send a message 
@@ -118,7 +118,7 @@ fd		 * @param password
 		/**
 		 * Request the status of a single user, for example, if they have messaged us and are not on our contact list
 		 */
-		void requestStatus( const TQString & userDN );
+		void requesttqStatus( const TQString & userDN );
 		
 		/**
 		 * Add a contact to the contact list
@@ -211,7 +211,7 @@ fd		 * @param password
 		/**
 		 * Obtain the list of custom statuses stored on the server 
 		 */
-		TQValueList<GroupWise::CustomStatus> customStatuses();
+		TQValueList<GroupWise::CustomtqStatus> customStatuses();
 
 		/**
 		 * Get a reference to the RequestFactory for this Client. 
@@ -281,7 +281,7 @@ fd		 * @param password
 		/** 
 		 * Our status changed on the server
 		 */
-		void ourStatusChanged( GroupWise::Status status, const TQString & statusText, const TQString & autoReply );
+		void ourStatusChanged( GroupWise::tqStatus status, const TQString & statusText, const TQString & autoReply );
 		
 		/** CONFERENCE (MANAGEMENT) EVENTS */
 		/** 
@@ -371,7 +371,7 @@ fd		 * @param password
 		/**
 		 * Receive a custom status during login and record it
 		 */
-		void lt_gotCustomStatus( const GroupWise::CustomStatus & );
+		void lt_gotCustomtqStatus( const GroupWise::CustomtqStatus & );
 		/**
 		 * Notify us of the keepalive period contained in the login response
 		 */
diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
index 6cfa01b9..79ecf419 100644
--- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
@@ -26,7 +26,7 @@
 
 #include <tqdatastream.h>
 #include <tqdatetime.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 
 #include <kdebug.h>
@@ -142,7 +142,7 @@ void CoreProtocol::addIncomingData( const TQByteArray & incomingBytes )
 	while ( m_in.size() && ( parsedBytes = wireToTransfer( m_in ) ) )
 	{
 		transferCount++;
-		debug( TQString( "CoreProtocol::addIncomingData() - parsed transfer #%1 in chunk" ).arg( transferCount ) );
+		debug( TQString( "CoreProtocol::addIncomingData() - parsed transfer #%1 in chunk" ).tqarg( transferCount ) );
 		int size =  m_in.size();
 		if ( parsedBytes < size )
 		{
@@ -185,7 +185,7 @@ Transfer* CoreProtocol::incomingTransfer()
 void cp_dump( const TQByteArray &bytes )
 {
 #ifdef LIBGW_DEBUG
-	CoreProtocol::debug( TQString( "contains: %1 bytes" ).arg( bytes.count() ) );
+	CoreProtocol::debug( TQString( "contains: %1 bytes" ).tqarg( bytes.count() ) );
 	for ( uint i = 0; i < bytes.count(); ++i )
 	{
 		printf( "%02x ", bytes[ i ] );
@@ -226,7 +226,7 @@ void CoreProtocol::outgoingTransfer( Request* outgoing )
 		command = "login";
 		host = request->command().section( ':', 1, 1 ).ascii();
 		port = request->command().section( ':', 2, 2 ).ascii();
-		debug( TQString( "Host: %1 Port: %2" ).arg( host.data() ).arg( port.data() ) );
+		debug( TQString( "Host: %1 Port: %2" ).tqarg( host.data() ).tqarg( port.data() ) );
 	}
 	else
 		command = request->command().ascii();
@@ -246,7 +246,7 @@ void CoreProtocol::outgoingTransfer( Request* outgoing )
 	else
 		dout <<  "\r\n";
 
-	debug( TQString( "data out: %1" ).arg( bytesOut.data() ) );
+	debug( TQString( "data out: %1" ).tqarg( bytesOut.data() ) );
 
 	emit outgoingData( bytesOut );
 	// now convert 
@@ -337,7 +337,7 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth )
 								+ GW_URLVAR_VAL + (const char *)valString 
 								+ GW_URLVAR_TYPE + typeString;
 								
-		debug( TQString( "CoreProtocol::fieldsToWire - outgoing data: %1" ).arg( outgoing.data() ) );
+		debug( TQString( "CoreProtocol::fieldsToWire - outgoing data: %1" ).tqarg( outgoing.data() ) );
 		dout.writeRawBytes( outgoing.data(), outgoing.length() );
 		// write what we have so far, we may be calling this function recursively
 		//kdDebug( 14999 ) << k_funcinfo << "writing \'" << bout << "\'" << endl;
@@ -398,12 +398,12 @@ int CoreProtocol::wireToTransfer( const TQByteArray& wire )
 		}
 		else // otherwise -> Event code
 		{	
-			debug( TQString( "CoreProtocol::wireToTransfer() - looks like an EVENT: %1, length %2" ).arg( val ).arg( wire.size() ) );
+			debug( TQString( "CoreProtocol::wireToTransfer() - looks like an EVENT: %1, length %2" ).tqarg( val ).tqarg( wire.size() ) );
 			Transfer * t = m_eventProtocol->parse( wire, bytesParsed );
 			if ( t )
 			{
 				m_inTransfer = t;
-				debug( TQString( "CoreProtocol::wireToTransfer() - got an EVENT: %1, parsed: %2" ).arg( val ).arg( bytesParsed ) );
+				debug( TQString( "CoreProtocol::wireToTransfer() - got an EVENT: %1, parsed: %2" ).tqarg( val ).tqarg( bytesParsed ) );
 				m_state = Available;
 				emit incomingData();
 			}
@@ -486,7 +486,7 @@ TQChar CoreProtocol::encode_method( TQ_UINT8 method )
 
 void CoreProtocol::slotOutgoingData( const TQCString &out )
 {
-	debug( TQString( "CoreProtocol::slotOutgoingData() %1" ).arg( out.data() ) );
+	debug( TQString( "CoreProtocol::slotOutgoingData() %1" ).tqarg( out.data() ) );
 }
 
 bool CoreProtocol::okToProceed()
diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.h b/kopete/protocols/groupwise/libgroupwise/coreprotocol.h
index d1b2486c..ea3a2626 100644
--- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.h
+++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.h
@@ -108,7 +108,7 @@ class Transfer;
  * any of three ways -
  *      ascii text,
  *      latin1 as hexadecimal,
- *      escaped unicode code points (encoded/escaped as \uUNICODEVALUE?, with or without a space between the end of the unicode value and the ? )
+ *      escaped tqunicode code points (encoded/escaped as \uUNICODEVALUE?, with or without a space between the end of the tqunicode value and the ? )
  * Outgoing messages may contain rich text, and additionally the plain text encoded as UTF8, but this plain payload is apparently ignored by the server
  *
  */
diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
index 93ce7c92..b6ff646d 100644
--- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
@@ -53,10 +53,10 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
 	m_din >> type;
 	m_bytes += sizeof( TQ_UINT32 );
 	
-	debug( TQString( "EventProtocol::parse() Reading event of type %1" ).arg( type ) );
+	debug( TQString( "EventProtocol::parse() Reading event of type %1" ).tqarg( type ) );
 	if ( type > Stop )
 	{
-		debug( TQString ( "EventProtocol::parse() - found unexpected event type %1 - assuming out of sync" ).arg( type ) );
+		debug( TQString ( "EventProtocol::parse() - found unexpected event type %1 - assuming out of sync" ).tqarg( type ) );
 		m_state = OutOfSync;
 		return 0;
 	}
@@ -71,7 +71,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
 	
 	// now create an event object
 	//HACK: lowercased DN
-	EventTransfer * tentative = new EventTransfer( type, source.lower(), TQDateTime::currentDateTime() );
+	EventTransfer * tentative = new EventTransfer( type, source.lower(), TQDateTime::tqcurrentDateTime() );
 
 	// add any additional data depending on the type of event
 	// Note: if there are any errors in the way the data is read below, we will soon be OutOfSync
@@ -96,9 +96,9 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
 				m_din.unsetDevice();
 				return 0;
 			}
-			debug( TQString( "got status: %1").arg( status ) );
-			tentative->setStatus( status );
-			debug( TQString( "tentative status: %1").arg( tentative->status() ) );
+			debug( TQString( "got status: %1").tqarg( status ) );
+			tentative->settqStatus( status );
+			debug( TQString( "tentative status: %1").tqarg( tentative->status() ) );
 			tentative->setStatusText( statusText );
 			break;
 		case ConferenceJoined:		// 106 - GUID + FLAGS
@@ -116,7 +116,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
 			}
 			tentative->setFlags( flags );
 			break;
-		case UndeliverableStatus:	//102 - GUID
+		case UndeliverabletqStatus:	//102 - GUID
 		case ConferenceClosed:		//105
 		case ConferenceInviteNotify://118
 		case ConferenceReject:		//119
@@ -191,7 +191,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
 			tentative->setMessage( message );
 			break;
 		default:
-			debug( TQString( "EventProtocol::parse() - found unexpected event type %1" ).arg( type ) );
+			debug( TQString( "EventProtocol::parse() - found unexpected event type %1" ).tqarg( type ) );
 			break;
 	}
 	// if we got this far, the parse succeeded, return the Transfer
diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h
index 49d1d9dd..97e48c22 100644
--- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h
+++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h
@@ -50,7 +50,7 @@ class EventTransfer;
 	All Events contain an event code, and a source ( a DN )
 	NOTHANDLED indicates that there is no further data and we don't handle events of that type, because they are not sent by the server
 	NONE indicates there is no further data
-	STATUSTEXT, GUID, MESSAGE indicate a string encoded in the usual GroupWise binary string encoding: a UINT32 containing the string length in little-endian, followed by the string itself, as UTF-8 encoded unicode.  The string length value includes a terminating NUL, so when converting to a TQString, subtract one from the string length.
+	STATUSTEXT, GUID, MESSAGE indicate a string encoded in the usual GroupWise binary string encoding: a UINT32 containing the string length in little-endian, followed by the string itself, as UTF-8 encoded tqunicode.  The string length value includes a terminating NUL, so when converting to a TQString, subtract one from the string length.
 	FLAGS contains a UINT32 containing the server's flags for this conference.  See gwerror.h for the possible values and meanings of these flags.  Only Logging has been observed in practice.
 
 	All events are timestamped with the local time on receipt.
@@ -58,7 +58,7 @@ class EventTransfer;
 	From gwerror.h:
 	enum Event {		InvalidRecipient 		= 101,
 							NOTHANDLED
-						UndeliverableStatus 	= 102,
+						UndeliverabletqStatus 	= 102,
 							NOTHANDLED * 
 						StatusChange 			= 103,
 							TQ_UINT16 STATUS
diff --git a/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp b/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp
index fb9ab8b3..be645abb 100644
--- a/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp
@@ -60,9 +60,9 @@ bool EventTransfer::hasMessage()
 	return ( m_contentFlags & Message );
 }
 
-bool EventTransfer::hasStatus()
+bool EventTransfer::hastqStatus()
 {
-	return ( m_contentFlags & Status );
+	return ( m_contentFlags & tqStatus );
 }
 
 bool EventTransfer::hasStatusText()
@@ -131,10 +131,10 @@ void EventTransfer::setMessage( const TQString & message )
 	m_message = message;
 }
 
-void EventTransfer::setStatus( const TQ_UINT16 inStatus )
+void EventTransfer::settqStatus( const TQ_UINT16 intqStatus )
 {
-	m_contentFlags |= Status;
-	m_status = inStatus;
+	m_contentFlags |= tqStatus;
+	m_status = intqStatus;
 }
 
 void EventTransfer::setStatusText( const TQString & statusText )
diff --git a/kopete/protocols/groupwise/libgroupwise/eventtransfer.h b/kopete/protocols/groupwise/libgroupwise/eventtransfer.h
index ad325619..594d0d16 100644
--- a/kopete/protocols/groupwise/libgroupwise/eventtransfer.h
+++ b/kopete/protocols/groupwise/libgroupwise/eventtransfer.h
@@ -47,7 +47,7 @@ public:
 					Guid = 			0x00000008,
 					Flags = 		0x00000010,
 					Message = 		0x00000020,
-					Status = 		0x00000040,
+					tqStatus = 		0x00000040,
 					StatusText = 	0x00000080 };
 	/**
 	 * Constructor
@@ -70,7 +70,7 @@ public:
 	bool hasGuid();
 	bool hasFlags();
 	bool hasMessage();
-	bool hasStatus();
+	bool hastqStatus();
 	bool hasStatusText();
 	
 	/**
@@ -92,7 +92,7 @@ public:
 	void setGuid( const GroupWise::ConferenceGuid & guid );
 	void setFlags( const TQ_UINT32 flags );
 	void setMessage( const TQString & message );
-	void setStatus( const TQ_UINT16 status );
+	void settqStatus( const TQ_UINT16 status );
 	void setStatusText( const TQString & statusText);
 	
 private:
diff --git a/kopete/protocols/groupwise/libgroupwise/gwchatrooms.h b/kopete/protocols/groupwise/libgroupwise/gwchatrooms.h
index 4e73955a..5349fd30 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwchatrooms.h
+++ b/kopete/protocols/groupwise/libgroupwise/gwchatrooms.h
@@ -44,7 +44,7 @@ struct ChatroomSearchResult
 class Chatroom
 {
 	public:
-		enum UserStatus { Participating, NotParticipating };
+		enum UsertqStatus { Participating, NotParticipating };
 		enum Rights { Read = 1, Write = 2, Modify = 4, Moderator = 8, Owner = 16 };
 		TQString creatorDN;
 		TQString description;
@@ -57,7 +57,7 @@ class Chatroom
 		bool archive;
 		uint maxUsers;
 		uint chatRights;
-		UserStatus userStatus;
+		UsertqStatus usertqStatus;
 		TQDateTime createdOn;
 		uint participantsCount;
 		// haveParticipants, Acl, Invites indicate if we have obtained these lists from the server, so we can tell 'not fetched list' and 'fetched empty list' apart.
diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
index e3827622..7305f7bc 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
@@ -19,7 +19,7 @@
     *************************************************************************
 */
 
-//#include<textstream.h>
+//#include<tqtextstream.h>
 //#include<tqguardedptr.h>
 // #include<qca.h>
 // #include<stdlib.h>
@@ -378,7 +378,7 @@ void cs_dump( const TQByteArray &bytes )
 {
 //#define GW_CLIENTSTREAM_DEBUG 1
 #ifdef GW_CLIENTSTREAM_DEBUG
-	CoreProtocol::debug( TQString( "contains: %1 bytes " ).arg( bytes.count() ) );
+	CoreProtocol::debug( TQString( "contains: %1 bytes " ).tqarg( bytes.count() ) );
 	uint count = 0;
 	while ( count < bytes.count() )
 	{
@@ -440,7 +440,7 @@ void ClientStream::cp_incomingData()
 		emit doReadyRead();
 	}
 	else
-		CoreProtocol::debug( TQString( " - client signalled incomingData but none was available, state is: %1" ).arg( d->client.state() ) );
+		CoreProtocol::debug( TQString( " - client signalled incomingData but none was available, state is: %1" ).tqarg( d->client.state() ) );
 }
 
 void ClientStream::cr_connected()
@@ -520,7 +520,7 @@ void ClientStream::ss_readyRead()
 
 #ifdef LIBGW_DEBUG
 	TQCString cs(a.data(), a.size()+1);
-	CoreProtocol::debug( TQString( "ClientStream: ss_readyRead() recv: %1 bytes" ).arg( a.size() ) );
+	CoreProtocol::debug( TQString( "ClientStream: ss_readyRead() recv: %1 bytes" ).tqarg( a.size() ) );
 	cs_dump( a );
 #endif
 
@@ -532,7 +532,7 @@ void ClientStream::ss_readyRead()
 void ClientStream::ss_bytesWritten(int bytes)
 {
 #ifdef LIBGW_DEBUG
-	CoreProtocol::debug( TQString( "ClientStream::ss_bytesWritten: %1 bytes written" ).arg( bytes ) );
+	CoreProtocol::debug( TQString( "ClientStream::ss_bytesWritten: %1 bytes written" ).tqarg( bytes ) );
 #else
 	Q_UNUSED( bytes );
 #endif
@@ -556,7 +556,7 @@ void ClientStream::ss_tlsClosed()
 
 void ClientStream::ss_error(int x)
 {
-	CoreProtocol::debug( TQString( "ClientStream::ss_error() x=%1 ").arg( x ) );
+	CoreProtocol::debug( TQString( "ClientStream::ss_error() x=%1 ").tqarg( x ) );
 	if(x == SecureStream::ErrTLS) {
 		reset();
 		d->errCond = TLSFail;
diff --git a/kopete/protocols/groupwise/libgroupwise/gwerror.cpp b/kopete/protocols/groupwise/libgroupwise/gwerror.cpp
index ba2a2a58..65574eb3 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwerror.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/gwerror.cpp
@@ -146,7 +146,7 @@ TQString GroupWise::errorCodeToString( int errorCode )
 			errorString = i18n( "Chat has been removed from server" );
 			break;
 		default:
-			errorString = i18n("Unrecognized error code: %s").arg( errorCode );
+			errorString = i18n("Unrecognized error code: %s").tqarg( errorCode );
 #else
 		case NMERR_ACCESS_DENIED:
 			errorString = "Access denied";
@@ -269,7 +269,7 @@ TQString GroupWise::errorCodeToString( int errorCode )
 			errorString = "Chat has been removed from server";
 			break;
 		default:
-			errorString = TQString("Unrecognized error code: %s").arg( errorCode );
+			errorString = TQString("Unrecognized error code: %s").tqarg( errorCode );
 #endif
 	}
 	return errorString;
diff --git a/kopete/protocols/groupwise/libgroupwise/gwerror.h b/kopete/protocols/groupwise/libgroupwise/gwerror.h
index f19d3d39..f5de53ce 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwerror.h
+++ b/kopete/protocols/groupwise/libgroupwise/gwerror.h
@@ -36,7 +36,7 @@ typedef TQ_UINT16 NMERR_T;
 
 namespace GroupWise
 {
-	enum Status {	Unknown = 0,
+	enum tqStatus {	Unknown = 0,
 					Offline = 1,
 					Available = 2,
 					Busy = 3,
@@ -58,7 +58,7 @@ namespace GroupWise
 				};
 	
 	enum Event {		InvalidRecipient 		= 101,
-						UndeliverableStatus 	= 102,
+						UndeliverabletqStatus 	= 102,
 						StatusChange 			= 103,
 						ContactAdd 				= 104,
 						ConferenceClosed 		= 105,
@@ -164,9 +164,9 @@ namespace GroupWise
 		int operation;
 	};
 
-	struct CustomStatus
+	struct CustomtqStatus
 	{
-		GroupWise::Status status;
+		GroupWise::tqStatus status;
 		TQString name;
 		TQString autoReply;
 	};
diff --git a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp
index 415905bf..14a5af70 100644
--- a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp
@@ -98,7 +98,7 @@ bool InputProtocolBase::safeReadBytes( TQCString & data, uint & len )
 		// if ( (TQ_UINT8)( * ( temp.data() + ( temp.length() - 1 ) ) ) == 0xFF )
 		if ( temp.length() < ( val - 1 ) )
 		{
-			debug( TQString( "InputProtocol::safeReadBytes() - string broke, giving up, only got: %1 bytes out of %2" ).arg( temp.length() ).arg( val ) );
+			debug( TQString( "InputProtocol::safeReadBytes() - string broke, giving up, only got: %1 bytes out of %2" ).tqarg( temp.length() ).tqarg( val ) );
 			m_state = NeedMore;
 			return false;
 		}
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp
index 7e7dbeed..9aa7d80b 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp
@@ -586,7 +586,7 @@ TQString RSAKey::toPEM(bool publicOnly) const
 	TQCString cs;
 	cs.resize(out.size()+1);
 	memcpy(cs.data(), out.data(), out.size());
-	return TQString::fromLatin1(cs);
+	return TQString::tqfromLatin1(cs);
 }
 
 bool RSAKey::fromPEM(const TQString &str)
@@ -798,7 +798,7 @@ TQString Cert::toPEM() const
 	TQCString cs;
 	cs.resize(out.size()+1);
 	memcpy(cs.data(), out.data(), out.size());
-	return TQString::fromLatin1(cs);
+	return TQString::tqfromLatin1(cs);
 }
 
 bool Cert::fromPEM(const TQString &str)
diff --git a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp
index a3c82b51..50788178 100644
--- a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp
@@ -71,7 +71,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes )
 			return 0;
 		}
 		headerRest.append( line );
-		debug( TQString( "- read header line - (%1) : %2" ).arg( line.length() ).arg( line.data() ) );
+		debug( TQString( "- read header line - (%1) : %2" ).tqarg( line.length() ).tqarg( line.data() ) );
 	}
 	debug( "ResponseProtocol::readResponse() header finished" );
 	// if it's a redirect, set flag
@@ -85,14 +85,14 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes )
 	// other header processing ( 500! )
 	if ( ok && rtnCode == 500 )
 	{
-		debug( TQString( "- server error %1" ).arg( rtnCode ) );
+		debug( TQString( "- server error %1" ).tqarg( rtnCode ) );
 		packetState = ServerError;
 		m_din.unsetDevice();
 		return 0;
 	}
 	if ( ok && rtnCode == 404 )
 	{
-		debug( TQString( "- server error %1" ).arg( rtnCode ) );
+		debug( TQString( "- server error %1" ).tqarg( rtnCode ) );
 		packetState = ServerError;
 		m_din.unsetDevice();
 		return 0;
@@ -123,7 +123,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes )
 		if ( sf )
 		{
 			tId = sf->value().toInt();
-			debug( TQString( "ResponseProtocol::readResponse() - transaction ID is %1" ).arg( tId ) );
+			debug( TQString( "ResponseProtocol::readResponse() - transaction ID is %1" ).tqarg( tId ) );
 			m_collatingFields.remove( it );
 			delete sf;
 		}
@@ -135,7 +135,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes )
 		if ( sf )
 		{
 			resultCode = sf->value().toInt();
-			debug( TQString( "ResponseProtocol::readResponse() - result code is %1" ).arg( resultCode ) );
+			debug( TQString( "ResponseProtocol::readResponse() - result code is %1" ).tqarg( resultCode ) );
 			m_collatingFields.remove( it );
 			delete sf;
 		}
@@ -143,7 +143,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes )
 	// append to inQueue
 	if ( tId )
 	{
-		debug( TQString( "ResponseProtocol::readResponse() - setting state Available, got %1 fields in base array" ).arg(m_collatingFields.count() ) );
+		debug( TQString( "ResponseProtocol::readResponse() - setting state Available, got %1 fields in base array" ).tqarg(m_collatingFields.count() ) );
 		packetState = Available;
 		bytes = m_bytes;
 		m_din.unsetDevice();
@@ -169,7 +169,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list )
 	// if we find the beginning of a new nested list, push the current list onto m_collatingFields
 	debug( "ResponseProtocol::readFields()" );
 	if ( fieldCount > 0 )
-		debug( TQString( "reading %1 fields" ).arg( fieldCount ) );
+		debug( TQString( "reading %1 fields" ).tqarg( fieldCount ) );
 	Field::FieldList currentList;
 	while ( fieldCount != 0 )  // prevents bad input data from ruining our day
 	{
@@ -209,7 +209,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list )
 			return false;
 		}
 
-		debug( TQString( "- type: %1, method: %2, tag: %3," ).arg( type ).arg( method ).arg( tag.data() ) );
+		debug( TQString( "- type: %1, method: %2, tag: %3," ).tqarg( type ).tqarg( method ).tqarg( tag.data() ) );
 		// if multivalue or array
 		if ( type == NMFIELD_TYPE_MV || type == NMFIELD_TYPE_ARRAY )
 		{
@@ -223,7 +223,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list )
 			m_bytes += sizeof( TQ_UINT32 );
 
 			// create multifield
-			debug( TQString( " multi field containing: %1" ).arg( val ) );
+			debug( TQString( " multi field containing: %1" ).tqarg( val ) );
 			Field::MultiField* m = new Field::MultiField( tag, method, 0, type );
 			currentList.append( m );
 			if ( !readFields( val, &currentList) )
@@ -248,9 +248,9 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list )
 					m_packetState = ProtocolError;
 					break;
 				}
-				// convert to unicode - ignore the terminating NUL, because TQt<3.3.2 doesn't sanity check val.
+				// convert to tqunicode - ignore the terminating NUL, because TQt<3.3.2 doesn't sanity check val.
 				TQString fieldValue = TQString::fromUtf8( rawData.data(), val - 1 );
-				debug( TQString( "- utf/dn single field: %1" ).arg( fieldValue ) );
+				debug( TQString( "- utf/dn single field: %1" ).tqarg( fieldValue ) );
 				// create singlefield
 				Field::SingleField* s = new Field::SingleField( tag, method, 0, type, fieldValue );
 				currentList.append( s );
@@ -266,7 +266,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list )
 				}
 				m_din >> val;
 				m_bytes += sizeof( TQ_UINT32 );
-				debug( TQString( "- numeric field: %1" ).arg( val ) );
+				debug( TQString( "- numeric field: %1" ).tqarg( val ) );
 				Field::SingleField* s = new Field::SingleField( tag, method, 0, type, val );
 				currentList.append( s );
 			}
diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.cc b/kopete/protocols/groupwise/libgroupwise/rtf.cc
index a74b4c67..afe7b18e 100644
--- a/kopete/protocols/groupwise/libgroupwise/rtf.cc
+++ b/kopete/protocols/groupwise/libgroupwise/rtf.cc
@@ -2182,7 +2182,7 @@ void Level::clearParagraphFormatting()
     // implicitly start a paragraph
     if (!isParagraphOpen())
        startParagraph();
-    // Since we don't implement any of the paragraph formatting tags (e.g. alignment),
+    // Since we don't implement any of the paragraph formatting tags (e.g. tqalignment),
     // we don't clean up anything here. Note that \pard does NOT clean character
     // formatting (such as font size, font weight, italics...).
     p->parStyle.clearFormatting();
diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.ll b/kopete/protocols/groupwise/libgroupwise/rtf.ll
index 67e9f5f5..7f2f1841 100644
--- a/kopete/protocols/groupwise/libgroupwise/rtf.ll
+++ b/kopete/protocols/groupwise/libgroupwise/rtf.ll
@@ -517,7 +517,7 @@ void Level::clearParagraphFormatting()
     // implicitly start a paragraph
     if (!isParagraphOpen())
        startParagraph();
-    // Since we don't implement any of the paragraph formatting tags (e.g. alignment),
+    // Since we don't implement any of the paragraph formatting tags (e.g. tqalignment),
     // we don't clean up anything here. Note that \pard does NOT clean character
     // formatting (such as font size, font weight, italics...).
     p->parStyle.clearFormatting();
diff --git a/kopete/protocols/groupwise/libgroupwise/rtf2html.h b/kopete/protocols/groupwise/libgroupwise/rtf2html.h
index 3a3122d8..5685e4a1 100644
--- a/kopete/protocols/groupwise/libgroupwise/rtf2html.h
+++ b/kopete/protocols/groupwise/libgroupwise/rtf2html.h
@@ -21,7 +21,7 @@
 #include <tqstring.h>
 #include <stdio.h>
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqcolor.h>
 #include <tqregexp.h>
 #include <kdebug.h>
diff --git a/kopete/protocols/groupwise/libgroupwise/task.cpp b/kopete/protocols/groupwise/libgroupwise/task.cpp
index 547844d9..858c8fde 100644
--- a/kopete/protocols/groupwise/libgroupwise/task.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/task.cpp
@@ -130,7 +130,7 @@ bool Task::take( Transfer * transfer)
 	if(p.isEmpty())
 		return false;
 
-	// pass along the transfer to our children
+	// pass along the transfer to our tqchildren
 	TQObjectListIt it(p);
 	Task *t;
 	for(; it.current(); ++it) {
@@ -142,7 +142,7 @@ bool Task::take( Transfer * transfer)
 		
 		if(t->take( transfer ))
 		{
-			client()->debug( TQString( "Transfer ACCEPTED by: %1" ).arg( t->className() ) );
+			client()->debug( TQString( "Transfer ACCEPTED by: %1" ).tqarg( t->className() ) );
 			return true;
 		}
 	}
@@ -256,7 +256,7 @@ void Task::clientDisconnected()
 
 void Task::debug(const TQString &str)
 {
-	client()->debug(TQString("%1: ").arg(className()) + str);
+	client()->debug(TQString("%1: ").tqarg(className()) + str);
 }
 
 bool Task::forMe( const Transfer * transfer ) const
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
index c88e22b4..3fccc218 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" ).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 ) );
+	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 ) );
 }
 
 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" ).arg( event.message ) );
+				client()->debug( TQString( "message: %1" ).tqarg( 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" ).arg( event.message ) );
+				client()->debug( TQString( "message: %1" ).tqarg( 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" ).arg( event.message.ascii() ) );
+				client()->debug( TQString( "message: %1" ).tqarg( 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" ).arg( event.message ) );
+				client()->debug( TQString( "message: %1" ).tqarg( 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" ).arg( event.message ) );
+				client()->debug( TQString( "message: %1" ).tqarg( event.message ) );
 				emit systemBroadcast( event );
 				break;
 			default:
-				client()->debug( TQString( "WARNING: didn't handle registered event %1, on conference %2" ).arg( incomingEvent->eventType() ).arg( event.guid.ascii() ) );
+				client()->debug( TQString( "WARNING: didn't handle registered event %1, on conference %2" ).tqarg( incomingEvent->eventType() ).tqarg( 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" ).arg( (*current).user ) );
+			client()->debug( TQString( " - got details for event involving %1" ).tqarg( (*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" ).arg( event.user ) );
+		client()->debug( TQString( "ConferenceTask::queueWhileAwaitingData() - queueing event involving %1" ).tqarg( 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 0d167236..920eec3b 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" ).arg( (*it).name ).arg( (*it).id ) );
+		client()->debug( TQString( " - contact is in folder %1 with id %2" ).tqarg( (*it).name ).tqarg( (*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" ).arg
-			( addedContact.displayName ).arg( addedContact.id ).arg( addedContact.parentId ) );
+	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 ) );
 			
 	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 a62cf022..7744552c 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_queryStatus = (SearchResultCode)sf->value().toInt();
+	m_querytqStatus = (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_queryStatus != DataRetrieved )
-		setError( m_queryStatus );
+	if ( m_querytqStatus != DataRetrieved )
+		setError( m_querytqStatus );
 	else
 	{
 		kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << " we won!" << endl;
-		setSuccess( m_queryStatus );
+		setSuccess( m_querytqStatus );
 	}
 	return true;
 }
@@ -97,9 +97,9 @@ TQValueList< GroupWise::ChatroomSearchResult > GetChatSearchResultsTask::results
 	return m_results;
 }
 
-int GetChatSearchResultsTask::queryStatus()
+int GetChatSearchResultsTask::querytqStatus()
 {
-	return m_queryStatus;
+	return m_querytqStatus;
 }
 
 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 5671a122..bebe8ff7 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 queryStatus();
+		int querytqStatus();
 		TQValueList< GroupWise::ChatroomSearchResult > results();
 	private:
 		GroupWise::ChatroomSearchResult extractChatDetails( Field::FieldList & fields );
-		SearchResultCode m_queryStatus;
+		SearchResultCode m_querytqStatus;
 		TQValueList< GroupWise::ChatroomSearchResult > m_results;
 };
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp
index 2b77e33e..86179b62 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 gotStatus( m_userDN, status, TQString() );
+		emit gottqStatus( 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 aec5050f..bd291c62 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 gotStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText );
+	void gottqStatus( 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 b7b1f1cc..ed4f6bfd 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" ).arg( details.dn ) );
+	client()->debug( TQString( "JoinConferenceTask::slotReceiveUserDetails() - got %1" ).tqarg( 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?" ).arg(current ) );
+		client()->debug( TQString( " - can we remove %1?" ).tqarg(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").arg( m_unknowns.count() ) );
+	client()->debug( TQString( " - now %1 unknowns").tqarg( 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 6a28124f..f3d55583 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::fromLatin1("login:%1:%2").arg( client()->host() ).arg( client()->port() );
+	TQString command = TQString::tqfromLatin1("login:%1:%2").tqarg( client()->host() ).tqarg( 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." ).arg( folder.name ).arg(  folder.id ).arg( folder.parentId ).arg( folder.sequence ) );
+	client()->debug( TQString( "Got folder: %1, obj: %2, parent: %3, seq: %3." ).tqarg( folder.name ).tqarg(  folder.id ).tqarg( folder.parentId ).tqarg( 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::CustomStatus custom;
+					GroupWise::CustomtqStatus 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::Status)sf3->value().toInt();
+								custom.status = (GroupWise::tqStatus)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 gotCustomStatus( custom );
+					emit gotCustomtqStatus( custom );
 				}
 			}
 		}
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h
index fdeaeb9d..f37add97 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 gotCustomStatus( const GroupWise::CustomStatus & );
+	void gotCustomtqStatus( const GroupWise::CustomtqStatus & );
 	void gotKeepalivePeriod( int );
 };
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp
index 12c7382a..5a1eb414 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" ).arg( addedFolder.name ).arg( addedFolder.id ) );
+		client()->debug( TQString( "NeedFolderTask::slotFolderAdded() - Folder %1 was created on the server, now has objectId %2" ).tqarg( addedFolder.name ).tqarg( 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 d65a5a20..38870112 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_queryStatus = sf->value().toInt();
+	m_querytqStatus = 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_queryStatus != 2 )
-		setError( m_queryStatus );
+	if ( m_querytqStatus != 2 )
+		setError( m_querytqStatus );
 	else
-		setSuccess( m_queryStatus );
+		setSuccess( m_querytqStatus );
 	return true;
 }
 
@@ -102,9 +102,9 @@ TQValueList< GroupWise::ContactDetails > PollSearchResultsTask::results()
 	return m_results;
 }
 
-int PollSearchResultsTask::queryStatus()
+int PollSearchResultsTask::querytqStatus()
 {
-	return m_queryStatus;
+	return m_querytqStatus;
 }
 
 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 c69b7e0c..ccf0560b 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 queryStatus();
+	int querytqStatus();
 	TQValueList< GroupWise::ContactDetails > results();
 GroupWise::ContactDetails extractUserDetails( Field::FieldList & fields );
 private:
-	int m_queryStatus;
+	int m_querytqStatus;
 	TQValueList< GroupWise::ContactDetails > m_results;
 };
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp
index 44f54124..7d4b41aa 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" ).arg( className() ).arg( static_cast<Request *>( transfer() )->command() ) );
+		client()->debug( TQString( "%1::onGo() - sending %2 fields" ).tqarg( className() ).tqarg( 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 87694eb4..946450e9 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->queryStatus() << endl;
+	kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << gcsrt->querytqStatus() << endl;
 	m_polls++;
-	switch ( gcsrt->queryStatus() )
+	switch ( gcsrt->querytqStatus() )
 	{
 		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 1b64c47d..3dde5297 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::currentDateTime().toTime_t () );
+	m_queryHandle = TQString::number( TQDateTime::tqcurrentDateTime().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->queryStatus() << endl;
+	kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << psrt->querytqStatus() << endl;
 	m_polls++;
-	switch ( psrt->queryStatus() )
+	switch ( psrt->querytqStatus() )
 	{
 		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 bf463407..817df4a6 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( Status newStatus, const TQString &awayMessage, const TQString &autoReply )
+void SetStatusTask::status( tqStatus newtqStatus, const TQString &awayMessage, const TQString &autoReply )
 {
-	if ( newStatus > GroupWise::Invalid )
+	if ( newtqStatus > GroupWise::Invalid )
 	{
 		setError( 1, "Invalid Status" );
 		return;
 	}
 	
-	m_status = newStatus;
+	m_status = newtqStatus;
 	m_awayMessage = awayMessage;
 	m_autoReply = autoReply;
 	
 	Field::FieldList lst;
-	lst.append( new Field::SingleField( NM_A_SZ_STATUS, 0, NMFIELD_TYPE_UTF8, TQString::number( newStatus ) ) );
+	lst.append( new Field::SingleField( NM_A_SZ_STATUS, 0, NMFIELD_TYPE_UTF8, TQString::number( newtqStatus ) ) );
 	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( Status newStatus, const TQString &awayMessage, const
 	createTransfer( "setstatus", lst );
 }
 
-Status SetStatusTask::requestedStatus() const
+tqStatus SetStatusTask::requestedtqStatus() const
 {
 	return m_status;
 }
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h
index 4a7a753d..0c316220 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::Status newStatus, const TQString &awayMessage, const TQString &autoReply );
-	GroupWise::Status requestedStatus() const;
+	void status( GroupWise::tqStatus newtqStatus, const TQString &awayMessage, const TQString &autoReply );
+	GroupWise::tqStatus requestedtqStatus() const;
 	TQString awayMessage() const;
 	TQString autoReply() const; 
 private:
-	GroupWise::Status m_status;
+	GroupWise::tqStatus 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 e7272402..7076324a 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" ).arg( event->source() ).arg( event->status() ).arg( event->statusText() ) );
-		emit gotStatus( event->source().lower(), event->status(), event->statusText() );
+		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() );
 		return true;
 	}
 	else
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h
index cc14bace..de5839d7 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 gotStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText );
+	void gottqStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText );
 };
 
 #endif
diff --git a/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp b/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp
index 2dace60b..0eb61409 100644
--- a/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp
@@ -62,15 +62,15 @@ void buildList()
 	//				sf - contactlist (empty field array)
 	//				sf - message body 
 	
-	Field::SingleField* sf = new Field::SingleField( NM_A_FA_MESSAGE, 0, NMFIELD_TYPE_UTF8, TQString::fromLatin1( "Da steh ich nun, ich armer Tor! Und bin so klug als wie zuvor..." ) );
+	Field::SingleField* sf = new Field::SingleField( NM_A_FA_MESSAGE, 0, NMFIELD_TYPE_UTF8, TQString::tqfromLatin1( "Da steh ich nun, ich armer Tor! Und bin so klug als wie zuvor..." ) );
 	fl.append( sf );
-	sf = new Field::SingleField( NM_A_SZ_TRANSACTION_ID, 0, NMFIELD_TYPE_UTF8, TQString::fromLatin1( "maeuschen" ) );
+	sf = new Field::SingleField( NM_A_SZ_TRANSACTION_ID, 0, NMFIELD_TYPE_UTF8, TQString::tqfromLatin1( "maeuschen" ) );
 	fl.append( sf );
 	// nested list
 	Field::FieldList nl;
 	sf = new Field::SingleField( NM_A_SZ_STATUS, 0, NMFIELD_TYPE_UDWORD, 123 );
 	nl.append( sf );
-	sf = new Field::SingleField( NM_A_SZ_MESSAGE_BODY, 0, NMFIELD_TYPE_UTF8, TQString::fromLatin1( "bla bla" ) );
+	sf = new Field::SingleField( NM_A_SZ_MESSAGE_BODY, 0, NMFIELD_TYPE_UTF8, TQString::tqfromLatin1( "bla bla" ) );
 	nl.append( sf );
 	Field::MultiField* mf = new Field::MultiField( NM_A_FA_PARTICIPANTS, NMFIELD_METHOD_VALID, 0, NMFIELD_TYPE_ARRAY );
 	mf->setFields( nl );
diff --git a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp
index ceb29632..f87cfa25 100644
--- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp
@@ -88,7 +88,7 @@ void UserDetailsManager::requestDetails( const TQStringList & dnList, bool onlyU
 		TQStringList::Iterator found = m_pendingDNs.find( *it );
 		if ( found == m_pendingDNs.end() )
 		{
-			m_client->debug( TQString( "UserDetailsManager::requestDetails - including %1" ).arg( (*it) ) );
+			m_client->debug( TQString( "UserDetailsManager::requestDetails - including %1" ).tqarg( (*it) ) );
 			requestList.append( *it );
 			m_pendingDNs.append( *it );
 		}
@@ -110,7 +110,7 @@ void UserDetailsManager::requestDetails( const TQStringList & dnList, bool onlyU
 
 void UserDetailsManager::requestDetails( const TQString & dn, bool onlyUnknown )
 {
-	m_client->debug( TQString( "UserDetailsManager::requestDetails for %1" ).arg( dn ) );
+	m_client->debug( TQString( "UserDetailsManager::requestDetails for %1" ).tqarg( dn ) );
 	TQStringList list;
 	list.append( dn );
 	requestDetails( list, onlyUnknown );