TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

119 files changed, 572 insertions, 524 deletions

diff --git a/kopete/protocols/groupwise/libgroupwise/Makefile.am b/kopete/protocols/groupwise/libgroupwise/Makefile.am
index 2df23a01..bf57f0e3 100644
--- a/kopete/protocols/groupwise/libgroupwise/Makefile.am
+++ b/kopete/protocols/groupwise/libgroupwise/Makefile.am
@@ -26,7 +26,7 @@ libgroupwise_la_SOURCES = bytestream.cpp chatroommanager.cpp client.cpp \
 	safedelete.cpp securestream.cpp stream.cpp task.cpp tlshandler.cpp transfer.cpp \
 	transferbase.cpp userdetailsmanager.cpp usertransfer.cpp
 libgroupwise_la_LDFLAGS = -no-undefined $(all_libraries)
-libgroupwise_la_LIBADD = tasks/libgroupwise_tasks.la -lqt-mt qca/src/libqca.la 
+libgroupwise_la_LIBADD = tasks/libgroupwise_tasks.la qca/src/libqca.la 
 
 tests_COMPILE_FIRST = libgroupwise.la libgwtest.la
 
@@ -37,4 +37,4 @@ libgwtest_la_SOURCES = coreprotocol.cpp eventtransfer.cpp \
 			bytestream.cpp
 libgwtest_la_LDFLAGS = $(all_libraries) -no-undefined
 libgwtest_la_LIBADD = qca/src/libqca.la \
-	$(top_builddir)/kopete/protocols/groupwise/libgroupwise/tasks/libgroupwise_tasks.la -lqt-mt
+	$(top_builddir)/kopete/protocols/groupwise/libgroupwise/tasks/libgroupwise_tasks.la
diff --git a/kopete/protocols/groupwise/libgroupwise/bytestream.cpp b/kopete/protocols/groupwise/libgroupwise/bytestream.cpp
index 0b20c050..35ef278e 100644
--- a/kopete/protocols/groupwise/libgroupwise/bytestream.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/bytestream.cpp
@@ -63,9 +63,9 @@ public:
 };
 
 //!
-//! Constructs a ByteStream object with parent \a parent.
-ByteStream::ByteStream(TQObject *parent)
-:TQObject(parent)
+//! Constructs a ByteStream object with tqparent \a tqparent.
+ByteStream::ByteStream(TQObject *tqparent)
+:TQObject(tqparent)
 {
 	d = new Private;
 }
diff --git a/kopete/protocols/groupwise/libgroupwise/bytestream.h b/kopete/protocols/groupwise/libgroupwise/bytestream.h
index f10b46a1..5706fff6 100644
--- a/kopete/protocols/groupwise/libgroupwise/bytestream.h
+++ b/kopete/protocols/groupwise/libgroupwise/bytestream.h
@@ -27,12 +27,13 @@
 // CS_NAMESPACE_BEGIN
 
 // CS_EXPORT_BEGIN
-class ByteStream : public QObject
+class ByteStream : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	enum Error { ErrRead, ErrWrite, ErrCustom = 10 };
-	ByteStream(TQObject *parent=0);
+	ByteStream(TQObject *tqparent=0);
 	virtual ~ByteStream()=0;
 
 	virtual bool isOpen() const;
diff --git a/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp b/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp
index 3ee9b947..87333c41 100644
--- a/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp
@@ -28,8 +28,8 @@
 
 #include "chatroommanager.h"
 
-ChatroomManager::ChatroomManager( Client * parent, const char *name)
-	: TQObject(parent, name), m_client( parent ), m_replace( false )
+ChatroomManager::ChatroomManager( Client * tqparent, const char *name)
+	: TQObject(tqparent, name), m_client( tqparent ), m_tqreplace( false )
 {
 }
 
@@ -49,7 +49,7 @@ GroupWise::ChatroomMap ChatroomManager::rooms()
 
 void ChatroomManager::getChatrooms( bool refresh )
 {
-	m_replace = !refresh;
+	m_tqreplace = !refresh;
 	SearchChatTask * sct = new SearchChatTask( m_client->rootTask() );
 	sct->search( ( refresh ? SearchChatTask::SinceLastSearch : SearchChatTask::FetchAll ) );
 	connect( sct, TQT_SIGNAL( finished() ), TQT_SLOT( slotGotChatroomList() ) );
@@ -62,7 +62,7 @@ void ChatroomManager::slotGotChatroomList()
 	SearchChatTask * sct = (SearchChatTask *)sender();
 	if ( sct )
 	{
-		if ( m_replace )
+		if ( m_tqreplace )
 			m_rooms.clear();
 		
 		TQValueList<ChatroomSearchResult> roomsFound = sct->results();
@@ -94,7 +94,7 @@ void ChatroomManager::slotGotChatCounts()
 		const TQMap< TQString, int >::iterator end = newCounts.end();
 
 		for ( ; it != end; ++it )
-			if ( m_rooms.contains( it.key() ) )
+			if ( m_rooms.tqcontains( it.key() ) )
 				m_rooms[ it.key() ].participantsCount = it.data();
 	}
 	emit updated();
@@ -102,7 +102,7 @@ void ChatroomManager::slotGotChatCounts()
 
 void ChatroomManager::requestProperties( const TQString & displayName )
 {
-	if ( 0 /*m_rooms.contains( displayName ) */)
+	if ( 0 /*m_rooms.tqcontains( displayName ) */)
 		emit gotProperties( m_rooms[ displayName ] );	
 	else
 	{
diff --git a/kopete/protocols/groupwise/libgroupwise/chatroommanager.h b/kopete/protocols/groupwise/libgroupwise/chatroommanager.h
index 5fff7b73..60f55b01 100644
--- a/kopete/protocols/groupwise/libgroupwise/chatroommanager.h
+++ b/kopete/protocols/groupwise/libgroupwise/chatroommanager.h
@@ -29,9 +29,10 @@ class Client;
  * Keeps a record of the server side chatrooms
  * @author SUSE Linux Products GmbH
  */
-class ChatroomManager : public QObject
+class ChatroomManager : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
 		ChatroomManager( Client * client, const char *name = 0);
 		~ChatroomManager();
@@ -60,7 +61,7 @@ class ChatroomManager : public QObject
 	private:
 		Client * m_client;
 		GroupWise::ChatroomMap m_rooms;
-		bool m_replace;
+		bool m_tqreplace;
 };
 
 #endif
diff --git a/kopete/protocols/groupwise/libgroupwise/client.cpp b/kopete/protocols/groupwise/libgroupwise/client.cpp
index 1a88fbc3..c91f652d 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;
 };
 
@@ -103,7 +103,7 @@ void Client::connectToServer( ClientStream *s, const NovellDN &server, bool auth
 	//connect(d->stream, TQT_SIGNAL(connected()), TQT_SLOT(streamConnected()));
 	//connect(d->stream, TQT_SIGNAL(handshaken()), TQT_SLOT(streamHandshaken()));
 	connect(d->stream, TQT_SIGNAL(error(int)), TQT_SLOT(streamError(int)));
-	//connect(d->stream, TQT_SIGNAL(sslCertificateReady(const QSSLCert &)), TQT_SLOT(streamSSLCertificateReady(const QSSLCert &)));
+	//connect(d->stream, TQT_SIGNAL(sslCertificateReady(const TQSSLCert &)), TQT_SLOT(streamSSLCertificateReady(const TQSSLCert &)));
 	connect(d->stream, TQT_SIGNAL(readyRead()), TQT_SLOT(streamReadyRead()));
 	//connect(d->stream, TQT_SIGNAL(closeFinished()), TQT_SLOT(streamCloseFinished()));
 
@@ -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 &, Q_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, Q_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 &, Q_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, Q_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()
@@ -326,7 +326,7 @@ void Client::lt_loginFinished()
 		debug( "Client::lt_loginFinished() LOGIN SUCCEEDED" );
 		// set our initial status
 		SetStatusTask * sst = new SetStatusTask( d->root );
-		sst->status( GroupWise::Available, TQString::null, TQString::null );
+		sst->status( GroupWise::Available, TQString(), TQString() );
 		sst->go( true );
 		emit loggedIn();
 		// fetch details for any privacy list items that aren't in our contact list.
@@ -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() );
 	}
 }
 
@@ -365,10 +365,10 @@ void Client::ct_messageReceived( const ConferenceEvent & messageEvent )
 	// we can drop these once the server reenables the sending of unformatted text
 	// redundant linebreak at the end of the message
 	TQRegExp rx(" </span> </span> </span><br>$");
-	transformedEvent.message.replace( rx, "</span></span></span>" );
+	transformedEvent.message.tqreplace( rx, "</span></span></span>" );
 	// missing linebreak after first line of an encrypted message
 	TQRegExp ry("-----BEGIN PGP MESSAGE----- </span> </span> </span>");
-	transformedEvent.message.replace( ry, "-----BEGIN PGP MESSAGE-----</span></span></span><br/>" );
+	transformedEvent.message.tqreplace( ry, "-----BEGIN PGP MESSAGE-----</span></span></span><br/>" );
 
 	emit messageReceived( transformedEvent );
 }
@@ -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 9cdb7c68..9d559bf3 100644
--- a/kopete/protocols/groupwise/libgroupwise/client.h
+++ b/kopete/protocols/groupwise/libgroupwise/client.h
@@ -36,9 +36,10 @@ class Task;
 
 using namespace GroupWise;
 
-class Client : public QObject
+class Client : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 
 	public:
 	
@@ -46,7 +47,7 @@ Q_OBJECT
 		  EXTERNAL API 
 		 *************/
 		  
-		Client( TQObject *parent = 0, uint protocolVersion = 2 );
+		Client( TQObject *tqparent = 0, uint protocolVersion = 2 );
 		~Client();
 		void setOSName( const TQString &name );
 		void setClientName( const TQString &s );
@@ -91,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 
@@ -117,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
@@ -210,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. 
@@ -276,11 +277,11 @@ fd		 * @param password
 		/** 
 		 * A remote contact changed status
 		 */
-		void statusReceived( const TQString & contactId, Q_UINT16 status, const TQString & statusText );
+		void statusReceived( const TQString & contactId, TQ_UINT16 status, const TQString & statusText );
 		/** 
 		 * 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 */
 		/** 
@@ -370,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/connector.cpp b/kopete/protocols/groupwise/libgroupwise/connector.cpp
index 57e4d222..3b702d7a 100644
--- a/kopete/protocols/groupwise/libgroupwise/connector.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/connector.cpp
@@ -20,8 +20,8 @@
 
 #include "connector.h"
 
-Connector::Connector(TQObject *parent)
-:TQObject(parent)
+Connector::Connector(TQObject *tqparent)
+:TQObject(tqparent)
 {
 	setUseSSL(false);
 	setPeerAddressNone();
@@ -46,7 +46,7 @@ TQHostAddress Connector::peerAddress() const
 	return addr;
 }
 
-Q_UINT16 Connector::peerPort() const
+TQ_UINT16 Connector::peerPort() const
 {
 	return port;
 }
@@ -63,7 +63,7 @@ void Connector::setPeerAddressNone()
 	port = 0;
 }
 
-void Connector::setPeerAddress(const TQHostAddress &_addr, Q_UINT16 _port)
+void Connector::setPeerAddress(const TQHostAddress &_addr, TQ_UINT16 _port)
 {
 	haveaddr = true;
 	addr = _addr;
diff --git a/kopete/protocols/groupwise/libgroupwise/connector.h b/kopete/protocols/groupwise/libgroupwise/connector.h
index b1c31743..d09d0a7f 100644
--- a/kopete/protocols/groupwise/libgroupwise/connector.h
+++ b/kopete/protocols/groupwise/libgroupwise/connector.h
@@ -26,11 +26,12 @@
 
 class ByteStream;
 
-class Connector : public QObject
+class Connector : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	Connector(TQObject *parent=0);
+	Connector(TQObject *tqparent=0);
 	virtual ~Connector();
 
 	virtual void connectToServer(const TQString &server)=0;
@@ -40,7 +41,7 @@ public:
 	bool useSSL() const;
 	bool havePeerAddress() const;
 	TQHostAddress peerAddress() const;
-	Q_UINT16 peerPort() const;
+	TQ_UINT16 peerPort() const;
 
 signals:
 	void connected();
@@ -49,13 +50,13 @@ signals:
 protected:
 	void setUseSSL(bool b);
 	void setPeerAddressNone();
-	void setPeerAddress(const TQHostAddress &addr, Q_UINT16 port);
+	void setPeerAddress(const TQHostAddress &addr, TQ_UINT16 port);
 
 private:
 	bool ssl;
 	bool haveaddr;
 	TQHostAddress addr;
-	Q_UINT16 port;
+	TQ_UINT16 port;
 };
 
 #endif
diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
index 4c811eba..e48bf368 100644
--- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
@@ -50,7 +50,7 @@
 
 //#define GW_COREPROTOCOL_DEBUG
 
-QCString
+TQCString
 url_escape_string( const char *src)
 {
 	uint escape = 0;
@@ -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( "tqcontains: %1 bytes" ).tqarg( bytes.count() ) );
 	for ( uint i = 0; i < bytes.count(); ++i )
 	{
 		printf( "%02x ", bytes[ i ] );
@@ -213,7 +213,7 @@ void CoreProtocol::outgoingTransfer( Request* outgoing )
 					0, NMFIELD_TYPE_UTF8, request->transactionId() ); 
 	fields.append( fld );
 	
-	// convert to QByteArray
+	// convert to TQByteArray
 	TQByteArray bytesOut;
 	TQTextStream dout( bytesOut, IO_WriteOnly );
 	dout.setEncoding( TQTextStream::Latin1 );
@@ -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 
@@ -278,7 +278,7 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth )
 			continue;
 			
 		// GAIM writes these tags to the secure socket separately - if we can't connect, check here
-		// NM Protocol 1 writes them in an apparently arbitrary order
+		// NM Protocol 1 writes them in an aptqparently arbitrary order
 		// tag
 		//dout.writeRawBytes( GW_URLVAR_TAG, sizeof( GW_URLVAR_TAG ) );
 		//dout <<  field->tag();
@@ -286,7 +286,7 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth )
 		// method
 		//dout.writeRawBytes( GW_URLVAR_METHOD, sizeof( GW_URLVAR_METHOD ) );
 		//		char methodChar = encode_method( field->method() );
-		//dout << (Q_UINT8)methodChar;
+		//dout << (TQ_UINT8)methodChar;
 		
 		// value
 		//dout.writeRawBytes( GW_URLVAR_VAL, sizeof( GW_URLVAR_VAL ) );
@@ -300,7 +300,7 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth )
 				//debug( " - it's a single string" );
 				const Field::SingleField *sField = static_cast<const Field::SingleField*>( field );
 // 				TQString encoded = KURL::encode_string( sField->value().toString(), 106 /* UTF-8 */);
-// 				encoded.replace( "%20", "+" );
+// 				encoded.tqreplace( "%20", "+" );
 // 				dout <<  encoded.ascii();
 
 				snprintf( valString, NMFIELD_MAX_STR_LENGTH, "%s", url_escape_string( sField->value().toString().utf8() ).data() );
@@ -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;
@@ -375,14 +375,14 @@ int CoreProtocol::wireToTransfer( const TQByteArray& wire )
 	m_din->setByteOrder( TQDataStream::LittleEndian );
 	
 	// look at first four bytes and decide what to do with the chunk
-	Q_UINT32 val;
+	TQ_UINT32 val;
 	if ( okToProceed() )
 	{
 		*m_din >> val;
 
 		// if is 'HTTP', it's a Response. PTTH it is after endian conversion
-		if ( !qstrncmp( (const char *)&val, "HTTP", strlen( "HTTP" ) )  ||
-		     !qstrncmp( (const char *)&val, "PTTH", strlen( "PTTH" ) )
+		if ( !tqstrncmp( (const char *)&val, "HTTP", strlen( "HTTP" ) )  ||
+		     !tqstrncmp( (const char *)&val, "PTTH", strlen( "PTTH" ) )
 		) {
 			Transfer * t = m_responseProtocol->parse( wire, bytesParsed );
 			if ( t )
@@ -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();
 			}
@@ -423,7 +423,7 @@ void CoreProtocol::reset()
 	m_in.resize( 0 );
 }
 
-TQChar CoreProtocol::encode_method( Q_UINT8 method )
+TQChar CoreProtocol::encode_method( TQ_UINT8 method )
 {
 	TQChar str;
 
@@ -486,7 +486,7 @@ TQChar CoreProtocol::encode_method( Q_UINT8 method )
 
 void CoreProtocol::slotOutgoingData( const TQCString &out )
 {
-	debug( TQString( "CoreProtocol::slotOutgoingData() %1" ).arg( out ) );
+	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 e9a14122..50ac0f65 100644
--- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.h
+++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.h
@@ -108,13 +108,14 @@ 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 ? )
- * Outgoing messages may contain rich text, and additionally the plain text encoded as UTF8, but this plain payload is apparently ignored by the server
+ *      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 aptqparently ignored by the server
  *
  */
-class CoreProtocol : public QObject
+class CoreProtocol : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	enum State { NeedMore, Available, NoData };
 
@@ -187,7 +188,7 @@ protected:
 	/**
 	 * encodes a method number (usually supplied as a #defined symbol) to a char
 	 */
-	TQChar encode_method( Q_UINT8 method );
+	TQChar encode_method( TQ_UINT8 method );
 private:
 	TQByteArray m_in;	// buffer containing unprocessed bytes we received
 	TQDataStream* m_din; // contains the packet currently being parsed
diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
index da8025b7..d779564a 100644
--- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
@@ -25,8 +25,8 @@
 
 using namespace GroupWise;
 
-EventProtocol::EventProtocol(TQObject *parent, const char *name)
- : InputProtocolBase(parent, name)
+EventProtocol::EventProtocol(TQObject *tqparent, const char *name)
+ : InputProtocolBase(tqparent, name)
 {
 }
 
@@ -42,7 +42,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
 	inBuf.open( IO_ReadOnly); 
 	m_din.setDevice( &inBuf );
 	m_din.setByteOrder( TQDataStream::LittleEndian );
-	Q_UINT32 type;
+	TQ_UINT32 type;
 
 	if ( !okToProceed() )
 	{
@@ -51,12 +51,12 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
 	}
 	// read the event type
 	m_din >> type;
-	m_bytes += sizeof( Q_UINT32 );
+	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,14 +71,14 @@ 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
 	TQString statusText;
 	TQString guid;
-	Q_UINT16 status;
-	Q_UINT32 flags;
+	TQ_UINT16 status;
+	TQ_UINT32 flags;
 	TQString message;
 	
 	switch ( type )
@@ -90,15 +90,15 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
 				return 0;
 			}
 			m_din >> status;
-			m_bytes += sizeof( Q_UINT16 );
+			m_bytes += sizeof( TQ_UINT16 );
 			if ( !readString( statusText ) )
 			{
 				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
@@ -202,12 +202,12 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
 	return tentative;
 }
 
-bool EventProtocol::readFlags( Q_UINT32 &flags)
+bool EventProtocol::readFlags( TQ_UINT32 &flags)
 {
 	if ( okToProceed() )
 	{
 		m_din >> flags;
-		m_bytes += sizeof( Q_UINT32 );
+		m_bytes += sizeof( TQ_UINT32 );
 		return true;
 	}
 	return false;
diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h
index cb9fe204..65c0672b 100644
--- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h
+++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h
@@ -33,7 +33,7 @@ class EventTransfer;
 	CoreProtocol receives data in addIncomingData, and passes to wireToTransfer.
 	wireToTransfer detects an event.
 		Passes whole chunk to EventProtocol ( as TQByteArray )
-		In to EventProtocol - QByteArray
+		In to EventProtocol - TQByteArray
 		Returned from EventProtocol - EventTransfer *, bytes read, set state?
 	EventProtocol tries to parse data into eventTransfer
 	If not complete, sets state to NeedMore and returns 0
@@ -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,10 +58,10 @@ class EventTransfer;
 	From gwerror.h:
 	enum Event {		InvalidRecipient 		= 101,
 							NOTHANDLED
-						UndeliverableStatus 	= 102,
+						UndeliverabletqStatus 	= 102,
 							NOTHANDLED * 
 						StatusChange 			= 103,
-							Q_UINT16 STATUS
+							TQ_UINT16 STATUS
 							STATUSTEXT
 						ContactAdd 				= 104,
 							NOTHANDLED
@@ -109,8 +109,9 @@ class EventTransfer;
 class EventProtocol : public InputProtocolBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    EventProtocol(TQObject *parent = 0, const char *name = 0);
+    EventProtocol(TQObject *tqparent = 0, const char *name = 0);
     ~EventProtocol();
 	/** 
 	 * Attempt to parse the supplied data into an @ref EventTransfer object.  
@@ -124,7 +125,7 @@ protected:
 	/**
 	 * Reads a conference's flags
 	 */
-	bool readFlags( Q_UINT32 &flags);
+	bool readFlags( TQ_UINT32 &flags);
 };
 
 #endif
diff --git a/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp b/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp
index fb3f3101..be645abb 100644
--- a/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp
@@ -17,7 +17,7 @@
 
 #include "eventtransfer.h"
 
-EventTransfer::EventTransfer( const Q_UINT32 eventType, const TQString & source, TQDateTime timeStamp )
+EventTransfer::EventTransfer( const TQ_UINT32 eventType, const TQString & source, TQDateTime timeStamp )
  : Transfer(), m_eventType( eventType ), m_source( source ), m_timeStamp( timeStamp )
 {
 	m_contentFlags |= ( EventType | Source | TimeStamp );
@@ -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()
@@ -92,7 +92,7 @@ GroupWise::ConferenceGuid EventTransfer::guid()
 	return m_guid;
 }
 
-Q_UINT32 EventTransfer::flags()
+TQ_UINT32 EventTransfer::flags()
 {
 	return m_flags;
 }
@@ -102,7 +102,7 @@ TQString EventTransfer::message()
 	return m_message;
 }
 
-Q_UINT16 EventTransfer::status()
+TQ_UINT16 EventTransfer::status()
 {
 	return m_status;
 }
@@ -119,7 +119,7 @@ void EventTransfer::setGuid( const GroupWise::ConferenceGuid & guid )
 	m_guid = guid;
 }
 
-void EventTransfer::setFlags( const Q_UINT32 flags )
+void EventTransfer::setFlags( const TQ_UINT32 flags )
 {
 	m_contentFlags |= Flags;
 	m_flags = flags;
@@ -131,10 +131,10 @@ void EventTransfer::setMessage( const TQString & message )
 	m_message = message;
 }
 
-void EventTransfer::setStatus( const Q_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 d044fb55..f08e350e 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
@@ -55,14 +55,14 @@ public:
 	 * @param source the user generating the event.
 	 * @param timeStamp the time at which the event was received.
 	 */
-	EventTransfer( const Q_UINT32 eventType, const TQString & source, TQDateTime timeStamp );
+	EventTransfer( const TQ_UINT32 eventType, const TQString & source, TQDateTime timeStamp );
 	~EventTransfer();
 	/** 
-	 * Access the bitmask that describes the transfer's contents.  Use @ref Contents to determine what it contains
+	 * Access the bittqmask that describes the transfer's contents.  Use @ref Contents to determine what it tqcontains
 	 */
-	Q_UINT32 contents();
+	TQ_UINT32 contents();
 	/**
-	 * Convenience accessors to see what the transfer contains
+	 * Convenience accessors to see what the transfer tqcontains
 	 */
 	bool hasEventType();
 	bool hasSource();
@@ -70,7 +70,7 @@ public:
 	bool hasGuid();
 	bool hasFlags();
 	bool hasMessage();
-	bool hasStatus();
+	bool hastqStatus();
 	bool hasStatusText();
 	
 	/**
@@ -81,29 +81,29 @@ public:
 	TQString source();
 	TQDateTime timeStamp();
 	GroupWise::ConferenceGuid guid();
-	Q_UINT32 flags();
+	TQ_UINT32 flags();
 	TQString message();
-	Q_UINT16 status();
+	TQ_UINT16 status();
 	TQString statusText();
 	
 	/**
 	 * Mutators to set the transfer's contents
 	 */
 	void setGuid( const GroupWise::ConferenceGuid & guid );
-	void setFlags( const Q_UINT32 flags );
+	void setFlags( const TQ_UINT32 flags );
 	void setMessage( const TQString & message );
-	void setStatus( const Q_UINT16 status );
+	void settqStatus( const TQ_UINT16 status );
 	void setStatusText( const TQString & statusText);
 	
 private:
-	Q_UINT32 m_contentFlags;
+	TQ_UINT32 m_contentFlags;
 	int m_eventType;
 	TQString m_source;
 	TQDateTime m_timeStamp;
 	GroupWise::ConferenceGuid m_guid;
-	Q_UINT32 m_flags;
+	TQ_UINT32 m_flags;
 	TQString m_message;
-	Q_UINT16 m_status;
+	TQ_UINT16 m_status;
 	TQString m_statusText;
 };
 
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 5d964ad0..e2e5269a 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
@@ -106,7 +106,7 @@ public:
 	bool allowPlain, mutualAuth;
 	bool haveLocalAddr;
 	TQHostAddress localAddr;
-	Q_UINT16 localPort;
+	TQ_UINT16 localPort;
 // 	int minimumSSF, maximumSSF;
 // 	TQString sasl_mech;
 	bool doBinding;
@@ -143,8 +143,8 @@ public:
 	int noop_time;
 };
 
-ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *parent)
-:Stream(parent)
+ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *tqparent)
+:Stream(tqparent)
 {
 	d = new Private;
 	d->mode = Client;
@@ -295,7 +295,7 @@ void ClientStream::setNoopTime(int mills)
 	d->noopTimer.start(d->noop_time);
 }
 
-void ClientStream::setLocalAddr(const TQHostAddress &addr, Q_UINT16 port)
+void ClientStream::setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port)
 {
 	d->haveLocalAddr = true;
 	d->localAddr = addr;
@@ -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( "tqcontains: %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/gwclientstream.h b/kopete/protocols/groupwise/libgroupwise/gwclientstream.h
index 2d0cef92..749eeaa7 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.h
+++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.h
@@ -40,6 +40,7 @@ typedef struct NovellDN
 class ClientStream : public Stream
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	enum Error {
 		ErrConnection = ErrCustom,  // Connection error, ask Connector-subclass what's up
@@ -86,7 +87,7 @@ public:
 		BindConflict                // resource in-use
 	};
 
-	ClientStream(Connector *conn, TLSHandler *tlsHandler=0, TQObject *parent=0);
+	ClientStream(Connector *conn, TLSHandler *tlsHandler=0, TQObject *tqparent=0);
 	~ClientStream();
 
 	void connectToServer(const NovellDN &id, bool auth=true);
@@ -103,7 +104,7 @@ public:
 	// security options (old protocol only uses the first !)
 	void setAllowPlain(bool);
 	void setRequireMutualAuth(bool);
-	void setLocalAddr(const TQHostAddress &addr, Q_UINT16 port);
+	void setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port);
 
 	void close();
 	
@@ -179,7 +180,7 @@ private:
 	/** 
 	 * convert internal method representation to wire
 	 */
-	static char* encode_method(Q_UINT8 method);
+	static char* encode_method(TQ_UINT8 method);
 };
 
 #endif
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 52a5ef36..a6afa5c8 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwerror.h
+++ b/kopete/protocols/groupwise/libgroupwise/gwerror.h
@@ -23,7 +23,7 @@
 #include <tqmap.h>
 #include <tqstring.h>
 
-typedef Q_UINT16 NMERR_T;
+typedef TQ_UINT16 NMERR_T;
 #define GROUPWISE_DEBUG_GLOBAL 14190
 #define GROUPWISE_DEBUG_LIBGW 14191
 #define GROUPWISE_DEBUG_RAW 14192
@@ -36,7 +36,7 @@ typedef Q_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,
@@ -115,7 +115,7 @@ namespace GroupWise
 		ConferenceGuid guid;
 		TQString user;
 		TQDateTime timeStamp;
-		Q_UINT32 flags;
+		TQ_UINT32 flags;
 		TQString message;
 	};
 	
@@ -123,14 +123,14 @@ namespace GroupWise
 	{
 		uint id; 
 		uint sequence;
-		uint parentId;
+		uint tqparentId;
 		TQString name;
 	};
 	
 	struct ContactItem
 	{
 		uint id;
-		uint parentId;
+		uint tqparentId;
 		uint sequence;
 		TQString dn;
 		TQString displayName;
@@ -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/gwfield.cpp b/kopete/protocols/groupwise/libgroupwise/gwfield.cpp
index 6d025e47..94f82937 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwfield.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/gwfield.cpp
@@ -36,16 +36,16 @@ FieldList::~FieldList()
 {
 }
 
-FieldListIterator FieldList::find( TQCString tag )
+FieldListIterator FieldList::tqfind( TQCString tag )
 {
 	FieldListIterator it = begin();
-	return find( it, tag );
+	return tqfind( it, tag );
 }
 
-FieldListIterator FieldList::find( FieldListIterator &it, TQCString tag )
+FieldListIterator FieldList::tqfind( FieldListIterator &it, TQCString tag )
 {
 	FieldListIterator theEnd = end();
-	//cout << "FieldList::find() looking for " << tag.data() << endl;
+	//cout << "FieldList::tqfind() looking for " << tag.data() << endl;
 	for ( ; it != theEnd; ++it )
 	{
 		//cout << " - on " << (*it)->tag().data() << endl;
@@ -113,7 +113,7 @@ SingleField * FieldList::findSingleField( TQCString tag )
 
 SingleField * FieldList::findSingleField( FieldListIterator &it, TQCString tag )
 {
-	FieldListIterator found = find( it, tag );
+	FieldListIterator found = tqfind( it, tag );
 	if ( found == end() )
 		return 0;
 	else
@@ -128,7 +128,7 @@ MultiField * FieldList::findMultiField( TQCString tag )
 
 MultiField * FieldList::findMultiField( FieldListIterator &it, TQCString tag )
 {
-	FieldListIterator found = find( it, tag );
+	FieldListIterator found = tqfind( it, tag );
 	if ( found == end() )
 		return 0;
 	else
@@ -138,7 +138,7 @@ MultiField * FieldList::findMultiField( FieldListIterator &it, TQCString tag )
 
 /* === FieldBase ========================================================= */
 
-FieldBase::FieldBase( TQCString tag, Q_UINT8 method, Q_UINT8 flags, Q_UINT8 type )
+FieldBase::FieldBase( TQCString tag, TQ_UINT8 method, TQ_UINT8 flags, TQ_UINT8 type )
 : m_tag( tag ), m_method( method ), m_flags( flags ), m_type( type )
 {
 
@@ -149,34 +149,34 @@ TQCString FieldBase::tag() const
 	return m_tag;
 }
 
-Q_UINT8 FieldBase::method() const
+TQ_UINT8 FieldBase::method() const
 {
 	return m_method;
 }
 
-Q_UINT8 FieldBase::flags() const
+TQ_UINT8 FieldBase::flags() const
 {
 	return m_flags;
 }
 
-Q_UINT8 FieldBase::type() const
+TQ_UINT8 FieldBase::type() const
 {
 	return m_type;
 }
 
-void FieldBase::setFlags( const Q_UINT8 flags )
+void FieldBase::setFlags( const TQ_UINT8 flags )
 {
 	m_flags = flags;
 }
 
 /* === SingleField ========================================================= */
 
-SingleField::SingleField( TQCString tag, Q_UINT8 method, Q_UINT8 flags, Q_UINT8 type, TQVariant value )
+SingleField::SingleField( TQCString tag, TQ_UINT8 method, TQ_UINT8 flags, TQ_UINT8 type, TQVariant value )
 : FieldBase( tag, method, flags, type ), m_value( value )
 {
 }
 
-SingleField::SingleField( TQCString tag, Q_UINT8 flags, Q_UINT8 type, TQVariant value )
+SingleField::SingleField( TQCString tag, TQ_UINT8 flags, TQ_UINT8 type, TQVariant value )
 : FieldBase( tag, NMFIELD_METHOD_VALID, flags, type ), m_value( value )
 {
 }
@@ -197,12 +197,12 @@ TQVariant SingleField::value() const
 
 /* === MultiField ========================================================= */
 
-MultiField::MultiField( TQCString tag, Q_UINT8 method, Q_UINT8 flags, Q_UINT8 type, FieldList fields )
+MultiField::MultiField( TQCString tag, TQ_UINT8 method, TQ_UINT8 flags, TQ_UINT8 type, FieldList fields )
 : FieldBase( tag, method, flags, type ), m_fields( fields )
 {
 }
 
-MultiField::MultiField( TQCString tag, Q_UINT8 method, Q_UINT8 flags, Q_UINT8 type )
+MultiField::MultiField( TQCString tag, TQ_UINT8 method, TQ_UINT8 flags, TQ_UINT8 type )
 : FieldBase( tag, method, flags, type )
 {
 }
diff --git a/kopete/protocols/groupwise/libgroupwise/gwfield.h b/kopete/protocols/groupwise/libgroupwise/gwfield.h
index 0117b3e5..1f8deea2 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwfield.h
+++ b/kopete/protocols/groupwise/libgroupwise/gwfield.h
@@ -22,7 +22,7 @@
 #define GWFIELD_H
 
 /* Field types */
-/* Comments: ^1 not used ^2 ignored ^3 apparently only used in _field_to_string for debug */
+/* Comments: ^1 not used ^2 ignored ^3 aptqparently only used in _field_to_string for debug */
 /* Otherwise: widely used */
 #define	NMFIELD_TYPE_INVALID				0
 /* ^1 */
@@ -122,14 +122,14 @@
 // GW7
 #define NM_A_FA_CUSTOM_STATUSES			"NM_A_FA_CUSTOM_STATUSES"
 #define NM_A_FA_STATUS					"NM_A_FA_STATUS"
-#define NM_A_UD_QUERY_COUNT				"NM_A_UD_QUERY_COUNT"
+#define NM_A_UD_TQUERY_COUNT				"NM_A_UD_TQUERY_COUNT"
 #define NM_A_FA_CHAT					"NM_A_FA_CHAT"
 #define NM_A_DISPLAY_NAME				"nnmDisplayName"
 #define NM_A_CHAT_OWNER_DN				"nnmChatOwnerDN"
 #define NM_A_UD_PARTICIPANTS			"NM_A_UD_PARTICIPANTS"
 #define NM_A_DESCRIPTION				"nnmDescription"
 #define NM_A_DISCLAIMER					"nnmDisclaimer"
-#define NM_A_QUERY						"nnmQuery"
+#define NM_A_TQUERY						"nnmQuery"
 #define NM_A_ARCHIVE					"nnmArchive"
 #define NM_A_MAX_USERS					"nnmMaxUsers"
 #define NM_A_SZ_TOPIC					"NM_A_SZ_TOPIC"
@@ -167,18 +167,18 @@ namespace Field
 	{
 	public:
 		FieldBase() {}
-		FieldBase( TQCString tag, Q_UINT8 method, Q_UINT8 flags, Q_UINT8 type );
+		FieldBase( TQCString tag, TQ_UINT8 method, TQ_UINT8 flags, TQ_UINT8 type );
 		virtual ~FieldBase() {}
 		TQCString tag() const;
-		Q_UINT8 method() const;
-		Q_UINT8 flags() const;
-		Q_UINT8 type() const;
-		void setFlags( const Q_UINT8 flags );
+		TQ_UINT8 method() const;
+		TQ_UINT8 flags() const;
+		TQ_UINT8 type() const;
+		void setFlags( const TQ_UINT8 flags );
 	protected:
 		TQCString m_tag;
-		Q_UINT8 m_method;
-		Q_UINT8 m_flags;
-		Q_UINT8 m_type;  // doch needed
+		TQ_UINT8 m_method;
+		TQ_UINT8 m_flags;
+		TQ_UINT8 m_type;  // doch needed
 	};
 	
 	typedef TQValueListIterator<FieldBase *> FieldListIterator;
@@ -194,18 +194,18 @@ namespace Field
 			 */
 			virtual ~FieldList();
 			/** 
-			 * Locate the first occurrence of a given field in the list.  Same semantics as TQValueList::find().
+			 * Locate the first occurrence of a given field in the list.  Same semantics as TQValueList::tqfind().
 			 * @param tag The tag name of the field to search for.
 			 * @return An iterator pointing to the first occurrence found, or end() if none was found.
 			 */
-			FieldListIterator find( TQCString tag );
+			FieldListIterator tqfind( TQCString tag );
 			/** 
 			 * Locate the first occurrence of a given field in the list, starting at the supplied iterator
 			 * @param tag The tag name of the field to search for.
 			 * @param it An iterator within the list, to start searching from.
 			 * @return An iterator pointing to the first occurrence found, or end() if none was found.
 			 */
-			FieldListIterator find( FieldListIterator &it, TQCString tag );
+			FieldListIterator tqfind( FieldListIterator &it, TQCString tag );
 			/**
 			 * Get the index of the first occurrence of tag, or -1 if not found
 			 */
@@ -242,11 +242,11 @@ namespace Field
 		/** 
 		 * Single field constructor
 		 */
-		SingleField( TQCString tag, Q_UINT8 method, Q_UINT8 flags, Q_UINT8 type, TQVariant value );
+		SingleField( TQCString tag, TQ_UINT8 method, TQ_UINT8 flags, TQ_UINT8 type, TQVariant value );
 		/** 
 		 * Convenience constructor for NMFIELD_METHOD_VALID fields
 		 */
-		SingleField( TQCString tag, Q_UINT8 flags, Q_UINT8 type, TQVariant value );
+		SingleField( TQCString tag, TQ_UINT8 flags, TQ_UINT8 type, TQVariant value );
 		~SingleField();
 		void setValue( const TQVariant v );
 		TQVariant value() const;
@@ -261,8 +261,8 @@ namespace Field
 	class MultiField : public FieldBase
 	{
 	public:  
-		MultiField( TQCString tag, Q_UINT8 method, Q_UINT8 flags, Q_UINT8 type );
-		MultiField( TQCString tag, Q_UINT8 method, Q_UINT8 flags, Q_UINT8 type, FieldList fields );
+		MultiField( TQCString tag, TQ_UINT8 method, TQ_UINT8 flags, TQ_UINT8 type );
+		MultiField( TQCString tag, TQ_UINT8 method, TQ_UINT8 flags, TQ_UINT8 type, FieldList fields );
 		~MultiField();
 		FieldList fields() const;
 		void setFields( FieldList );
diff --git a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp
index 6dfb1d0f..0a7d7d8d 100644
--- a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp
@@ -23,8 +23,8 @@
 #include "gwfield.h"
 #include "inputprotocolbase.h"
 
-InputProtocolBase::InputProtocolBase(TQObject *parent, const char *name)
- : TQObject(parent, name)
+InputProtocolBase::InputProtocolBase(TQObject *tqparent, const char *name)
+ : TQObject(tqparent, name)
 {
 }
 
@@ -76,11 +76,11 @@ bool InputProtocolBase::okToProceed()
 bool InputProtocolBase::safeReadBytes( TQCString & data, uint & len )
 {
 	// read the length of the bytes
-	Q_UINT32 val;
+	TQ_UINT32 val;
 	if ( !okToProceed() )
 		return false;
 	m_din >> val;
-	m_bytes += sizeof( Q_UINT32 );
+	m_bytes += sizeof( TQ_UINT32 );
 	if ( val > NMFIELD_MAX_STR_LENGTH )
 		return false;
 	//qDebug( "EventProtocol::safeReadBytes() - expecting %i bytes", val );
@@ -95,10 +95,10 @@ bool InputProtocolBase::safeReadBytes( TQCString & data, uint & len )
 		// the rest of the string will be filled with FF,
 		// so look for that in the last position instead of \0
 		// this caused a crash - guessing that temp.length() is set to the number of bytes actually read...
-		// if ( (Q_UINT8)( * ( temp.data() + ( temp.length() - 1 ) ) ) == 0xFF )
+		// 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/inputprotocolbase.h b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h
index 529fea21..2f2f9f1e 100644
--- a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h
+++ b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h
@@ -27,12 +27,13 @@ Defines a basic interface for protocols dealing with input from the GroupWise se
 
 @author Kopete Developers
 */
-class InputProtocolBase : public QObject
+class InputProtocolBase : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	enum EventProtocolState { Success, NeedMore, OutOfSync, ProtocolError };
-	InputProtocolBase(TQObject *parent = 0, const char *name = 0);
+	InputProtocolBase(TQObject *tqparent = 0, const char *name = 0);
 	~InputProtocolBase();
 
 	/**
@@ -63,7 +64,7 @@ protected:
 	 */
 	bool okToProceed();
 	/** 
-	 * read a Q_UINT32 giving the number of following bytes, then a string of that length
+	 * read a TQ_UINT32 giving the number of following bytes, then a string of that length
 	 * updates the bytes parsed counter
 	 * @return false if the string was broken or there was no data available at all
 	 */
diff --git a/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp b/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp
index 4960310a..a887c8cc 100644
--- a/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp
@@ -59,21 +59,21 @@ bool PrivacyManager::isPrivacyLocked()
 bool PrivacyManager::isBlocked( const TQString & dn )
 {
 	if ( m_defaultDeny )
-		return !m_allowList.contains( dn );
+		return !m_allowList.tqcontains( dn );
 	else
-		return m_denyList.contains( dn );
+		return m_denyList.tqcontains( dn );
 }
 
 void PrivacyManager::setAllow( const TQString & dn )
 {
 	if ( m_defaultDeny )
 	{
-		if ( !m_allowList.contains( dn ) )
+		if ( !m_allowList.tqcontains( dn ) )
 			addAllow( dn );
 	}
 	else
 	{
-		if ( m_denyList.contains( dn ) )
+		if ( m_denyList.tqcontains( dn ) )
 			removeDeny( dn );
 	}
 }
@@ -82,12 +82,12 @@ void PrivacyManager::setDeny( const TQString & dn )
 {
 	if ( m_defaultDeny )
 	{
-		if ( m_allowList.contains( dn ) )
+		if ( m_allowList.tqcontains( dn ) )
 			removeAllow( dn );
 	}
 	else
 	{
-		if ( !m_denyList.contains( dn ) )
+		if ( !m_denyList.tqcontains( dn ) )
 			addDeny( dn );
 	}
 }
@@ -243,7 +243,7 @@ TQStringList PrivacyManager::difference( const TQStringList & lhs, const TQStrin
 	const TQStringList::ConstIterator rhsEnd = rhs.end();
 	for ( TQStringList::ConstIterator lhsIt = lhs.begin(); lhsIt != lhsEnd; ++lhsIt )
 	{
-		if ( rhs.find( *lhsIt ) == rhsEnd )
+		if ( rhs.tqfind( *lhsIt ) == rhsEnd )
 			diff.append( *lhsIt );
 	}
 	return diff;
diff --git a/kopete/protocols/groupwise/libgroupwise/privacymanager.h b/kopete/protocols/groupwise/libgroupwise/privacymanager.h
index 0f01eb89..3d1e29f3 100644
--- a/kopete/protocols/groupwise/libgroupwise/privacymanager.h
+++ b/kopete/protocols/groupwise/libgroupwise/privacymanager.h
@@ -29,9 +29,10 @@ Keeps a record of the server side privacy allow and deny lists, default policy a
 
 @author SUSE AG
 */
-class PrivacyManager : public QObject
+class PrivacyManager : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	PrivacyManager( Client * client, const char *name = 0);
 	~PrivacyManager();
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am b/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am
index b7ae1bb4..e9a361d9 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am
@@ -5,4 +5,4 @@ INCLUDES = $(all_includes)
 
 libqca_la_SOURCES = \
 	qca.cpp
-libqca_la_LIBADD = -lqt-mt
+# libqca_la_LIBADD = -lqt-mt
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp
index 10cae6b8..f00eee70 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp
@@ -1,5 +1,5 @@
 /*
- * qca.cpp - Qt Cryptographic Architecture
+ * qca.cpp - TQt Cryptographic Architecture
  * Copyright (C) 2003  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
@@ -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)
@@ -864,8 +864,8 @@ public:
 	TQPtrList<QCA_CertContext> store;
 };
 
-TLS::TLS(TQObject *parent)
-:TQObject(parent)
+TLS::TLS(TQObject *tqparent)
+:TQObject(tqparent)
 {
 	d = new Private;
 }
@@ -1132,8 +1132,8 @@ public:
 	TQByteArray inbuf, outbuf;
 };
 
-SASL::SASL(TQObject *parent)
-:TQObject(parent)
+SASL::SASL(TQObject *tqparent)
+:TQObject(tqparent)
 {
 	d = new Private;
 	reset();
@@ -1232,13 +1232,13 @@ void SASL::setExternalSSF(int x)
 	d->ext_ssf = x;
 }
 
-void SASL::setLocalAddr(const TQHostAddress &addr, Q_UINT16 port)
+void SASL::setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port)
 {
 	d->localAddr = addr;
 	d->localPort = port;
 }
 
-void SASL::setRemoteAddr(const TQHostAddress &addr, Q_UINT16 port)
+void SASL::setRemoteAddr(const TQHostAddress &addr, TQ_UINT16 port)
 {
 	d->remoteAddr = addr;
 	d->remotePort = port;
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h
index 9df6f7cd..dab99d5a 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h
@@ -1,5 +1,5 @@
 /*
- * qca.h - Qt Cryptographic Architecture
+ * qca.h - TQt Cryptographic Architecture
  * Copyright (C) 2003  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
@@ -311,9 +311,10 @@ namespace QCA
 		void fromContext(QCA_CertContext *);
 	};
 
-	class QCA_EXPORT TLS : public QObject
+	class QCA_EXPORT TLS : public TQObject
 	{
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		enum Validity {
 			NoCert,
@@ -332,7 +333,7 @@ namespace QCA
 		};
 		enum Error { ErrHandshake, ErrCrypt };
 
-		TLS(TQObject *parent=0);
+		TLS(TQObject *tqparent=0);
 		~TLS();
 
 		void setCertificate(const Cert &cert, const RSAKey &key);
@@ -372,9 +373,10 @@ namespace QCA
 		Private *d;
 	};
 
-	class QCA_EXPORT SASL : public QObject
+	class QCA_EXPORT SASL : public TQObject
 	{
 		Q_OBJECT
+  TQ_OBJECT
 	public:
 		enum Error { ErrAuth, ErrCrypt };
 		enum ErrorCond {
@@ -390,7 +392,7 @@ namespace QCA
 			NoUser,
 			RemoteUnavail
 		};
-		SASL(TQObject *parent=0);
+		SASL(TQObject *tqparent=0);
 		~SASL();
 
 		static void setAppName(const TQString &name);
@@ -412,8 +414,8 @@ namespace QCA
 		void setExternalAuthID(const TQString &authid);
 		void setExternalSSF(int);
 
-		void setLocalAddr(const TQHostAddress &addr, Q_UINT16 port);
-		void setRemoteAddr(const TQHostAddress &addr, Q_UINT16 port);
+		void setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port);
+		void setRemoteAddr(const TQHostAddress &addr, TQ_UINT16 port);
 
 		// initialize
 		bool startClient(const TQString &service, const TQString &host, const TQStringList &mechlist, bool allowClientSendFirst=true);
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h b/kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h
index 6eda17f9..9f4fa1fb 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h
@@ -141,7 +141,7 @@ public:
 struct QCA_SASLHostPort
 {
 	TQHostAddress addr;
-	Q_UINT16 port;
+	TQ_UINT16 port;
 };
 
 struct QCA_SASLNeedParams
diff --git a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp
index 0cf55684..1213b6dc 100644
--- a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp
@@ -30,11 +30,11 @@ public:
 	int state, err;
 };
 
-QCATLSHandler::QCATLSHandler(QCA::TLS *parent)
-:TLSHandler(parent)
+QCATLSHandler::QCATLSHandler(QCA::TLS *tqparent)
+:TLSHandler(tqparent)
 {
 	d = new Private;
-	d->tls = parent;
+	d->tls = tqparent;
 	connect(d->tls, TQT_SIGNAL(handshaken()), TQT_SLOT(tls_handshaken()));
 	connect(d->tls, TQT_SIGNAL(readyRead()), TQT_SLOT(tls_readyRead()));
 	connect(d->tls, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(tls_readyReadOutgoing(int)));
diff --git a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h
index e7ac398e..3a2ee71e 100644
--- a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h
+++ b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h
@@ -28,8 +28,9 @@ class QCA::TLS;
 class QCATLSHandler : public TLSHandler
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	QCATLSHandler(QCA::TLS *parent);
+	QCATLSHandler(QCA::TLS *tqparent);
 	~QCATLSHandler();
 
 	QCA::TLS *tls() const;
diff --git a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp
index 48ee8b88..1145583a 100644
--- a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp
@@ -22,7 +22,7 @@
 
 #include "responseprotocol.h"
 
-ResponseProtocol::ResponseProtocol(TQObject* parent, const char* name): InputProtocolBase(parent, name)
+ResponseProtocol::ResponseProtocol(TQObject* tqparent, const char* name): InputProtocolBase(tqparent, name)
 {
 }
 
@@ -42,19 +42,19 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes )
 	m_din.setByteOrder( TQDataStream::LittleEndian );
 	
 	// check that this begins with a HTTP (is a response)
-	Q_UINT32 val;
+	TQ_UINT32 val;
 	m_din >> val;
-	m_bytes += sizeof( Q_UINT32 );
+	m_bytes += sizeof( TQ_UINT32 );
 	
-	Q_ASSERT( qstrncmp( (const char *)&val, "HTTP", strlen( "HTTP" ) ) == 0 );
+	Q_ASSERT( tqstrncmp( (const char *)&val, "HTTP", strlen( "HTTP" ) ) == 0 );
 	
 	// read rest of HTTP header and look for a 301 redirect. 
 	TQCString headerFirst;
 	if ( !readGroupWiseLine( headerFirst ) )
 		return 0;
 	// pull out the HTTP return code
-	int firstSpace = headerFirst.find( ' ' );
-	TQString rtnField = headerFirst.mid( firstSpace, headerFirst.find( ' ', firstSpace + 1 ) );
+	int firstSpace = headerFirst.tqfind( ' ' );
+	TQString rtnField = headerFirst.mid( firstSpace, headerFirst.tqfind( ' ', firstSpace + 1 ) );
 	bool ok = true;
 	int rtnCode;
 	int packetState = -1;
@@ -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;
@@ -116,26 +116,26 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes )
 	int resultCode = 0;
 	Field::FieldListIterator it;
 	Field::FieldListIterator end = m_collatingFields.end();
-	it = m_collatingFields.find( NM_A_SZ_TRANSACTION_ID );
+	it = m_collatingFields.tqfind( NM_A_SZ_TRANSACTION_ID );
 	if ( it != end )
 	{
 		Field::SingleField * sf = dynamic_cast<Field::SingleField*>( *it );
 		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;
 		}
 	}
-	it = m_collatingFields.find( NM_A_SZ_RESULT_CODE );
+	it = m_collatingFields.tqfind( NM_A_SZ_RESULT_CODE );
 	if ( it != end )
 	{
 		Field::SingleField * sf = dynamic_cast<Field::SingleField*>( *it );
 		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,14 +169,14 @@ 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
 	{
 		// the field being read
 		// read field
-		Q_UINT8 type, method;
-		Q_UINT32 val;
+		TQ_UINT8 type, method;
+		TQ_UINT32 val;
 		TQCString tag;
 		// read uint8 type
 		if ( !okToProceed() )
@@ -185,7 +185,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list )
 			return false;
 		}
 		m_din >> type;
-		m_bytes += sizeof( Q_UINT8 );
+		m_bytes += sizeof( TQ_UINT8 );
 		// if type is 0 SOMETHING_INVALID, we're at the end of the fields
 		if ( type == 0 ) /*&& m_din->atEnd() )*/
 		{
@@ -201,7 +201,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list )
 			return false;
 		}
 		m_din >> method;
-		m_bytes += sizeof( Q_UINT8 );
+		m_bytes += sizeof( TQ_UINT8 );
 		// read tag and length
 		if ( !safeReadBytes( tag, val ) )
 		{
@@ -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 )
 		{
@@ -220,10 +220,10 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list )
 				return false;
 			}
 			m_din >> val;
-			m_bytes += sizeof( Q_UINT32 );
+			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 Qt<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 );
@@ -265,8 +265,8 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list )
 					return false;
 				}
 				m_din >> val;
-				m_bytes += sizeof( Q_UINT32 );
-				debug( TQString( "- numeric field: %1" ).arg( val ) );
+				m_bytes += sizeof( TQ_UINT32 );
+				debug( TQString( "- numeric field: %1" ).tqarg( val ) );
 				Field::SingleField* s = new Field::SingleField( tag, method, 0, type, val );
 				currentList.append( s );
 			}
@@ -298,13 +298,13 @@ bool ResponseProtocol::readGroupWiseLine( TQCString & line )
 	line = TQCString();
 	while ( true )
 	{
-		Q_UINT8 c;
+		TQ_UINT8 c;
 		
 		if (! okToProceed() )
 			return false;
 		m_din >> c;
 		m_bytes++;
-		line += TQChar(c);
+		line += TQChar(c).ascii();
 		if ( c == '\n' )
 			break;
 	}
diff --git a/kopete/protocols/groupwise/libgroupwise/responseprotocol.h b/kopete/protocols/groupwise/libgroupwise/responseprotocol.h
index f64aee7d..9010ef3c 100644
--- a/kopete/protocols/groupwise/libgroupwise/responseprotocol.h
+++ b/kopete/protocols/groupwise/libgroupwise/responseprotocol.h
@@ -32,6 +32,7 @@ Handles the parsing of incoming Response messages
 class ResponseProtocol : public InputProtocolBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	/**
 	 * Describes the current state of the protocol
@@ -43,7 +44,7 @@ public:
 	 */
 	enum PacketState { FieldsRead, ProtocolError };
 	
-	ResponseProtocol(TQObject* parent, const char* name);
+	ResponseProtocol(TQObject* tqparent, const char* name);
 	~ResponseProtocol();
 	/** 
 	 * Attempt to parse the supplied data into an @ref Response object.  
diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.cc b/kopete/protocols/groupwise/libgroupwise/rtf.cc
index 9a691ec9..35fea9d1 100644
--- a/kopete/protocols/groupwise/libgroupwise/rtf.cc
+++ b/kopete/protocols/groupwise/libgroupwise/rtf.cc
@@ -1732,17 +1732,17 @@ void ParStyle::clearFormatting()
 TQString RTF2HTML::quoteString(const TQString &_str, quoteMode mode)
 {
     TQString str = _str;
-    str.replace(TQRegExp("&"), "&amp;");
-    str.replace(TQRegExp("<"), "&lt;");
-    str.replace(TQRegExp(">"), "&gt;");
-    str.replace(TQRegExp("\""), "&quot;");
-    str.replace(TQRegExp("\r"), "");
+    str.tqreplace(TQRegExp("&"), "&amp;");
+    str.tqreplace(TQRegExp("<"), "&lt;");
+    str.tqreplace(TQRegExp(">"), "&gt;");
+    str.tqreplace(TQRegExp("\""), "&quot;");
+    str.tqreplace(TQRegExp("\r"), "");
     switch (mode){
     case quoteHTML:
-        str.replace(TQRegExp("\n"), "<br>\n");
+        str.tqreplace(TQRegExp("\n"), "<br>\n");
         break;
     case quoteXML:
-        str.replace(TQRegExp("\n"), "<br/>\n");
+        str.tqreplace(TQRegExp("\n"), "<br/>\n");
         break;
     default:
         break;
@@ -1759,7 +1759,7 @@ TQString RTF2HTML::quoteString(const TQString &_str, quoteMode mode)
         TQString s = " ";
         for (int i = 1; i < len; i++)
             s += "&nbsp;";
-        str.replace(pos, len, s);
+        str.tqreplace(pos, len, s);
     }
     return str;
 }
@@ -1994,7 +1994,7 @@ void RTF2HTML::FlushParagraph()
 
     /*
     s += "<p dir=\"";
-    // Note: Lower-case 'ltr' and 'rtl' are important for Qt.
+    // Note: Lower-case 'ltr' and 'rtl' are important for TQt.
     s += (parStyle.dir == ParStyle::DirRTL ? "rtl" : "ltr");
     s += "\">";
     s += sParagraph;
@@ -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();
@@ -2273,7 +2273,7 @@ void Level::flush()
     /*
     const char *encoding = NULL;
     if (m_nEncoding){
-        for (const ENCODING *c = ICQPlugin::core->encodings; c->language; c++){
+        for (const ENCODING *c = ICTQPlugin::core->encodings; c->language; c++){
 			if (!c->bMain)
 				continue;
             if ((unsigned)c->rtf_code == m_nEncoding){
@@ -2285,7 +2285,7 @@ void Level::flush()
     if (encoding == NULL)
 		encoding = p->encoding;
 
-	TQTextCodec *codec = ICQClient::_getCodec(encoding);
+	TQTextCodec *codec = ICTQClient::_getCodec(encoding);
     */
     //p->PrintQuoted(codec->toUnicode(text.c_str(), text.length()));
     p->PrintQuoted(text.c_str());
@@ -2374,15 +2374,15 @@ TQString RTF2HTML::Parse(const char *rtf, const char *_encoding)
             }
         case IMG:{
                 cur_level.flush();
-                const char ICQIMAGE[] = "icqimage";
+                const char ICTQIMAGE[] = "icqimage";
 				const char *smiles[] = { ":-)" , ":-O" , ":-|" , ":-/" , // 0-3
 										 ":-(" , ":-*" , ":-/" , ":'(" , // 4-7
 										 ";-)" , ":-@" , ":-$" , ":-X" , // 8-B
 										 ":-P" , "8-)" , "O:)" , ":-D" }; // C-F
                 const char *p = rtftext + 3;
-                if ((strlen(p) > strlen(ICQIMAGE)) && !memcmp(p, ICQIMAGE, strlen(ICQIMAGE))){
+                if ((strlen(p) > strlen(ICTQIMAGE)) && !memcmp(p, ICTQIMAGE, strlen(ICTQIMAGE))){
                     unsigned n = 0;
-                    for (p += strlen(ICQIMAGE); *p; p++){
+                    for (p += strlen(ICTQIMAGE); *p; p++){
                         if ((*p >= '0') && (*p <= '9')){
                             n = n << 4;
                             n += (*p - '0');
@@ -2516,7 +2516,7 @@ TQString RTF2HTML::Parse(const char *rtf, const char *_encoding)
 }
 
 /*
-bool ICQClient::parseRTF(const char *rtf, const char *encoding, TQString &res)
+bool ICTQClient::parseRTF(const char *rtf, const char *encoding, TQString &res)
 {
 	char _RTF[] = "{\\rtf";
 	if ((strlen(rtf) > strlen(_RTF)) && !memcmp(rtf, _RTF, strlen(_RTF))){
@@ -2524,7 +2524,7 @@ bool ICQClient::parseRTF(const char *rtf, const char *encoding, TQString &res)
 		res = p.Parse(rtf, encoding);
 		return true;
 	}
-	TQTextCodec *codec = ICQClient::_getCodec(encoding);
+	TQTextCodec *codec = ICTQClient::_getCodec(encoding);
 	res = codec->toUnicode(rtf, strlen(rtf));
 	return false;
 }
diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.ll b/kopete/protocols/groupwise/libgroupwise/rtf.ll
index 67e9f5f5..70d4daa5 100644
--- a/kopete/protocols/groupwise/libgroupwise/rtf.ll
+++ b/kopete/protocols/groupwise/libgroupwise/rtf.ll
@@ -67,17 +67,17 @@ void ParStyle::clearFormatting()
 QString RTF2HTML::quoteString(const QString &_str, quoteMode mode)
 {
     QString str = _str;
-    str.replace(QRegExp("&"), "&amp;");
-    str.replace(QRegExp("<"), "&lt;");
-    str.replace(QRegExp(">"), "&gt;");
-    str.replace(QRegExp("\""), "&quot;");
-    str.replace(QRegExp("\r"), "");
+    str.tqreplace(QRegExp("&"), "&amp;");
+    str.tqreplace(QRegExp("<"), "&lt;");
+    str.tqreplace(QRegExp(">"), "&gt;");
+    str.tqreplace(QRegExp("\""), "&quot;");
+    str.tqreplace(QRegExp("\r"), "");
     switch (mode){
     case quoteHTML:
-        str.replace(QRegExp("\n"), "<br>\n");
+        str.tqreplace(QRegExp("\n"), "<br>\n");
         break;
     case quoteXML:
-        str.replace(QRegExp("\n"), "<br/>\n");
+        str.tqreplace(QRegExp("\n"), "<br/>\n");
         break;
     default:
         break;
@@ -94,7 +94,7 @@ QString RTF2HTML::quoteString(const QString &_str, quoteMode mode)
         QString s = " ";
         for (int i = 1; i < len; i++)
             s += "&nbsp;";
-        str.replace(pos, len, s);
+        str.tqreplace(pos, len, s);
     }
     return str;
 }
@@ -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/safedelete.cpp b/kopete/protocols/groupwise/libgroupwise/safedelete.cpp
index 5dde3725..9de147f0 100644
--- a/kopete/protocols/groupwise/libgroupwise/safedelete.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/safedelete.cpp
@@ -62,13 +62,7 @@ void SafeDelete::deleteAll()
 
 void SafeDelete::deleteSingle(TQObject *o)
 {
-#if QT_VERSION < 0x030000
-	// roll our own TQObject::deleteLater()
-	SafeDeleteLater *sdl = SafeDeleteLater::ensureExists();
-	sdl->deleteItLater(o);
-#else
 	o->deleteLater();
-#endif
 }
 
 //----------------------------------------------------------------------------
diff --git a/kopete/protocols/groupwise/libgroupwise/safedelete.h b/kopete/protocols/groupwise/libgroupwise/safedelete.h
index 0d4150d9..88cfb3d4 100644
--- a/kopete/protocols/groupwise/libgroupwise/safedelete.h
+++ b/kopete/protocols/groupwise/libgroupwise/safedelete.h
@@ -57,9 +57,10 @@ private:
 	void unlock();
 };
 
-class SafeDeleteLater : public QObject
+class SafeDeleteLater : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	static SafeDeleteLater *ensureExists();
 	void deleteItLater(TQObject *o);
diff --git a/kopete/protocols/groupwise/libgroupwise/securestream.h b/kopete/protocols/groupwise/libgroupwise/securestream.h
index 82752cea..f0c6223e 100644
--- a/kopete/protocols/groupwise/libgroupwise/securestream.h
+++ b/kopete/protocols/groupwise/libgroupwise/securestream.h
@@ -34,6 +34,7 @@
 class SecureStream : public ByteStream
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	enum Error { ErrTLS = ErrCustom, ErrSASL };
 	SecureStream(ByteStream *s);
@@ -100,9 +101,10 @@ USE_TLSHANDLER
 };
 
 
-class SecureLayer : public QObject
+class SecureLayer : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	SecureLayer(QCA::TLS *t);
 	SecureLayer(QCA::SASL *s);
diff --git a/kopete/protocols/groupwise/libgroupwise/stream.cpp b/kopete/protocols/groupwise/libgroupwise/stream.cpp
index d3410578..87da3baa 100644
--- a/kopete/protocols/groupwise/libgroupwise/stream.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/stream.cpp
@@ -19,8 +19,8 @@
 
 #include "stream.h"
 
-Stream::Stream(TQObject *parent)
-:TQObject(parent)
+Stream::Stream(TQObject *tqparent)
+:TQObject(tqparent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/stream.h b/kopete/protocols/groupwise/libgroupwise/stream.h
index c06649fd..15544a6c 100644
--- a/kopete/protocols/groupwise/libgroupwise/stream.h
+++ b/kopete/protocols/groupwise/libgroupwise/stream.h
@@ -28,9 +28,10 @@
 #define GW_STREAM_H
 
 
-class Stream : public QObject
+class Stream : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	enum Error { ErrParse, ErrProtocol, ErrStream, ErrCustom = 10 };
 	enum StreamCond {
@@ -45,7 +46,7 @@ public:
 		SystemShutdown
 	};
 
-	Stream(TQObject *parent=0);
+	Stream(TQObject *tqparent=0);
 	virtual ~Stream();
 
 	virtual void close()=0;
diff --git a/kopete/protocols/groupwise/libgroupwise/task.cpp b/kopete/protocols/groupwise/libgroupwise/task.cpp
index 96259254..142db094 100644
--- a/kopete/protocols/groupwise/libgroupwise/task.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/task.cpp
@@ -41,22 +41,22 @@ public:
 	Transfer * transfer;
 };
 
-Task::Task(Task *parent)
-:TQObject(parent)
+Task::Task(Task *tqparent)
+:TQObject(tqparent)
 {
 	init();
 	d->transfer = 0;
-	d->client = parent->client();
+	d->client = tqparent->client();
 	d->id = client()->genUniqueId();
 	connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected()));
 }
 
-Task::Task(Client *parent, bool)
+Task::Task(Client *tqparent, bool)
 :TQObject(0)
 {
 	init();
 
-	d->client = parent;
+	d->client = tqparent;
 	connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected()));
 }
 
@@ -77,9 +77,9 @@ void Task::init()
 	d->statusCode = 0;
 }
 
-Task *Task::parent() const
+Task *Task::tqparent() const
 {
-	return (Task *)TQObject::parent();
+	return (Task *)TQObject::tqparent();
 }
 
 Client *Task::client() const
@@ -126,12 +126,12 @@ void Task::go(bool autoDelete)
 
 bool Task::take( Transfer * transfer)
 {
-	const TQObjectList *p = children();
-	if(!p)
+	const TQObjectList p = childrenListObject();
+	if(p.isEmpty())
 		return false;
 
-	// pass along the transfer to our children
-	TQObjectListIt it(*p);
+	// pass along the transfer to our tqchildren
+	TQObjectListIt it(p);
 	Task *t;
 	for(; it.current(); ++it) {
 		TQObject *obj = it.current();
@@ -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/task.h b/kopete/protocols/groupwise/libgroupwise/task.h
index b0b623d2..8d2bc380 100644
--- a/kopete/protocols/groupwise/libgroupwise/task.h
+++ b/kopete/protocols/groupwise/libgroupwise/task.h
@@ -29,16 +29,17 @@
 class Client;
 class Request; 
 
-class Task : public QObject
+class Task : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	enum { ErrDisc };
-	Task(Task *parent);
+	Task(Task *tqparent);
 	Task( Client *, bool isRoot );
 	virtual ~Task();
 
-	Task *parent() const;
+	Task *tqparent() const;
 	Client *client() const;
 	Transfer *transfer() const;
 	
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp
index fb028c44..08f04b40 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp
@@ -26,7 +26,7 @@
 
 using namespace GroupWise;
 
-ChatCountsTask::ChatCountsTask(Task* parent): RequestTask(parent)
+ChatCountsTask::ChatCountsTask(Task* tqparent): RequestTask(tqparent)
 {
 	Field::FieldList lst;
 	createTransfer( "chatcounts", lst );
@@ -59,9 +59,9 @@ bool ChatCountsTask::take( Transfer * transfer )
 	}
 	Field::FieldList counts = resultsArray->fields();
 	const Field::FieldListIterator end = counts.end();
-	for ( Field::FieldListIterator it = counts.find( NM_A_FA_CHAT );
+	for ( Field::FieldListIterator it = counts.tqfind( NM_A_FA_CHAT );
 			 it != end;
-			 it = counts.find( ++it, NM_A_FA_CHAT ) )
+			 it = counts.tqfind( ++it, NM_A_FA_CHAT ) )
 	{
 		Field::MultiField * mf = static_cast<Field::MultiField *>( *it );
 		Field::FieldList chat = mf->fields();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h
index 6197352d..9a052dac 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h
@@ -34,8 +34,9 @@ Get the current number of users in each chat on the server
 class ChatCountsTask : public RequestTask
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		ChatCountsTask(Task* parent);
+		ChatCountsTask(Task* tqparent);
 		~ChatCountsTask();
 		bool take( Transfer * transfer );
 		/**
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp
index 7f60f3c5..fe8cf20c 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp
@@ -25,7 +25,7 @@
 
 using namespace GroupWise;
 
-ChatPropertiesTask::ChatPropertiesTask(Task* parent): RequestTask(parent)
+ChatPropertiesTask::ChatPropertiesTask(Task* tqparent): RequestTask(tqparent)
 {
 }
 
@@ -82,7 +82,7 @@ bool ChatPropertiesTask::take( Transfer * transfer )
 				m_description =  sf->value().toString();
 			else if ( sf->tag() == NM_A_DISCLAIMER )
 				m_disclaimer = sf->value().toString();
-			else if ( sf->tag() == NM_A_QUERY )
+			else if ( sf->tag() == NM_A_TQUERY )
 				m_query = sf->value().toString();
 			else if ( sf->tag() == NM_A_ARCHIVE )
 				m_archive = sf->value().toString();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h b/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h
index d52661f3..dfb73139 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h
@@ -35,8 +35,9 @@ Get the current number of users in each chat on the server
 class ChatPropertiesTask : public RequestTask
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		ChatPropertiesTask(Task* parent);
+		ChatPropertiesTask(Task* tqparent);
 		~ChatPropertiesTask();
 		/**
 		 * Specify which chatroom to get properties for
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
index c88e22b4..de78465f 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
@@ -23,8 +23,8 @@
 
 #include "conferencetask.h"
 
-ConferenceTask::ConferenceTask( Task* parent )
- : EventTask( parent )
+ConferenceTask::ConferenceTask( Task* tqparent )
+ : EventTask( tqparent )
 {
 	// register all the events that this task monitors
 	registerEvent( GroupWise::ConferenceClosed );
@@ -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/conferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h
index 7f35d08b..4a1f6d19 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h
@@ -36,8 +36,9 @@ using namespace GroupWise;
 class ConferenceTask : public EventTask
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	ConferenceTask( Task* parent );
+	ConferenceTask( Task* tqparent );
 	~ConferenceTask();
 	bool take( Transfer * transfer );
 signals:
@@ -57,7 +58,7 @@ signals:
 protected slots:
 	void slotReceiveUserDetails( const GroupWise::ContactDetails & );
 protected:
-	Q_UINT32 readFlags( TQDataStream & din );
+	TQ_UINT32 readFlags( TQDataStream & din );
 	TQString readMessage( TQDataStream & din );
 	/**
 	 * Checks to see if we need more data from the client before we can propagate this event
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.cpp
index 3d041208..3778e80a 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.cpp
@@ -21,7 +21,7 @@
 
 #include "connectiontask.h"
 
-ConnectionTask::ConnectionTask(Task* parent): EventTask(parent)
+ConnectionTask::ConnectionTask(Task* tqparent): EventTask(tqparent)
 {
 	registerEvent( GroupWise::UserDisconnect );
 	registerEvent( GroupWise::ServerDisconnect );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h b/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h
index 95df34f9..da7507b1 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h
@@ -31,8 +31,9 @@ This task monitors connection related events, currently 'connected elsewhere' di
 class ConnectionTask : public EventTask
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	ConnectionTask(Task* parent);
+	ConnectionTask(Task* tqparent);
 	~ConnectionTask();
 	bool take( Transfer * transfer );
 signals:
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.cpp
index 01d2fa05..e87ee0f4 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.cpp
@@ -24,7 +24,7 @@
 
 #include "createconferencetask.h"
 
-CreateConferenceTask::CreateConferenceTask(Task* parent): RequestTask(parent), m_confId( 0 ), m_guid( BLANK_GUID )
+CreateConferenceTask::CreateConferenceTask(Task* tqparent): RequestTask(tqparent), m_confId( 0 ), m_guid( BLANK_GUID )
 {
 
 }
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h
index de66f734..c43e5725 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h
@@ -31,8 +31,9 @@ This task is responsible for creating a conference at the server, and confirming
 class CreateConferenceTask : public RequestTask
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	CreateConferenceTask(Task* parent);
+	CreateConferenceTask(Task* tqparent);
 	~CreateConferenceTask();
 	/**
 	 * Set up a create conference request
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp
index d41db4a9..ae1a6984 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp
@@ -21,7 +21,7 @@
 
 #include "createcontactinstancetask.h"
 
-CreateContactInstanceTask::CreateContactInstanceTask(Task* parent) : NeedFolderTask(parent)
+CreateContactInstanceTask::CreateContactInstanceTask(Task* tqparent) : NeedFolderTask(tqparent)
 {
 	// 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 & ) ) );
@@ -31,9 +31,9 @@ CreateContactInstanceTask::~CreateContactInstanceTask()
 {
 }
 
-void CreateContactInstanceTask::contactFromUserId( const TQString & userId, const TQString & displayName, const int parentFolder )
+void CreateContactInstanceTask::contactFromUserId( const TQString & userId, const TQString & displayName, const int tqparentFolder )
 {
-	contact( new Field::SingleField( NM_A_SZ_USERID, 0, NMFIELD_TYPE_UTF8, userId ), displayName, parentFolder );
+	contact( new Field::SingleField( NM_A_SZ_USERID, 0, NMFIELD_TYPE_UTF8, userId ), displayName, tqparentFolder );
 }
 
 void CreateContactInstanceTask::contactFromUserIdAndFolder( const TQString & userId, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName )
@@ -46,9 +46,9 @@ void CreateContactInstanceTask::contactFromUserIdAndFolder( const TQString & use
 	m_folderDisplayName = folderDisplayName;
 }
 
-void CreateContactInstanceTask::contactFromDN( const TQString & dn, const TQString & displayName, const int parentFolder )
+void CreateContactInstanceTask::contactFromDN( const TQString & dn, const TQString & displayName, const int tqparentFolder )
 {
-	contact( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, dn ), displayName, parentFolder );
+	contact( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, dn ), displayName, tqparentFolder );
 }
 
 void CreateContactInstanceTask::contactFromDNAndFolder( const TQString & dn, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName )
@@ -61,10 +61,10 @@ void CreateContactInstanceTask::contactFromDNAndFolder( const TQString & dn, con
 	m_folderDisplayName = folderDisplayName;
 }
 
-void CreateContactInstanceTask::contact( Field::SingleField * id, const TQString & displayName, const int parentFolder )
+void CreateContactInstanceTask::contact( Field::SingleField * id, const TQString & displayName, const int tqparentFolder )
 {
 	Field::FieldList lst;
-	lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( parentFolder ) ) );
+	lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( tqparentFolder ) ) );
 	// this is either a user Id or a DN
 	lst.append( id );
 	if ( displayName.isEmpty() ) // fallback so that the contact is created
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h
index 6c960a4c..84347964 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h
@@ -24,26 +24,27 @@
 #include "needfoldertask.h"
 
 /**
-Creates a contact on the server.  The response to this action is handled by its parent
+Creates a contact on the server.  The response to this action is handled by its tqparent
 
 @author SUSE AG
 */
 class CreateContactInstanceTask : public NeedFolderTask
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	CreateContactInstanceTask(Task* parent);
+	CreateContactInstanceTask(Task* tqparent);
 	~CreateContactInstanceTask();
 	/** 
 	 * Sets up the request message.  
 	 */
-	void contactFromUserId( const TQString & userId, const TQString & displayName, const int parentFolder );
-	void contactFromDN( const TQString & dn, const TQString & displayName, const int parentFolder );
+	void contactFromUserId( const TQString & userId, const TQString & displayName, const int tqparentFolder );
+	void contactFromDN( const TQString & dn, const TQString & displayName, const int tqparentFolder );
 	void contactFromUserIdAndFolder( const TQString & userId, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName );
 	void contactFromDNAndFolder( const TQString & dn, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName );
 	void onGo();
 protected:
-	void contact( Field::SingleField * id, const TQString & displayName, const int parentFolder );
+	void contact( Field::SingleField * id, const TQString & displayName, const int tqparentFolder );
 	void onFolderCreated();
 private:
 	TQString m_userId;
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp
index 0d167236..4e9d3e8a 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp
@@ -24,7 +24,7 @@
 
 #include "createcontacttask.h"
 
-CreateContactTask::CreateContactTask(Task* parent): Task(parent)
+CreateContactTask::CreateContactTask(Task* tqparent): Task(tqparent)
 {
 }
 
@@ -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.tqparentId ) );
 			
 	if ( m_dn.isEmpty() )
 		m_dn = addedContact.dn;
@@ -123,7 +123,7 @@ void CreateContactTask::slotContactAdded( const ContactItem & addedContact )
 		m_folders.pop_back();
 
 	// clear the topLevel flag once the corresponding server side entry has been successfully created
-	if ( addedContact.parentId == 0 )
+	if ( addedContact.tqparentId == 0 )
 		m_topLevel = false;
 	
 	if ( m_folders.isEmpty() && !m_topLevel )
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h
index 2a46a51c..8b973361 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h
@@ -42,8 +42,9 @@ using namespace GroupWise;
 class CreateContactTask : public Task
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	CreateContactTask(Task* parent);
+	CreateContactTask(Task* tqparent);
 	~CreateContactTask();
 	/**
 	 * Get the userId of the contact just created
@@ -64,7 +65,7 @@ public:
 	 * @param topLevel is the folder also in the top level folder?
 	 */
 	void contactFromUserId( const TQString & userId, const TQString & displayName, const int firstSeqNo, const TQValueList< FolderItem > folders, bool topLevel );
-	//void contactFromDN( const TQString & dn, const TQString & displayName, const int parentFolder );
+	//void contactFromDN( const TQString & dn, const TQString & displayName, const int tqparentFolder );
 	/** 
 	 * This task doesn't do any I/O itself, so this take prints an error and returns false;
 	 */
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp
index c6e6a78a..363882d8 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp
@@ -20,7 +20,7 @@
 
 #include "createfoldertask.h"
 
-CreateFolderTask::CreateFolderTask(Task* parent): ModifyContactListTask(parent)
+CreateFolderTask::CreateFolderTask(Task* tqparent): ModifyContactListTask(tqparent)
 {
 }
 
@@ -29,10 +29,10 @@ CreateFolderTask::~CreateFolderTask()
 {
 }
 
-void CreateFolderTask::folder( const int parentId, const int sequence, const TQString & displayName )
+void CreateFolderTask::folder( const int tqparentId, const int sequence, const TQString & displayName )
 {
 	Field::FieldList lst;
-	lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( parentId ) ) );
+	lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( tqparentId ) ) );
 	lst.append( new Field::SingleField( NM_A_SZ_DISPLAY_NAME, 0, NMFIELD_TYPE_UTF8, displayName ) );
 	lst.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, TQString::number( sequence ) ) );
 	createTransfer( "createfolder", lst );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h
index cac19900..4befdf40 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h
@@ -31,10 +31,11 @@ Creates a folder on the server
 class CreateFolderTask : public ModifyContactListTask
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	CreateFolderTask(Task* parent);
+	CreateFolderTask(Task* tqparent);
 	~CreateFolderTask();
-	void folder( const int parentId, const int sequence, const TQString & displayName );
+	void folder( const int tqparentId, const int sequence, const TQString & displayName );
 };
 
 #endif
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp
index 04ce1fb4..4559c1f7 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp
@@ -20,7 +20,7 @@
 
 #include "deleteitemtask.h"
 
-DeleteItemTask::DeleteItemTask(Task* parent): ModifyContactListTask(parent)
+DeleteItemTask::DeleteItemTask(Task* tqparent): ModifyContactListTask(tqparent)
 {
 }
 
@@ -29,7 +29,7 @@ DeleteItemTask::~DeleteItemTask()
 {
 }
 
-void DeleteItemTask::item( const int parentFolder, const int objectId )
+void DeleteItemTask::item( const int tqparentFolder, const int objectId )
 {
 	if ( objectId == 0 )
 	{
@@ -37,7 +37,7 @@ void DeleteItemTask::item( const int parentFolder, const int objectId )
 		return;
 	}
 	Field::FieldList lst;
-	lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( parentFolder ) ) );
+	lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( tqparentFolder ) ) );
 	// this is either a user Id or a DN
 	lst.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( objectId ) ) );
 	createTransfer( "deletecontact", lst );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h
index f249c2f5..15ea9702 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h
@@ -29,10 +29,11 @@
 class DeleteItemTask : public ModifyContactListTask
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	DeleteItemTask(Task* parent);
+	DeleteItemTask(Task* tqparent);
 	~DeleteItemTask();
-	void item( const int parentFolder, const int objectId );
+	void item( const int tqparentFolder, const int objectId );
 };
 
 #endif
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp
index c6bd2d85..8af45d93 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp
@@ -21,8 +21,8 @@
 #include "gwfield.h"
 #include "eventtask.h"
 
-EventTask::EventTask( Task * parent )
-: Task( parent )
+EventTask::EventTask( Task * tqparent )
+: Task( tqparent )
 {
 }
 
@@ -40,7 +40,7 @@ bool EventTask::forMe( Transfer * transfer, EventTransfer*& event ) const
 	{
 		// see if we are supposed to handle this kind of event
 		// consider speeding this up by having 1 handler per event
-		return ( m_eventCodes.find( event->eventType() ) != m_eventCodes.end() );
+		return ( m_eventCodes.tqfind( event->eventType() ) != m_eventCodes.end() );
 	}
 	return false;
 }
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h
index 609728a4..5de20281 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h
@@ -31,8 +31,9 @@ class Transfer;
 class EventTask : public Task
 {
 Q_OBJECT
+  TQ_OBJECT
 	public:
-		EventTask( Task *parent );
+		EventTask( Task *tqparent );
 	protected:
 		bool forMe( Transfer * transfer, EventTransfer *& event ) const;
 		void registerEvent( GroupWise::Event e );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp
index 8104ec24..81898ca2 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp
@@ -29,7 +29,7 @@
 
 using namespace GroupWise;
 
-GetChatSearchResultsTask::GetChatSearchResultsTask(Task* parent): RequestTask(parent)
+GetChatSearchResultsTask::GetChatSearchResultsTask(Task* tqparent): RequestTask(tqparent)
 {
 }
 
@@ -42,7 +42,7 @@ void GetChatSearchResultsTask::poll( int queryHandle )
 {
 	Field::FieldList lst;
 	lst.append( new Field::SingleField( NM_A_UD_OBJECT_ID, 0, NMFIELD_TYPE_UDWORD, queryHandle ) );
-	lst.append( new Field::SingleField( NM_A_UD_QUERY_COUNT, 0, NMFIELD_TYPE_UDWORD, 10 ) );
+	lst.append( new Field::SingleField( NM_A_UD_TQUERY_COUNT, 0, NMFIELD_TYPE_UDWORD, 10 ) );
 	createTransfer( "getchatsearchresults", lst );
 }
 
@@ -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 )
@@ -72,9 +72,9 @@ bool GetChatSearchResultsTask::take( Transfer * transfer )
 	}
 	Field::FieldList matches = resultsArray->fields();
 	const Field::FieldListIterator end = matches.end();
-	for ( Field::FieldListIterator it = matches.find( NM_A_FA_CHAT );
+	for ( Field::FieldListIterator it = matches.tqfind( NM_A_FA_CHAT );
 			it != end;
-			it = matches.find( ++it, NM_A_FA_CHAT ) )
+			it = matches.tqfind( ++it, NM_A_FA_CHAT ) )
 	{
 		Field::MultiField * mf = static_cast<Field::MultiField *>( *it );
 		Field::FieldList chat = mf->fields();
@@ -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 e85c1e74..dcafb3e7 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h
@@ -35,17 +35,18 @@ Search results are polled on the server, using the search handle returned by the
 class GetChatSearchResultsTask : public RequestTask
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
 		enum SearchResultCode { Completed=2, Cancelled=4, Error=5, GettingData=8, DataRetrieved=9 };
-		GetChatSearchResultsTask(Task* parent);
+		GetChatSearchResultsTask(Task* tqparent);
 		~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/getdetailstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp
index 61753d84..27a0c7f0 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp
@@ -26,8 +26,8 @@
 
 using namespace GroupWise;
 
-GetDetailsTask::GetDetailsTask( Task * parent )
- : RequestTask( parent )
+GetDetailsTask::GetDetailsTask( Task * tqparent )
+ : RequestTask( tqparent )
 {
 }
 
@@ -58,9 +58,9 @@ bool GetDetailsTask::take( Transfer * transfer )
 	// parse received details and signal like billio
 	Field::MultiField * container = 0;
 	Field::FieldListIterator end = detailsFields.end();
-	for ( Field::FieldListIterator it = detailsFields.find( NM_A_FA_RESULTS );
+	for ( Field::FieldListIterator it = detailsFields.tqfind( NM_A_FA_RESULTS );
 		  it != end;
-		  it = detailsFields.find( ++it, NM_A_FA_RESULTS ) )
+		  it = detailsFields.tqfind( ++it, NM_A_FA_RESULTS ) )
 	{
 		container = static_cast<Field::MultiField *>( *it );
 		ContactDetails cd = extractUserDetails( container );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h
index 747b494f..c45ad0e9 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h
@@ -34,8 +34,9 @@ using namespace GroupWise;
 class GetDetailsTask : public RequestTask
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	GetDetailsTask( Task * parent );
+	GetDetailsTask( Task * tqparent );
 	~GetDetailsTask();
 	bool take( Transfer * transfer );
 	void userDNs( const TQStringList & userDNs );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp
index 153746ea..68063261 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp
@@ -22,7 +22,7 @@
 
 #include "getstatustask.h"
 
-GetStatusTask::GetStatusTask(Task* parent): RequestTask(parent)
+GetStatusTask::GetStatusTask(Task* tqparent): RequestTask(tqparent)
 {
 }
 
@@ -52,7 +52,7 @@ bool GetStatusTask::take( Transfer * transfer )
 	responseFields.dump( true );
 	// parse received details and signal like billio
 	Field::SingleField * sf = 0;
-	Q_UINT16 status;
+	TQ_UINT16 status;
 	sf = responseFields.findSingleField( NM_A_SZ_STATUS );
 	if ( sf )
 	{
@@ -60,8 +60,8 @@ bool GetStatusTask::take( Transfer * transfer )
 		// This must be because the sender is not on our contact list but has sent us a message.
 		// 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::null here
-		emit gotStatus( m_userDN, status, TQString::null );
+		// unfortunately getstatus doesn't give us an away message so we pass TQString() here
+		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 6294f053..9188fdd4 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h
@@ -30,13 +30,14 @@
 class GetStatusTask : public RequestTask
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	GetStatusTask(Task* parent);
+	GetStatusTask(Task* tqparent);
 	~GetStatusTask();
 	void userDN( const TQString & dn );
 	bool take( Transfer * transfer );
 signals:
-	void gotStatus( const TQString & contactId, Q_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/joinchattask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp
index a14d6eec..35fab516 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp
@@ -25,7 +25,7 @@
 
 #include "joinchattask.h"
 
-JoinChatTask::JoinChatTask(Task* parent): RequestTask(parent)
+JoinChatTask::JoinChatTask(Task* tqparent): RequestTask(tqparent)
 {
 }
 
@@ -59,9 +59,9 @@ bool JoinChatTask::take( Transfer * transfer )
 				Field::SingleField * contact = 0;
 				Field::FieldList contactList = participants->fields();
 				const Field::FieldListIterator end = contactList.end();
-				for ( Field::FieldListIterator it = contactList.find( NM_A_SZ_DN );
+				for ( Field::FieldListIterator it = contactList.tqfind( NM_A_SZ_DN );
 								  it != end;
-								  it = contactList.find( ++it, NM_A_SZ_DN ) )
+								  it = contactList.tqfind( ++it, NM_A_SZ_DN ) )
 				{
 					contact = static_cast<Field::SingleField *>( *it );
 					if ( contact )
@@ -83,9 +83,9 @@ bool JoinChatTask::take( Transfer * transfer )
 				Field::SingleField * contact = 0;
 				Field::FieldList contactList = invitees->fields();
 				const Field::FieldListIterator end = contactList.end();
-				for ( Field::FieldListIterator it = contactList.find( NM_A_SZ_DN );
+				for ( Field::FieldListIterator it = contactList.tqfind( NM_A_SZ_DN );
 								  it != end;
-								  it = contactList.find( ++it, NM_A_SZ_DN ) )
+								  it = contactList.tqfind( ++it, NM_A_SZ_DN ) )
 				{
 					contact = static_cast<Field::SingleField *>( *it );
 					if ( contact )
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h
index 9d6babe5..654d1a64 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h
@@ -34,8 +34,9 @@ Sends Join Conference messages when the user accepts an invitation
 class JoinChatTask : public RequestTask
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		JoinChatTask(Task* parent);
+		JoinChatTask(Task* tqparent);
 		~JoinChatTask();
 		void join( const TQString & displayName );
 		bool take( Transfer * transfer );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp
index b7b1f1cc..63a57fda 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp
@@ -25,7 +25,7 @@
 
 #include "joinconferencetask.h"
 
-JoinConferenceTask::JoinConferenceTask(Task* parent): RequestTask(parent)
+JoinConferenceTask::JoinConferenceTask(Task* tqparent): RequestTask(tqparent)
 {
 }
 
@@ -59,9 +59,9 @@ bool JoinConferenceTask::take( Transfer * transfer )
 				Field::SingleField * contact = 0;
 				Field::FieldList contactList = participants->fields();
 				const Field::FieldListIterator end = contactList.end();
-				for ( Field::FieldListIterator it = contactList.find( NM_A_SZ_DN );
+				for ( Field::FieldListIterator it = contactList.tqfind( NM_A_SZ_DN );
 					 it != end;
-					 it = contactList.find( ++it, NM_A_SZ_DN ) )
+					 it = contactList.tqfind( ++it, NM_A_SZ_DN ) )
 				{
 					contact = static_cast<Field::SingleField *>( *it );
 					if ( contact )
@@ -85,9 +85,9 @@ bool JoinConferenceTask::take( Transfer * transfer )
 				Field::SingleField * contact = 0;
 				Field::FieldList contactList = invitees->fields();
 				const Field::FieldListIterator end = contactList.end();
-				for ( Field::FieldListIterator it = contactList.find( NM_A_SZ_DN );
+				for ( Field::FieldListIterator it = contactList.tqfind( NM_A_SZ_DN );
 					 it != end;
-					 it = contactList.find( ++it, NM_A_SZ_DN ) )
+					 it = contactList.tqfind( ++it, NM_A_SZ_DN ) )
 				{
 					contact = static_cast<Field::SingleField *>( *it );
 					if ( contact )
@@ -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/joinconferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h
index d95e5084..29f34679 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h
@@ -34,8 +34,9 @@ Sends Join Conference messages when the user accepts an invitation
 class JoinConferenceTask : public RequestTask
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	JoinConferenceTask(Task* parent);
+	JoinConferenceTask(Task* tqparent);
 	~JoinConferenceTask();
 	void join( const ConferenceGuid & guid );
 	bool take( Transfer * transfer );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.cpp
index ac84ac2b..d3c75055 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.cpp
@@ -24,7 +24,7 @@
 #include "requestfactory.h"
 #include "keepalivetask.h"
 
-KeepAliveTask::KeepAliveTask(Task* parent): RequestTask(parent)
+KeepAliveTask::KeepAliveTask(Task* tqparent): RequestTask(tqparent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h
index 04f9a352..dffe1059 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h
@@ -29,8 +29,9 @@
 class KeepAliveTask : public RequestTask
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	KeepAliveTask(Task* parent);
+	KeepAliveTask(Task* tqparent);
 	~KeepAliveTask();
 	void setup();
 };
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.cpp
index d2d58b83..516c74c3 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.cpp
@@ -20,7 +20,7 @@
 
 #include "leaveconferencetask.h"
 
-LeaveConferenceTask::LeaveConferenceTask(Task* parent): RequestTask(parent)
+LeaveConferenceTask::LeaveConferenceTask(Task* tqparent): RequestTask(tqparent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h
index 65ebe540..72262b9e 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h
@@ -31,8 +31,9 @@ Tells the server that you are leaving a conference (closed the chatwindow)
 class LeaveConferenceTask : public RequestTask
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	LeaveConferenceTask(Task* parent);
+	LeaveConferenceTask(Task* tqparent);
 	~LeaveConferenceTask();
 	void leave( const GroupWise::ConferenceGuid & guid );
 };
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp
index 6a28124f..a09af45a 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp
@@ -25,8 +25,8 @@
 
 #include "logintask.h"
 
-LoginTask::LoginTask( Task * parent )
- : RequestTask( parent )
+LoginTask::LoginTask( Task * tqparent )
+ : RequestTask( tqparent )
 {
 }
 
@@ -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() ) );
@@ -67,7 +67,7 @@ bool LoginTask::take( Transfer * transfer )
 	ContactDetails cd = extractUserDetails( loginResponseFields );
 	emit gotMyself( cd );
 
-	// read the privacy settings first, because this affects all contacts' apparent status
+	// read the privacy settings first, because this affects all contacts' aptqparent status
 	extractPrivacy( loginResponseFields );
 
 	extractCustomStatuses( loginResponseFields );
@@ -80,18 +80,18 @@ bool LoginTask::take( Transfer * transfer )
 		Field::FieldList contactListFields = contactList->fields();
 		Field::MultiField * container;
 		// read folders
-		for ( Field::FieldListIterator it = contactListFields.find( NM_A_FA_FOLDER );
+		for ( Field::FieldListIterator it = contactListFields.tqfind( NM_A_FA_FOLDER );
 				it != contactListFields.end();
-				it = contactListFields.find( ++it, NM_A_FA_FOLDER ) )
+				it = contactListFields.tqfind( ++it, NM_A_FA_FOLDER ) )
 		{
 			container = static_cast<Field::MultiField *>( *it );
 			extractFolder( container );
 		}
 
 		// read contacts
-		for ( Field::FieldListIterator it = contactListFields.find( NM_A_FA_CONTACT );
+		for ( Field::FieldListIterator it = contactListFields.tqfind( NM_A_FA_CONTACT );
 				it != contactListFields.end();
-				it = contactListFields.find( ++it, NM_A_FA_CONTACT ) )
+				it = contactListFields.tqfind( ++it, NM_A_FA_CONTACT ) )
 		{
 			container = static_cast<Field::MultiField *>( *it );
 			extractContact( container );
@@ -119,11 +119,11 @@ void LoginTask::extractFolder( Field::MultiField * folderContainer )
 	// name 
 	current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME );
 	folder.name = current->value().toString();
-	// parent
+	// tqparent
 	current = fl.findSingleField( NM_A_SZ_PARENT_ID );
-	folder.parentId = current->value().toInt();
+	folder.tqparentId = 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, tqparent: %3, seq: %3." ).tqarg( folder.name ).tqarg(  folder.id ).tqarg( folder.tqparentId ).tqarg( folder.sequence ) );
 	// tell the world about it
 	emit gotFolder( folder );
 }
@@ -135,11 +135,11 @@ void LoginTask::extractContact( Field::MultiField * contactContainer )
 	ContactItem contact;
 	Field::SingleField * current;
 	Field::FieldList fl = contactContainer->fields();
-	// sequence number, object and parent IDs are a numeric values but are stored as strings...
+	// sequence number, object and tqparent IDs are a numeric values but are stored as strings...
 	current = fl.findSingleField( NM_A_SZ_OBJECT_ID );
 	contact.id = current->value().toInt();
 	current = fl.findSingleField( NM_A_SZ_PARENT_ID );
-	contact.parentId = current->value().toInt();
+	contact.tqparentId = current->value().toInt();
 	current = fl.findSingleField( NM_A_SZ_SEQUENCE_NUMBER );
 	contact.sequence = current->value().toInt();
 	current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME );
@@ -206,13 +206,13 @@ ContactDetails LoginTask::extractUserDetails( Field::FieldList & fields )
 				if ( propList )
 				{
 					// Hello A Nagappan. GW gave us a multiple field where we previously got a single field
-					TQString parentName = propList->tag();
+					TQString tqparentName = propList->tag();
 					Field::FieldList propFields = propList->fields();
 					const Field::FieldListIterator end = propFields.end();
 					for ( Field::FieldListIterator it = propFields.begin(); it != end; ++it )
 					{
 						propField = dynamic_cast<Field::SingleField *>( *it );
-						if ( propField /*&& propField->tag() == parentName */)
+						if ( propField /*&& propField->tag() == tqparentName */)
 						{
 							TQString propValue = propField->value().toString();
 							TQString contents = propMap[ propField->tag() ];
@@ -241,12 +241,12 @@ void LoginTask::extractPrivacy( Field::FieldList & fields )
 	TQStringList denyList;
 	// read blocking
 	// may be a single field or may be an array 
-	Field::FieldListIterator it = fields.find( NM_A_LOCKED_ATTR_LIST );
+	Field::FieldListIterator it = fields.tqfind( NM_A_LOCKED_ATTR_LIST );
 	if ( it != fields.end() )
 	{
 		if ( Field::SingleField * sf = dynamic_cast<Field::SingleField *>( *it ) )
 		{
-			if ( sf->value().toString().find( NM_A_BLOCKING ) )
+			if ( sf->value().toString().tqfind( NM_A_BLOCKING ) )
 				privacyLocked = true;
 		}
 		else if ( Field::MultiField * mf = dynamic_cast<Field::MultiField *>( *it ) )
@@ -284,7 +284,7 @@ TQStringList LoginTask::readPrivacyItems( const TQCString & tag, Field::FieldLis
 {
 	TQStringList items;
 	
-	Field::FieldListIterator it = fields.find( tag );
+	Field::FieldListIterator it = fields.tqfind( tag );
 	if ( it != fields.end() )
 	{
 		if ( Field::SingleField * sf = dynamic_cast<Field::SingleField *>( *it ) )
@@ -308,7 +308,7 @@ TQStringList LoginTask::readPrivacyItems( const TQCString & tag, Field::FieldLis
 
 void LoginTask::extractCustomStatuses( Field::FieldList & fields )
 {
-	Field::FieldListIterator it = fields.find( NM_A_FA_CUSTOM_STATUSES );
+	Field::FieldListIterator it = fields.tqfind( NM_A_FA_CUSTOM_STATUSES );
 	if ( it != fields.end() )
 	{
 		if ( Field::MultiField * mf = dynamic_cast<Field::MultiField *>( *it ) )
@@ -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 );
 				}
 			}
 		}
@@ -342,7 +342,7 @@ void LoginTask::extractCustomStatuses( Field::FieldList & fields )
 
 void LoginTask::extractKeepalivePeriod( Field::FieldList & fields )
 {
-	Field::FieldListIterator it = fields.find( NM_A_UD_KEEPALIVE );
+	Field::FieldListIterator it = fields.tqfind( NM_A_UD_KEEPALIVE );
 	if ( it != fields.end() )
 	{
 		if ( Field::SingleField * sf = dynamic_cast<Field::SingleField *>( *it ) )
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h
index 3d745bf9..b099be6a 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h
@@ -31,8 +31,9 @@ using namespace GroupWise;
 class LoginTask : public RequestTask
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	LoginTask( Task * parent );
+	LoginTask( Task * tqparent );
 	~LoginTask();
 	/**
 	 * Get the login fields ready to go
@@ -57,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/modifycontactlisttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp
index 10233a18..703c0582 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp
@@ -23,7 +23,7 @@
 #include "gwerror.h"
 #include "modifycontactlisttask.h"
 
-ModifyContactListTask::ModifyContactListTask(Task* parent): RequestTask(parent)
+ModifyContactListTask::ModifyContactListTask(Task* tqparent): RequestTask(tqparent)
 {
 }
 
@@ -92,7 +92,7 @@ void ModifyContactListTask::processContactChange( Field::MultiField * container
 	current = fl.findSingleField( NM_A_SZ_OBJECT_ID );
 	contact.id = current->value().toInt();
 	current = fl.findSingleField( NM_A_SZ_PARENT_ID );
-	contact.parentId = current->value().toInt();
+	contact.tqparentId = current->value().toInt();
 	current = fl.findSingleField( NM_A_SZ_SEQUENCE_NUMBER );
 	contact.sequence = current->value().toInt();
 	current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME );
@@ -125,9 +125,9 @@ void ModifyContactListTask::processFolderChange( Field::MultiField * container )
 	// name 
 	current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME );
 	folder.name = current->value().toString();
-	// parent
+	// tqparent
 	current = fl.findSingleField( NM_A_SZ_PARENT_ID );
-	folder.parentId = current->value().toInt();
+	folder.tqparentId = current->value().toInt();
 	if ( container->method() == NMFIELD_METHOD_ADD )
 		emit gotFolderAdded( folder );
 	else if ( container->method() == NMFIELD_METHOD_DELETE )
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h
index 2f5a4939..62d02bfa 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h
@@ -24,7 +24,7 @@
 #include "requesttask.h"
 
 /**
-This is the parent of all tasks that manipulate the contact list.  The server responds to each one in the same way, and this task contains a take() to process this response.
+This is the tqparent of all tasks that manipulate the contact list.  The server responds to each one in the same way, and this task contains a take() to process this response.
 
 @author SUSE AG
 */
@@ -34,8 +34,9 @@ using namespace GroupWise;
 class ModifyContactListTask : public RequestTask
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	ModifyContactListTask(Task* parent);
+	ModifyContactListTask(Task* tqparent);
 	~ModifyContactListTask();
 	bool take( Transfer * transfer );
 signals:
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp
index 4a24f44f..044a4e24 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp
@@ -22,7 +22,7 @@
 
 #include "movecontacttask.h"
 
-MoveContactTask::MoveContactTask(Task* parent): NeedFolderTask(parent)
+MoveContactTask::MoveContactTask(Task* tqparent): NeedFolderTask(tqparent)
 {
 	// 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 & ) ) );
@@ -39,7 +39,7 @@ void MoveContactTask::moveContact( const ContactItem & contact, const int newPar
 	// TODO: - write a contact_item_to_fields method and factor duplicate code like this out
 	Field::FieldList contactFields;
 	contactFields.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, contact.id ) );
-	contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, contact.parentId ) );
+	contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, contact.tqparentId ) );
 	contactFields.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, contact.sequence ) );
 	if ( !contact.dn.isNull() )
 		contactFields.append( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, contact.dn ) );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h
index ad3bce44..adeeb68d 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h
@@ -31,8 +31,9 @@ Moves a contact between folders on the server
 class MoveContactTask : public NeedFolderTask
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	MoveContactTask(Task* parent);
+	MoveContactTask(Task* tqparent);
 	~MoveContactTask();
 	void moveContact( const ContactItem & contact, const int newParent );
 	void moveContactToNewFolder( const ContactItem & contact, const int newSequenceNumber, const TQString & folderDisplayName );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp
index 12c7382a..842ef31c 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp
@@ -15,7 +15,7 @@
 
 #include "needfoldertask.h"
 
-NeedFolderTask::NeedFolderTask(Task* parent): ModifyContactListTask(parent)
+NeedFolderTask::NeedFolderTask(Task* tqparent): ModifyContactListTask(tqparent)
 {
 }
 
@@ -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/needfoldertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h
index d1ad1a1e..167197e0 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h
@@ -22,8 +22,9 @@ This Task is the ancestor of Tasks that may need to create a folder on the serve
 class NeedFolderTask : public ModifyContactListTask
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	NeedFolderTask(Task* parent);
+	NeedFolderTask(Task* tqparent);
 	~NeedFolderTask();
 	void createFolder();
 	virtual void onFolderCreated() = 0;
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp
index d65a5a20..ae0f9456 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp
@@ -27,7 +27,7 @@
 
 using namespace GroupWise;
 
-PollSearchResultsTask::PollSearchResultsTask(Task* parent): RequestTask(parent)
+PollSearchResultsTask::PollSearchResultsTask(Task* tqparent): RequestTask(tqparent)
 {
 }
 
@@ -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 )
@@ -69,9 +69,9 @@ bool PollSearchResultsTask::take( Transfer * transfer )
 	}
 	Field::FieldList matches = resultsArray->fields();
 	const Field::FieldListIterator end = matches.end();
-	for ( Field::FieldListIterator it = matches.find( NM_A_FA_CONTACT );
+	for ( Field::FieldListIterator it = matches.tqfind( NM_A_FA_CONTACT );
 		  it != end;
-		  it = matches.find( ++it, NM_A_FA_CONTACT ) )
+		  it = matches.tqfind( ++it, NM_A_FA_CONTACT ) )
 	{
 		Field::MultiField * mf = static_cast<Field::MultiField *>( *it );
 		Field::FieldList contact = mf->fields();
@@ -79,7 +79,7 @@ bool PollSearchResultsTask::take( Transfer * transfer )
 		m_results.append( cd );
 	}
 	
-	// first field: NM_A_SZ_STATUS contains 
+	// first field: NM_A_SZ_STATUS tqcontains 
 	#define SEARCH_PENDING 0
 	#define SEARCH_INPROGRESS 1
 	#define SEARCH_COMPLETED 2
@@ -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 )
@@ -155,7 +155,7 @@ GroupWise::ContactDetails PollSearchResultsTask::extractUserDetails( Field::Fiel
 				Field::MultiField * propList = dynamic_cast<Field::MultiField*>( *it );
 				if ( propList )
 				{
-					TQString parentName = propList->tag();
+					TQString tqparentName = propList->tag();
 					Field::FieldList propFields = propList->fields();
 					const Field::FieldListIterator end = propFields.end();
 					for ( Field::FieldListIterator it = propFields.begin(); it != end; ++it )
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h
index c03f75bb..a882a9b3 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h
@@ -35,17 +35,18 @@ Search results are polled on the server, using the search handle supplied by the
 class PollSearchResultsTask : public RequestTask
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	enum SearchResultCode { Pending=0, InProgess=1, Completed=2, TimeOut=3, Cancelled=4, Error=5 };
-	PollSearchResultsTask(Task* parent);
+	PollSearchResultsTask(Task* tqparent);
 	~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/privacyitemtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.cpp
index 508b3306..2c9ac7ef 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.cpp
@@ -20,7 +20,7 @@
 
 #include "privacyitemtask.h"
 
-PrivacyItemTask::PrivacyItemTask( Task* parent) : RequestTask( parent )
+PrivacyItemTask::PrivacyItemTask( Task* tqparent) : RequestTask( tqparent )
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h
index 401dc765..de894186 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h
@@ -31,8 +31,9 @@ Adds a contact to the server side allow or deny lists
 class PrivacyItemTask : public RequestTask
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	PrivacyItemTask( Task* parent);
+	PrivacyItemTask( Task* tqparent);
 	~PrivacyItemTask();
 	void allow( const TQString & dn );
 	void deny( const TQString & dn );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.cpp
index 2b252ff5..9a3f8780 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.cpp
@@ -20,7 +20,7 @@
 
 #include "rejectinvitetask.h"
 
-RejectInviteTask::RejectInviteTask(Task* parent): RequestTask(parent)
+RejectInviteTask::RejectInviteTask(Task* tqparent): RequestTask(tqparent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h
index b82f4e77..b7ee62f0 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h
@@ -31,8 +31,9 @@ Used to reject an invitation to join a conference
 class RejectInviteTask : public RequestTask
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	RejectInviteTask(Task* parent);
+	RejectInviteTask(Task* tqparent);
 	~RejectInviteTask();
 	void reject( const GroupWise::ConferenceGuid & guid );
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp
index 44f54124..12645297 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp
@@ -26,8 +26,8 @@
 
 #include "requesttask.h"
 
-RequestTask::RequestTask( Task * parent )
-: Task( parent )
+RequestTask::RequestTask( Task * tqparent )
+: Task( tqparent )
 {
 }
 
@@ -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/requesttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h
index 71101fab..e12bd741 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h
@@ -28,8 +28,9 @@ class Transfer;
 class RequestTask : public Task
 {
 Q_OBJECT
+  TQ_OBJECT
 	public:
-		RequestTask( Task *parent );
+		RequestTask( Task *tqparent );
 		bool take( Transfer * transfer );
 		virtual void onGo();
 	protected:
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp
index 87694eb4..e0e56634 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp
@@ -40,7 +40,7 @@
 
 using namespace GroupWise;
 
-SearchChatTask::SearchChatTask(Task* parent): RequestTask(parent), m_polls( 0 )
+SearchChatTask::SearchChatTask(Task* tqparent): RequestTask(tqparent), m_polls( 0 )
 {
 }
 
@@ -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/searchchattask.h b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h
index ea887657..4d010ffe 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h
@@ -35,10 +35,11 @@ This Task searches for chatrooms on the server
 class SearchChatTask : public RequestTask
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
 		enum SearchType { FetchAll=0, SinceLastSearch };
 		
-		SearchChatTask(Task* parent);
+		SearchChatTask(Task* tqparent);
 
 		~SearchChatTask();
 	/**
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp
index 1b64c47d..2d0522c3 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp
@@ -39,7 +39,7 @@
 
 using namespace GroupWise;
 
-SearchUserTask::SearchUserTask(Task* parent): RequestTask(parent), m_polls( 0 )
+SearchUserTask::SearchUserTask(Task* tqparent): RequestTask(tqparent), m_polls( 0 )
 {
 }
 
@@ -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/searchusertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h
index d5347c73..5e79ac2f 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h
@@ -33,8 +33,9 @@ This Task performs user searching on the server
 class SearchUserTask : public RequestTask
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    SearchUserTask(Task* parent);
+    SearchUserTask(Task* tqparent);
 
     ~SearchUserTask();
 	/**
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.cpp
index 9fa7d65e..60d9f986 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.cpp
@@ -20,7 +20,7 @@
 
 #include "sendinvitetask.h"
 
-SendInviteTask::SendInviteTask(Task* parent): RequestTask(parent)
+SendInviteTask::SendInviteTask(Task* tqparent): RequestTask(tqparent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.h
index b08c7259..70672e3e 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.h
@@ -33,7 +33,7 @@ This sends an invitation to a conference
 class SendInviteTask : public RequestTask
 {
 public:
-	SendInviteTask(Task* parent);
+	SendInviteTask(Task* tqparent);
 	~SendInviteTask();
 	void invite( const GroupWise::ConferenceGuid & guid, const TQStringList & invitees, const GroupWise::OutgoingMessage & msg );
 private:
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp
index fdf1173f..13e65435 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp
@@ -20,7 +20,7 @@
 
 #include "sendmessagetask.h"
 
-SendMessageTask::SendMessageTask(Task* parent): RequestTask(parent)
+SendMessageTask::SendMessageTask(Task* tqparent): RequestTask(tqparent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.h
index 44559e15..95175d77 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.h
@@ -32,7 +32,7 @@ Sends messages to a particular conference on the server
 class SendMessageTask : public RequestTask
 {
 public:
-	SendMessageTask(Task* parent);
+	SendMessageTask(Task* tqparent);
 	~SendMessageTask();
 	
 	void message( const TQStringList & recipientDNList, const OutgoingMessage & msg );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp
index bf463407..696ffffa 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp
@@ -22,7 +22,7 @@
 
 using namespace GroupWise; 
 
-SetStatusTask::SetStatusTask(Task* parent): RequestTask(parent)
+SetStatusTask::SetStatusTask(Task* tqparent): RequestTask(tqparent)
 {
 }
 
@@ -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" );
+		setError( 1, "Invalid tqStatus" );
 		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 4e41e681..72eaf9a4 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h
@@ -30,15 +30,16 @@
 class SetStatusTask : public RequestTask
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	SetStatusTask(Task* parent);
+	SetStatusTask(Task* tqparent);
 	~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..fa360a45 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp
@@ -22,7 +22,7 @@
 
 #include "statustask.h"
 
-StatusTask::StatusTask(Task* parent): EventTask(parent)
+StatusTask::StatusTask(Task* tqparent): EventTask(tqparent)
 {
 	registerEvent( GroupWise::StatusChange );
 }
@@ -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 2a57cd04..90d46bc7 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h
@@ -29,12 +29,13 @@
 class StatusTask : public EventTask
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	StatusTask(Task* parent);
+	StatusTask(Task* tqparent);
 	~StatusTask();
 	bool take( Transfer * transfer );
 signals:
-	void gotStatus( const TQString & contactId, Q_UINT16 status, const TQString & statusText );
+	void gottqStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText );
 };
 
 #endif
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.cpp
index 2a421752..f9136eca 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.cpp
@@ -22,7 +22,7 @@
 
 #include "typingtask.h"
 
-TypingTask::TypingTask(Task* parent): RequestTask(parent)
+TypingTask::TypingTask(Task* tqparent): RequestTask(tqparent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h
index 4f4da1cd..84fe6e46 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h
@@ -31,9 +31,10 @@
 class TypingTask : public RequestTask
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-	TypingTask(Task* parent);
+	TypingTask(Task* tqparent);
 	~TypingTask();
 	void typing( const GroupWise::ConferenceGuid & guid, const bool typing );
 };
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp
index aa75441d..e1a863a7 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp
@@ -24,7 +24,7 @@
 
 using namespace GroupWise; 
 
-UpdateContactTask::UpdateContactTask(Task* parent): UpdateItemTask(parent)
+UpdateContactTask::UpdateContactTask(Task* tqparent): UpdateItemTask(tqparent)
 {
 }
 
@@ -48,7 +48,7 @@ void UpdateContactTask::renameContact( const TQString & newName, const TQValueLi
 	{
 		Field::FieldList contactFields;
 		contactFields.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, (*it).id ) );
-		contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).parentId ) );
+		contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).tqparentId ) );
 		contactFields.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, (*it).sequence ) );
 		if ( !(*it).dn.isNull() )
 			contactFields.append( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, (*it).dn ) );
@@ -61,7 +61,7 @@ void UpdateContactTask::renameContact( const TQString & newName, const TQValueLi
 	{
 		Field::FieldList contactFields;
 		contactFields.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, (*it).id ) );
-		contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).parentId ) );
+		contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).tqparentId ) );
 		contactFields.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, (*it).sequence ) );
 		if ( !(*it).dn.isNull() )
 			contactFields.append( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, (*it).dn ) );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h
index 4126658e..5ced02a5 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h
@@ -32,8 +32,9 @@
 class UpdateContactTask : public UpdateItemTask
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	UpdateContactTask(Task* parent);
+	UpdateContactTask(Task* tqparent);
 	~UpdateContactTask();
 	void renameContact( const TQString& newName, const TQValueList<GroupWise::ContactItem> & contactInstances );
 	TQString displayName();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.cpp
index 3f8ff7bf..af0785de 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.cpp
@@ -21,7 +21,7 @@
 
 #include "updatefoldertask.h"
 
-UpdateFolderTask::UpdateFolderTask(Task* parent): UpdateItemTask(parent)
+UpdateFolderTask::UpdateFolderTask(Task* tqparent): UpdateItemTask(tqparent)
 {
 }
 
@@ -39,7 +39,7 @@ void UpdateFolderTask::renameFolder( const TQString & newName, const GroupWise::
 	renamed.name = newName;
 	// add the new version of the folder, marked add
 	lst.append( new Field::MultiField( NM_A_FA_FOLDER, NMFIELD_METHOD_ADD, 0, NMFIELD_TYPE_ARRAY, folderToFields( renamed ) ) );
-	// let our parent class package it up as a contactlist in a transfer
+	// let our tqparent class package it up as a contactlist in a transfer
 	UpdateItemTask::item( lst );
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h
index 479a6bdd..90882a3d 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h
@@ -31,8 +31,9 @@ Renames a folder on the server
 class UpdateFolderTask : public UpdateItemTask
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	UpdateFolderTask(Task* parent);
+	UpdateFolderTask(Task* tqparent);
 	~UpdateFolderTask();
 	void renameFolder( const TQString & newName, const GroupWise::FolderItem & existing );
 protected: 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.cpp
index 1af4ef12..95edb593 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.cpp
@@ -20,7 +20,7 @@
 
 #include "updateitemtask.h"
 
-UpdateItemTask::UpdateItemTask( Task* parent) : RequestTask( parent )
+UpdateItemTask::UpdateItemTask( Task* tqparent) : RequestTask( tqparent )
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h
index a087d276..a988e371 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h
@@ -31,8 +31,9 @@ Rename a folder or contact on the server.  In future may be used for changing th
 class UpdateItemTask : public RequestTask
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	UpdateItemTask( Task* parent );
+	UpdateItemTask( Task* tqparent );
 	~UpdateItemTask();
 	void item( Field::FieldList updateItemFields );
 };
diff --git a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h
index fcd540fc..a40f337c 100644
--- a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h
+++ b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h
@@ -20,18 +20,19 @@
 #include "gwclientstream.h"
 #include "gwconnector.h"
 #include <qca.h>
-#include "qcatlshandler.h"
+#include "tqcatlshandler.h"
 #include "requestfactory.h"
 #include "request.h"
 #include "usertransfer.h"
 
 #include "coreprotocol.h"
 
-#define QT_FATAL_ASSERT 1
+#define TQT_FATAL_ASSERT 1
 
-class ClientStreamTest : public QApplication
+class ClientStreamTest : public TQApplication
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	ClientStreamTest(int argc, char ** argv);
 	
diff --git a/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp b/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp
index 2dace60b..69cd1991 100644
--- a/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp
@@ -11,12 +11,12 @@ int main()
 {
 	buildFakeContactList();
 	// look for a field in the list
-/*	if ( fl.find( NM_A_FA_MESSAGE ) != fl.end() )
+/*	if ( fl.tqfind( NM_A_FA_MESSAGE ) != fl.end() )
 		printf( "Found a field, where there was supposed to be one :)\n" );
 	else
 		printf( "Didn't find a field, where there was supposed to be one :(\n" );
 	Field::FieldListIterator it;
-	if ( (it = fl.find( NM_A_SZ_OBJECT_ID ) ) != fl.end() )
+	if ( (it = fl.tqfind( NM_A_SZ_OBJECT_ID ) ) != fl.end() )
 		printf( "Found a field, where there was NOT supposed to be one :(\n" );
 	else
 		printf( "Didn't find a field, where there wasn't supposed to be one :)\n" );*/
@@ -26,19 +26,19 @@ int main()
 	
 	printf( "\nNow testing find routines.\n");
 	// find the field containing the contact list
-	Field::MultiField * clf = dynamic_cast< Field::MultiField * >( *(fl.find( NM_A_FA_CONTACT_LIST ) ) );
+	Field::MultiField * clf = dynamic_cast< Field::MultiField * >( *(fl.tqfind( NM_A_FA_CONTACT_LIST ) ) );
 	if ( clf )
 	{
 		Field::FieldList cl = clf->fields();
 		// look for a folder in the list
-		Field::FieldListIterator it = cl.find( NM_A_FA_FOLDER );
+		Field::FieldListIterator it = cl.tqfind( NM_A_FA_FOLDER );
 		if ( it != cl.end() )
 			printf( "Found the first folder :)\n");
 		else
 			printf( "Didn't find the first folder, where did it go? :(\n");
 		
 		printf( "Looking for a second folder :)\n");
-		it = cl.find( ++it, NM_A_FA_FOLDER );
+		it = cl.tqfind( ++it, NM_A_FA_FOLDER );
 		if ( it == cl.end() )
 			printf( "Didn't find a second folder :)\n" );
 		else
@@ -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/tlshandler.cpp b/kopete/protocols/groupwise/libgroupwise/tlshandler.cpp
index 16527bba..21010e57 100644
--- a/kopete/protocols/groupwise/libgroupwise/tlshandler.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tlshandler.cpp
@@ -19,8 +19,8 @@
   
 #include "tlshandler.h"
 
-TLSHandler::TLSHandler(TQObject *parent)
-:TQObject(parent)
+TLSHandler::TLSHandler(TQObject *tqparent)
+:TQObject(tqparent)
 {
 }
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tlshandler.h b/kopete/protocols/groupwise/libgroupwise/tlshandler.h
index ede9d4e3..67c47409 100644
--- a/kopete/protocols/groupwise/libgroupwise/tlshandler.h
+++ b/kopete/protocols/groupwise/libgroupwise/tlshandler.h
@@ -28,11 +28,12 @@
 //#include<tqxml.h>
 //#include<tqdom.h>
  
-class TLSHandler : public QObject
+class TLSHandler : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	TLSHandler(TQObject *parent=0);
+	TLSHandler(TQObject *tqparent=0);
 	virtual ~TLSHandler();
 
 	virtual void reset()=0;
diff --git a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp
index ceb29632..315a60d0 100644
--- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp
@@ -20,8 +20,8 @@
 
 #include "userdetailsmanager.h"
 
-UserDetailsManager::UserDetailsManager( Client * parent, const char *name)
- : TQObject(parent, name), m_client( parent )
+UserDetailsManager::UserDetailsManager( Client * tqparent, const char *name)
+ : TQObject(tqparent, name), m_client( tqparent )
 {
 }
 
@@ -41,8 +41,8 @@ bool UserDetailsManager::known( const TQString & dn )
 {
 	if ( dn == m_client->userDN() )
 		return true;
-	// TODO: replace with m_detailsMap.contains( dn );
-	TQStringList::Iterator found = m_detailsMap.keys().find( dn );
+	// TODO: replace with m_detailsMap.tqcontains( dn );
+	TQStringList::Iterator found = m_detailsMap.keys().tqfind( dn );
 	// we always know the local user's details, so don't look them up
 	return ( found !=m_detailsMap.keys().end() );
 }
@@ -85,10 +85,10 @@ void UserDetailsManager::requestDetails( const TQStringList & dnList, bool onlyU
 		// don't request details we already have unless the caller specified this
 		if ( onlyUnknown && known( *it ) )
 			break;
-		TQStringList::Iterator found = m_pendingDNs.find( *it );
+		TQStringList::Iterator found = m_pendingDNs.tqfind( *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 );
diff --git a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h
index f5a5ff6c..e7ba7ac4 100644
--- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h
+++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h
@@ -31,11 +31,12 @@ Several client event handling processes require that a contact's details are ava
 @author SUSE AG
 */
 
-class UserDetailsManager : public QObject
+class UserDetailsManager : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	UserDetailsManager( Client * parent, const char *name = 0);
+	UserDetailsManager( Client * tqparent, const char *name = 0);
 	~UserDetailsManager();
 	/**
 	 * List of DNs that we have already received details for