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

88 files changed, 437 insertions, 409 deletions

diff --git a/kopete/protocols/yahoo/libkyahoo/bytestream.cpp b/kopete/protocols/yahoo/libkyahoo/bytestream.cpp
index 8ca3a4cd..384402e9 100644
--- a/kopete/protocols/yahoo/libkyahoo/bytestream.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/bytestream.cpp
@@ -64,9 +64,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)
 {
 // 	kdDebug(14181) << k_funcinfo << endl;
 	d = new Private;
diff --git a/kopete/protocols/yahoo/libkyahoo/bytestream.h b/kopete/protocols/yahoo/libkyahoo/bytestream.h
index a990a940..c4dc96e1 100644
--- a/kopete/protocols/yahoo/libkyahoo/bytestream.h
+++ b/kopete/protocols/yahoo/libkyahoo/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/yahoo/libkyahoo/changestatustask.cpp b/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp
index 1943aa6b..757f7d98 100644
--- a/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp
@@ -1,6 +1,6 @@
 /*
     Kopete Yahoo Protocol
-    Change our Status
+    Change our tqStatus
 
     Copyright (c) 2005-2006 André Duffeck <[email protected]>
 
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 
-ChangeStatusTask::ChangeStatusTask(Task* parent) : Task(parent)
+ChangeStatusTask::ChangeStatusTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 }
@@ -41,7 +41,7 @@ void ChangeStatusTask::onGo()
 	}
 	else
 	{
-		YMSGTransfer *t = new YMSGTransfer( Yahoo::ServiceStatus );
+		YMSGTransfer *t = new YMSGTransfer( Yahoo::ServicetqStatus );
 		t->setId( client()->sessionID() );
 
 		if( !m_message.isEmpty() )
@@ -55,7 +55,7 @@ void ChangeStatusTask::onGo()
 
 		send( t );
 
-		if( client()->status() == Yahoo::StatusInvisible )	// Invisible --> Status
+		if( client()->status() == Yahoo::StatusInvisible )	// Invisible --> tqStatus
 			sendVisibility( Visible );
 	}
 	setSuccess();
@@ -74,7 +74,7 @@ void ChangeStatusTask::setMessage( const TQString &msg )
 	m_message = msg;
 }
 
-void ChangeStatusTask::setStatus( Yahoo::Status status )
+void ChangeStatusTask::settqStatus( Yahoo::tqStatus status )
 {
 	m_status = status;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/changestatustask.h b/kopete/protocols/yahoo/libkyahoo/changestatustask.h
index 200a6f34..50a2051b 100644
--- a/kopete/protocols/yahoo/libkyahoo/changestatustask.h
+++ b/kopete/protocols/yahoo/libkyahoo/changestatustask.h
@@ -1,6 +1,6 @@
 /*
     Kopete Yahoo Protocol
-    Change our Status
+    Change our tqStatus
 
     Copyright (c) 2005 André Duffeck <[email protected]>
 
@@ -30,18 +30,18 @@ class ChangeStatusTask : public Task
 {
 public:
 	enum Type { Available, Away };
-	ChangeStatusTask(Task *parent);
+	ChangeStatusTask(Task *tqparent);
 	~ChangeStatusTask();
 
 	virtual void onGo();
 
 	void setMessage( const TQString &msg );
-	void setStatus( Yahoo::Status status );
+	void settqStatus( Yahoo::tqStatus status );
 	void setType( Yahoo::StatusType type );
 private:
 	enum Visibility { Visible = 1, Invisible = 2 };
 	TQString m_message;
-	Yahoo::Status m_status;
+	Yahoo::tqStatus m_status;
 	Yahoo::StatusType m_type;
 
 	void sendVisibility( Visibility visible );
diff --git a/kopete/protocols/yahoo/libkyahoo/chatsessiontask.cpp b/kopete/protocols/yahoo/libkyahoo/chatsessiontask.cpp
index 3be83a79..6d7a987d 100644
--- a/kopete/protocols/yahoo/libkyahoo/chatsessiontask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/chatsessiontask.cpp
@@ -24,7 +24,7 @@
 #include <tqstring.h>
 #include <kdebug.h>
 
-ChatSessionTask::ChatSessionTask(Task* parent) : Task(parent)
+ChatSessionTask::ChatSessionTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/chatsessiontask.h b/kopete/protocols/yahoo/libkyahoo/chatsessiontask.h
index eee7cdc9..e1f9f498 100644
--- a/kopete/protocols/yahoo/libkyahoo/chatsessiontask.h
+++ b/kopete/protocols/yahoo/libkyahoo/chatsessiontask.h
@@ -30,7 +30,7 @@ class ChatSessionTask : public Task
 {
 public:
 	enum Type { RegisterSession, UnregisterSession };
-	ChatSessionTask(Task *parent);
+	ChatSessionTask(Task *tqparent);
 	~ChatSessionTask();
 	
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/client.cpp b/kopete/protocols/yahoo/libkyahoo/client.cpp
index d2a4b8dd..df261869 100644
--- a/kopete/protocols/yahoo/libkyahoo/client.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/client.cpp
@@ -95,10 +95,10 @@ public:
 	TQString yCookie;
 	TQString tCookie;
 	TQString cCookie;
-	Yahoo::Status status;
-	Yahoo::Status statusOnConnect;
+	Yahoo::tqStatus status;
+	Yahoo::tqStatus statusOnConnect;
 	TQString statusMessageOnConnect;
-	Yahoo::PictureStatus pictureFlag;
+	Yahoo::PicturetqStatus pictureFlag;
 	int pictureChecksum;
 	bool buddyListReady;
 	TQStringList pictureRequestQueue;
@@ -112,7 +112,7 @@ Client::Client(TQObject *par) :TQObject(par, "yahooclient")
 
 	d->root = new Task(this, true);
 	d->statusOnConnect = Yahoo::StatusAvailable;
-	setStatus( Yahoo::StatusDisconnected );
+	settqStatus( Yahoo::StatusDisconnected );
 	d->tasksInitialized = false;
 	d->stream = 0L;
 	d->iconLoader = 0L;
@@ -132,8 +132,8 @@ Client::Client(TQObject *par) :TQObject(par, "yahooclient")
 	TQObject::connect( d->loginTask, TQT_SIGNAL( haveCookies() ), TQT_SLOT( slotGotCookies() ) );
 	TQObject::connect( d->listTask, TQT_SIGNAL( gotBuddy(const TQString &, const TQString &, const TQString &) ),
 					TQT_SIGNAL( gotBuddy(const TQString &, const TQString &, const TQString &) ) );
-	TQObject::connect( d->listTask, TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ),
-					TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ) );
+	TQObject::connect( d->listTask, TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ) ),
+					TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ) ) );
 }
 
 Client::~Client()
@@ -151,7 +151,7 @@ void Client::connect( const TQString &host, const uint port, const TQString &use
 	d->port = port;
 	d->user = userId;
 	d->pass = pass;
-	setStatus( Yahoo::StatusConnecting );
+	settqStatus( Yahoo::StatusConnecting );
 
 	m_connector = new KNetworkConnector;
 	m_connector->setOptHostPort( host, port );
@@ -272,9 +272,9 @@ void Client::slotLoginResponse( int response, const TQString &msg )
 		if( !(d->statusOnConnect == Yahoo::StatusAvailable ||
 				d->statusOnConnect == Yahoo::StatusInvisible) ||
 				!d->statusMessageOnConnect.isEmpty() )
-			changeStatus( d->statusOnConnect, d->statusMessageOnConnect, Yahoo::StatusTypeAway );
-		d->statusMessageOnConnect = TQString::null;
-		setStatus( d->statusOnConnect );
+			changetqStatus( d->statusOnConnect, d->statusMessageOnConnect, Yahoo::StatusTypeAway );
+		d->statusMessageOnConnect = TQString();
+		settqStatus( d->statusOnConnect );
 		/* only send a ping every hour. we get disconnected otherwise */
 		m_pingTimer->start( 60 * 60 * 1000 );
 		initTasks();
@@ -344,7 +344,7 @@ void Client::sendBuzz( const TQString &to )
 {
 	SendMessageTask *smt = new SendMessageTask( d->root );
 	smt->setTarget( to );
-	smt->setText( TQString::fromLatin1( "<ding>" ) );
+	smt->setText( TQString::tqfromLatin1( "<ding>" ) );
 	smt->setPicureFlag( pictureFlag() );
 	smt->go( true );
 }
@@ -404,13 +404,13 @@ void Client::cancelFileTransfer( unsigned int transferId )
 	emit fileTransferCanceled( transferId );
 }
 
-void Client::changeStatus( Yahoo::Status status, const TQString &message, Yahoo::StatusType type )
+void Client::changetqStatus( Yahoo::tqStatus status, const TQString &message, Yahoo::StatusType type )
 {
 	kdDebug(YAHOO_RAW_DEBUG) << "status: " << status
 					<< " message: " << message
 					<< " type: " << type << endl;
 	ChangeStatusTask *cst = new ChangeStatusTask( d->root );
-	cst->setStatus( status );
+	cst->settqStatus( status );
 	cst->setMessage( message );
 	cst->setType( type );
 	cst->go( true );
@@ -418,7 +418,7 @@ void Client::changeStatus( Yahoo::Status status, const TQString &message, Yahoo:
 	if( status == Yahoo::StatusInvisible )
 		stealthContact( TQString(), Yahoo::StealthOnline, Yahoo::StealthClear );
 
-	setStatus( status );
+	settqStatus( status );
 }
 
 void Client::sendAuthReply( const TQString &userId, bool accept, const TQString &msg )
@@ -444,7 +444,7 @@ void Client::sendPing()
 
 // ***** Contactlist handling *****
 
-void Client::stealthContact(TQString const &userId, Yahoo::StealthMode mode, Yahoo::StealthStatus state)
+void Client::stealthContact(TQString const &userId, Yahoo::StealthMode mode, Yahoo::StealthtqStatus state)
 {
 	StealthTask *st = new StealthTask( d->root );
 	st->setTarget( userId );
@@ -575,16 +575,16 @@ void Client::sendPictureInformation( const TQString &userId, const TQString &url
 	spt->go( true );
 }
 
-void Client::setPictureStatus( Yahoo::PictureStatus status )
+void Client::setPicturetqStatus( Yahoo::PicturetqStatus status )
 {
 	if( d->pictureFlag == status )
 		return;
 
-	kdDebug(YAHOO_RAW_DEBUG) << "Setting PictureStatus to: " << status << endl;
+	kdDebug(YAHOO_RAW_DEBUG) << "Setting PicturetqStatus to: " << status << endl;
 	d->pictureFlag = status;
 	SendPictureTask *spt = new SendPictureTask( d->root );
-	spt->setType( SendPictureTask::SendStatus );
-	spt->setStatus( status );
+	spt->setType( SendPictureTask::SendtqStatus );
+	spt->settqStatus( status );
 	spt->go( true );
 }
 
@@ -710,8 +710,8 @@ void Client::leaveChat()
 // ***** other *****
 void Client::notifyError( const TQString &info, const TQString & errorString, LogLevel level )
 {
-	kdDebug(YAHOO_RAW_DEBUG) << TQString::fromLatin1("\nThe following error occurred: %1\n    Reason: %2\n    LogLevel: %3")
-		.arg(info).arg(errorString).arg(level) << endl;
+	kdDebug(YAHOO_RAW_DEBUG) << TQString::tqfromLatin1("\nThe following error occurred: %1\n    Reason: %2\n    LogLevel: %3")
+		.tqarg(info).tqarg(errorString).tqarg(level) << endl;
 	d->errorString = errorString;
 	d->errorInformation = info;
 	emit error( level );
@@ -727,18 +727,18 @@ void Client::setUserId( const TQString & userId )
 	d->user = userId;
 }
 
-Yahoo::Status Client::status()
+Yahoo::tqStatus Client::status()
 {
 	return d->status;
 }
 
-void Client::setStatus( Yahoo::Status status )
+void Client::settqStatus( Yahoo::tqStatus status )
 {
 	d->status = status;
 }
 
 
-void Client::setStatusOnConnect( Yahoo::Status status )
+void Client::setStatusOnConnect( Yahoo::tqStatus status )
 {
 	d->statusOnConnect = status;
 }
@@ -841,8 +841,8 @@ void Client::initTasks()
 	d->statusTask = new StatusNotifierTask( d->root );
 	TQObject::connect( d->statusTask, TQT_SIGNAL( statusChanged(const TQString&,int,const TQString&,int,int,int) ),
 				TQT_SIGNAL( statusChanged(const TQString&,int,const TQString&,int,int,int) ) );
-	TQObject::connect( d->statusTask, TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ),
-				TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ) );
+	TQObject::connect( d->statusTask, TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ) ),
+				TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ) ) );
 	TQObject::connect( d->statusTask, TQT_SIGNAL( loginResponse( int, const TQString& ) ),
 				TQT_SLOT( slotLoginResponse( int, const TQString& ) ) );
 	TQObject::connect( d->statusTask, TQT_SIGNAL( authorizationRejected( const TQString&, const TQString& ) ),
diff --git a/kopete/protocols/yahoo/libkyahoo/client.h b/kopete/protocols/yahoo/libkyahoo/client.h
index ee8e1a43..9fc4825e 100644
--- a/kopete/protocols/yahoo/libkyahoo/client.h
+++ b/kopete/protocols/yahoo/libkyahoo/client.h
@@ -40,9 +40,10 @@ class Task;
 class KTemporaryFile;
 struct YABEntry;
 
-class Client : public QObject
+class Client : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 
 	public:
 
@@ -52,7 +53,7 @@ Q_OBJECT
 
 		enum LogLevel { Debug, Info, Notice, Warning, Error, Critical };
 
-		Client(TQObject *parent=0);
+		Client(TQObject *tqparent=0);
 		~Client();
 
 		/**
@@ -99,7 +100,7 @@ Q_OBJECT
 		 * If status is any other status the Client connects into Online state and changes into the specified state after the login.
 		 * @param status the status to connect with
 		 */
-		void setStatusOnConnect( Yahoo::Status status );
+		void setStatusOnConnect( Yahoo::tqStatus status );
 
 		/**
 		 * Specifies the status message we connect with.
@@ -146,7 +147,7 @@ Q_OBJECT
 		 * @param message the status message that will be set
 		 * @param type Yahoo::StatusTypeAvailable means that the user is available, Yahoo::StatusTypeAway means that the user is away from the keyboard
 		 */
-		void changeStatus(Yahoo::Status status, const TQString &message, Yahoo::StatusType type);
+		void changetqStatus(Yahoo::tqStatus status, const TQString &message, Yahoo::StatusType type);
 
 		/**
 		 * Set the verification word that is needed for a account verification after
@@ -161,7 +162,7 @@ Q_OBJECT
 		 * @param group the group where the buddy will be placed
 		 * @param message the message that will be sent to the buddy along the authorization request
 		 */
-		void addBuddy( const TQString &userId, const TQString &group, const TQString &message = TQString::fromLatin1("Please add me")  );
+		void addBuddy( const TQString &userId, const TQString &group, const TQString &message = TQString::tqfromLatin1("Please add me")  );
 
 		/**
 		 * Remove a buddy from the contact list
@@ -184,7 +185,7 @@ Q_OBJECT
 		 * @param mode defines the Stealth mode that is changed. That can be "Appear Offline", "Appear Online" or "Apper permanently offline"
 		 * @param state the status of the specified Stealth mode. Active, Not Active or Clear
 		 */
-		void stealthContact( TQString const &userId, Yahoo::StealthMode mode, Yahoo::StealthStatus state );
+		void stealthContact( TQString const &userId, Yahoo::StealthMode mode, Yahoo::StealthtqStatus state );
 
 		/**
 		 * Request the buddy's picture
@@ -225,7 +226,7 @@ Q_OBJECT
 		 * Notify the buddies about our new status
 		 * @param flag the type of our picture (0=none, 1=avatar, 2=picture)
 		 */
-		void setPictureStatus( Yahoo::PictureStatus flag );
+		void setPicturetqStatus( Yahoo::PicturetqStatus flag );
 
 		/**
 		 * Send a response to the webcam invite ( Accept / Decline )
@@ -431,13 +432,13 @@ Q_OBJECT
 		int pictureChecksum();
 
 		/** Get our status */
-		Yahoo::Status status();
+		Yahoo::tqStatus status();
 
 		/**
 		 * Set our status
 		 * @param status the new status
 		 */
-		void setStatus( Yahoo::Status status );
+		void settqStatus( Yahoo::tqStatus status );
 
 		/** Access the root Task for this client, so tasks may be added to it. */
 		Task* rootTask();
@@ -502,7 +503,7 @@ Q_OBJECT
 		/**
 		 * Notifies about the stealth status of buddies
 		 */
-		void stealthStatusChanged( const TQString &, Yahoo::StealthStatus );
+		void stealthStatusChanged( const TQString &, Yahoo::StealthtqStatus );
 		/**
 		 * Notifies about mails
 		 */
diff --git a/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp b/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp
index 59d3b3fa..105d9de6 100644
--- a/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp
@@ -23,7 +23,7 @@
 #include <tqstringlist.h>
 #include <kdebug.h>
 
-ConferenceTask::ConferenceTask(Task* parent) : Task(parent)
+ConferenceTask::ConferenceTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 }
@@ -178,7 +178,7 @@ void ConferenceTask::addInvite( const TQString &room, const TQStringList &who, c
 
 	TQString whoList = who.first();
 	for( int i = 1; i < who.size(); i++ )
-		whoList += TQString(",%1").arg( who[i] );
+		whoList += TQString(",%1").tqarg( who[i] );
 	t->setParam( 51, whoList.local8Bit() );
 
 	t->setParam( 57, room.local8Bit() );
diff --git a/kopete/protocols/yahoo/libkyahoo/conferencetask.h b/kopete/protocols/yahoo/libkyahoo/conferencetask.h
index 5f027c0f..aff52228 100644
--- a/kopete/protocols/yahoo/libkyahoo/conferencetask.h
+++ b/kopete/protocols/yahoo/libkyahoo/conferencetask.h
@@ -27,8 +27,9 @@ class YMSGTransfer;
 class ConferenceTask : public Task
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	ConferenceTask(Task *parent);
+	ConferenceTask(Task *tqparent);
 	~ConferenceTask();
 
 	bool take(Transfer *transfer);
diff --git a/kopete/protocols/yahoo/libkyahoo/connector.cpp b/kopete/protocols/yahoo/libkyahoo/connector.cpp
index cc7dcfa3..36912011 100644
--- a/kopete/protocols/yahoo/libkyahoo/connector.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/connector.cpp
@@ -20,8 +20,8 @@
 
 #include "connector.h"
 
-Connector::Connector(TQObject *parent)
-:TQObject(parent)
+Connector::Connector(TQObject *tqparent)
+:TQObject(tqparent)
 {
 	setPeerAddressNone();
 }
@@ -40,7 +40,7 @@ TQHostAddress Connector::peerAddress() const
 	return addr;
 }
 
-Q_UINT16 Connector::peerPort() const
+TQ_UINT16 Connector::peerPort() const
 {
 	return port;
 }
@@ -52,7 +52,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/yahoo/libkyahoo/connector.h b/kopete/protocols/yahoo/libkyahoo/connector.h
index 02b47019..f5b1917a 100644
--- a/kopete/protocols/yahoo/libkyahoo/connector.h
+++ b/kopete/protocols/yahoo/libkyahoo/connector.h
@@ -27,11 +27,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 havePeerAddress() const;
 	TQHostAddress peerAddress() const;
-	Q_UINT16 peerPort() const;
+	TQ_UINT16 peerPort() const;
 
 signals:
 	void connected();
@@ -48,12 +49,12 @@ signals:
 
 protected:
 	void setPeerAddressNone();
-	void setPeerAddress(const TQHostAddress &addr, Q_UINT16 port);
+	void setPeerAddress(const TQHostAddress &addr, TQ_UINT16 port);
 
 private:
 	bool haveaddr;
 	TQHostAddress addr;
-	Q_UINT16 port;
+	TQ_UINT16 port;
 };
 
 #endif
diff --git a/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp b/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp
index 573c5ccf..c9c5828b 100644
--- a/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp
@@ -115,7 +115,7 @@ Transfer* CoreProtocol::incomingTransfer()
 void cp_dump( const TQByteArray &bytes )
 {
 #ifdef YAHOO_COREPROTOCOL_DEBUG
-	kdDebug(YAHOO_RAW_DEBUG) << " contains " << bytes.count() << " bytes" << endl;
+	kdDebug(YAHOO_RAW_DEBUG) << " tqcontains " << bytes.count() << " bytes" << endl;
 	for ( uint i = 0; i < bytes.count(); ++i )
 	{
 		printf( "%02x ", bytes[ i ] );
@@ -196,7 +196,7 @@ int CoreProtocol::wireToTransfer( const TQByteArray& wire )
 			kdDebug(YAHOO_RAW_DEBUG) << " - not a valid YMSG packet. Trying to recover." << endl;
 			TQTextStream s( wire, IO_ReadOnly );
 			TQString remaining = s.read();
-			int pos = remaining.find( "YMSG", bytesParsed );
+			int pos = remaining.tqfind( "YMSG", bytesParsed );
 			if( pos >= 0 )
 			{
 				kdDebug(YAHOO_RAW_DEBUG) << "Recover successful." << endl;
diff --git a/kopete/protocols/yahoo/libkyahoo/coreprotocol.h b/kopete/protocols/yahoo/libkyahoo/coreprotocol.h
index c1c05d89..fc4c2be6 100644
--- a/kopete/protocols/yahoo/libkyahoo/coreprotocol.h
+++ b/kopete/protocols/yahoo/libkyahoo/coreprotocol.h
@@ -27,9 +27,10 @@
 class Transfer;
 class YMSGProtocol;
 
-class CoreProtocol : public QObject
+class CoreProtocol : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	enum State { NeedMore, Available, NoData, OutOfSync };
 
diff --git a/kopete/protocols/yahoo/libkyahoo/crypt.c b/kopete/protocols/yahoo/libkyahoo/crypt.c
index ee15c345..76620bc4 100644
--- a/kopete/protocols/yahoo/libkyahoo/crypt.c
+++ b/kopete/protocols/yahoo/libkyahoo/crypt.c
@@ -45,7 +45,7 @@ static const char md5_salt_prefix[] = "$1$";
 
 /* Table with characters for base64 transformation.  */
 static const char b64t[64] =
-"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+"./0123456789ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 
 char *yahoo_crypt(const char *key, const char *salt);
 
diff --git a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp
index fd9657f7..10056a61 100644
--- a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp
@@ -25,7 +25,7 @@
 #include <kdebug.h>
 //#include <kcodecs.h>
 
-FileTransferNotifierTask::FileTransferNotifierTask(Task* parent) : Task(parent)
+FileTransferNotifierTask::FileTransferNotifierTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 }
@@ -104,8 +104,8 @@ void FileTransferNotifierTask::parseFileTransfer( YMSGTransfer *t )
 		return;
 
 
-	unsigned int left = url.findRev( '/' ) + 1;
-        unsigned int right = url.findRev( '?' );
+	unsigned int left = url.tqfindRev( '/' ) + 1;
+        unsigned int right = url.tqfindRev( '?' );
 	filename = url.mid( left, right - left );
 
 	emit incomingFileTransfer( from, url, expires, msg, filename, size, TQPixmap() );
diff --git a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h
index 429c3668..84b50849 100644
--- a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h
+++ b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h
@@ -30,8 +30,9 @@ class TQPixmap;
 class FileTransferNotifierTask : public Task
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	FileTransferNotifierTask(Task *parent);
+	FileTransferNotifierTask(Task *tqparent);
 	~FileTransferNotifierTask();
 	
 	bool take(Transfer *transfer);
diff --git a/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.cpp b/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.cpp
index 15c3b078..53068b58 100644
--- a/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.cpp
@@ -19,8 +19,8 @@
 #include "inputprotocolbase.h"
 
 
-InputProtocolBase::InputProtocolBase(TQObject *parent, const char *name)
- : TQObject(parent, name)
+InputProtocolBase::InputProtocolBase(TQObject *tqparent, const char *name)
+ : TQObject(tqparent, name)
 {
 }
 
@@ -64,11 +64,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 > 1024 )
 		return false;
 	//qDebug( "EventProtocol::safeReadBytes() - expecting %i bytes", val );
diff --git a/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.h b/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.h
index e236bc68..3c610cdf 100644
--- a/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.h
+++ b/kopete/protocols/yahoo/libkyahoo/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();
 	/**
 	 * Returns a value describing the state of the object.  
diff --git a/kopete/protocols/yahoo/libkyahoo/libyahoo.c b/kopete/protocols/yahoo/libkyahoo/libyahoo.c
index a97e7be7..56b5f968 100644
--- a/kopete/protocols/yahoo/libkyahoo/libyahoo.c
+++ b/kopete/protocols/yahoo/libkyahoo/libyahoo.c
@@ -60,7 +60,7 @@ extern char *yahoo_crypt(char *, char *);
 void yahooBase64(unsigned char *out, const unsigned char *in, int inlen)
 /* raw bytes in quasi-big-endian order to base 64 string (NUL-terminated) */
 {
-	char base64digits[] = 	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+	char base64digits[] = 	"ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
 				"abcdefghijklmnopqrstuvwxyz"
 				"0123456789._";
 
@@ -152,7 +152,7 @@ void authresp_0x0b(const char *seed, const char *sn, const char *password, char
 	while (*magic_ptr != (int)NULL) {
 		const char *loc;
 
-		/* Ignore parentheses.  */
+		/* Ignore tqparentheses.  */
 
 		if (*magic_ptr == '(' || *magic_ptr == ')') {
 			magic_ptr++;
diff --git a/kopete/protocols/yahoo/libkyahoo/listtask.cpp b/kopete/protocols/yahoo/libkyahoo/listtask.cpp
index d299f963..a368ac5b 100644
--- a/kopete/protocols/yahoo/libkyahoo/listtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/listtask.cpp
@@ -23,7 +23,7 @@
 #include "client.h"
 #include <kdebug.h>
 
-ListTask::ListTask(Task* parent) : Task(parent)
+ListTask::ListTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/listtask.h b/kopete/protocols/yahoo/libkyahoo/listtask.h
index 067868a2..2c487c0c 100644
--- a/kopete/protocols/yahoo/libkyahoo/listtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/listtask.h
@@ -28,8 +28,9 @@ class YMSGTransfer;
 class ListTask : public Task
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	ListTask(Task *parent);
+	ListTask(Task *tqparent);
 	~ListTask();
 
 	bool take(Transfer *transfer);
@@ -40,7 +41,7 @@ protected:
 	void parseStealthList( YMSGTransfer *transfer );
 signals:
 	void gotBuddy(const TQString&, const TQString&, const TQString&);
-	void stealthStatusChanged( const TQString&, Yahoo::StealthStatus );
+	void stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus );
 };
 
 #endif
diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.cpp b/kopete/protocols/yahoo/libkyahoo/logintask.cpp
index 3c3127b2..439b39f7 100644
--- a/kopete/protocols/yahoo/libkyahoo/logintask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/logintask.cpp
@@ -37,7 +37,7 @@ extern "C"
 #include "libyahoo.h"
 }
 
-LoginTask::LoginTask(Task* parent) : Task(parent)
+LoginTask::LoginTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 	mState = InitialState;
@@ -209,10 +209,10 @@ void LoginTask::sendAuthSixteenStage1(const TQString& sn, const TQString& seed)
 {
 	const TQString YahooTokenUrl = "https://login.yahoo.com/config/pwtoken_get?src=ymsgr&ts=&login=%1&passwd=%2&chal=%3";
 	kdDebug(YAHOO_RAW_DEBUG) << "seed:" << seed << endl;
-	m_stage1Data= TQString::null;
+	m_stage1Data= TQString();
 	/* construct a URL from the seed and request tokens */
 	TQByteArray encodedUrl;
-	TQString fullUrl = YahooTokenUrl.arg(sn, client()->password(), seed);
+	TQString fullUrl = YahooTokenUrl.tqarg(sn, client()->password(), seed);
 	KURL tokenUrl(fullUrl);
 	KIO::Job* job = KIO::get(tokenUrl, true, false);
 	connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
@@ -291,8 +291,8 @@ void LoginTask::sendAuthSixteenStage2(const TQString& token)
 {
 	const TQString YahooLoginUrl = "https://login.yahoo.com/config/pwtoken_login?src=ymsgr&ts=&token=%1";
 	kdDebug(YAHOO_RAW_DEBUG) << "token:" << token << endl;
-	m_stage2Data = TQString::null;
-	TQString fullUrl = YahooLoginUrl.arg(token);
+	m_stage2Data = TQString();
+	TQString fullUrl = YahooLoginUrl.tqarg(token);
 	KURL loginUrl(fullUrl);
 	KIO::Job* job = KIO::get(loginUrl, true, false);
 	connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
@@ -353,15 +353,15 @@ void LoginTask::sendAuthSixteenStage3(const TQString& cryptString)
 {
 	kdDebug(YAHOO_RAW_DEBUG) << " with crypt string" << cryptString << endl;
 
-	//TQByteArray cryptStringHash = QCryptographicHash::hash( cryptString.toAscii(),
-	//                                                       QCryptographicHash::Md5 );
+	//TQByteArray cryptStringHash = TQCryptographicHash::hash( cryptString.toAscii(),
+	//                                                       TQCryptographicHash::Md5 );
 	//cryptStringHash = cryptStringHash.toBase64();
 
 	TQString cryptStringHash = KMD5( cryptString.ascii() ).base64Digest();
 
-	cryptStringHash = cryptStringHash.replace('+', '.');
-	cryptStringHash = cryptStringHash.replace('/', '_');
-	cryptStringHash = cryptStringHash.replace('=', '-');
+	cryptStringHash = cryptStringHash.tqreplace('+', '.');
+	cryptStringHash = cryptStringHash.tqreplace('/', '_');
+	cryptStringHash = cryptStringHash.tqreplace('=', '-');
 
 	YMSGTransfer *t = new YMSGTransfer(Yahoo::ServiceAuthResp, m_stateOnConnect);
 	t->setId( m_sessionID );
@@ -404,7 +404,7 @@ void LoginTask::handleAuthResp(YMSGTransfer *t)
 	mState = InitialState;
 }
 
-void LoginTask::setStateOnConnect( Yahoo::Status status )
+void LoginTask::setStateOnConnect( Yahoo::tqStatus status )
 {
 	m_stateOnConnect = status;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.h b/kopete/protocols/yahoo/libkyahoo/logintask.h
index eb2e8fc9..88fc53d3 100644
--- a/kopete/protocols/yahoo/libkyahoo/logintask.h
+++ b/kopete/protocols/yahoo/libkyahoo/logintask.h
@@ -38,15 +38,16 @@ namespace KIO
 class LoginTask : public Task
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	LoginTask(Task *parent);
+	LoginTask(Task *tqparent);
 	~LoginTask();
 
 	bool take(Transfer* transfer);
 	virtual void onGo();
 
 	void reset();
-	void setStateOnConnect( Yahoo::Status status );
+	void setStateOnConnect( Yahoo::tqStatus status );
 	void setVerificationWord( const TQString &word );
 
 	const TQString &yCookie();
@@ -79,7 +80,7 @@ signals:
 	void buddyListReady();
 private:
 	State mState;
-	Yahoo::Status m_stateOnConnect;
+	Yahoo::tqStatus m_stateOnConnect;
 	TQString m_yCookie;
 	TQString m_tCookie;
 	TQString m_cCookie;
diff --git a/kopete/protocols/yahoo/libkyahoo/logofftask.cpp b/kopete/protocols/yahoo/libkyahoo/logofftask.cpp
index 4816ba44..07fc1ae4 100644
--- a/kopete/protocols/yahoo/libkyahoo/logofftask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/logofftask.cpp
@@ -22,7 +22,7 @@
 #include <tqstring.h>
 #include <kdebug.h>
 
-LogoffTask::LogoffTask(Task* parent) : Task(parent)
+LogoffTask::LogoffTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/logofftask.h b/kopete/protocols/yahoo/libkyahoo/logofftask.h
index b04f8f53..af29512a 100644
--- a/kopete/protocols/yahoo/libkyahoo/logofftask.h
+++ b/kopete/protocols/yahoo/libkyahoo/logofftask.h
@@ -26,7 +26,7 @@
 class LogoffTask : public Task
 {
 public:
-	LogoffTask(Task *parent);
+	LogoffTask(Task *tqparent);
 	~LogoffTask();
 	
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp
index de6a1080..4c86bb20 100644
--- a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp
@@ -23,7 +23,7 @@
 #include "client.h"
 #include <kdebug.h>
 
-MailNotifierTask::MailNotifierTask(Task* parent) : Task(parent)
+MailNotifierTask::MailNotifierTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 }
@@ -68,7 +68,7 @@ void MailNotifierTask::parseMail( YMSGTransfer *t )
 	TQString subject = t->firstParam( 18 );
 
 	if( !mail.isEmpty() && !from.isEmpty() && !subject.isEmpty() )
-		emit mailNotify( TQString::fromLatin1( "%1 <%2>").arg( from, mail ), subject, count.toInt() );
+		emit mailNotify( TQString::tqfromLatin1( "%1 <%2>").tqarg( from, mail ), subject, count.toInt() );
 	else
 		emit mailNotify( TQString(), TQString(), count.toInt());
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h
index 0e1d6028..7faba303 100644
--- a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h
+++ b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h
@@ -28,8 +28,9 @@ class YMSGTransfer;
 class MailNotifierTask : public Task
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	MailNotifierTask(Task *parent);
+	MailNotifierTask(Task *tqparent);
 	~MailNotifierTask();
 	
 	bool take(Transfer *transfer);
diff --git a/kopete/protocols/yahoo/libkyahoo/md5.c b/kopete/protocols/yahoo/libkyahoo/md5.c
index 5a537e04..5bc2c13b 100644
--- a/kopete/protocols/yahoo/libkyahoo/md5.c
+++ b/kopete/protocols/yahoo/libkyahoo/md5.c
@@ -69,7 +69,7 @@ main()
 	"abc", /*900150983cd24fb0d6963f7d28e17f72*/
 	"message digest", /*f96b697d7cb7938d525a2f31aaf161d0*/
 	"abcdefghijklmnopqrstuvwxyz", /*c3fcd3d76192e4007dfb496cca67e13b*/
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
+	"ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
 				/*d174ab98d277d9f5a5611c2c9f419d9f*/
 	"12345678901234567890123456789012345678901234567890123456789012345678901234567890" /*57edf4a22be3c955ac49da2e2107b67a*/
     };
diff --git a/kopete/protocols/yahoo/libkyahoo/messagereceivertask.cpp b/kopete/protocols/yahoo/libkyahoo/messagereceivertask.cpp
index 769b4abe..522f407f 100644
--- a/kopete/protocols/yahoo/libkyahoo/messagereceivertask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/messagereceivertask.cpp
@@ -23,7 +23,7 @@
 #include "client.h"
 #include <kdebug.h>
 
-MessageReceiverTask::MessageReceiverTask(Task* parent) : Task(parent)
+MessageReceiverTask::MessageReceiverTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/messagereceivertask.h b/kopete/protocols/yahoo/libkyahoo/messagereceivertask.h
index 80c4fa44..459b851e 100644
--- a/kopete/protocols/yahoo/libkyahoo/messagereceivertask.h
+++ b/kopete/protocols/yahoo/libkyahoo/messagereceivertask.h
@@ -28,8 +28,9 @@ class YMSGTransfer;
 class MessageReceiverTask : public Task
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	MessageReceiverTask(Task *parent);
+	MessageReceiverTask(Task *tqparent);
 	~MessageReceiverTask();
 	
 	bool take(Transfer *transfer);
diff --git a/kopete/protocols/yahoo/libkyahoo/modifybuddytask.cpp b/kopete/protocols/yahoo/libkyahoo/modifybuddytask.cpp
index e83b1e4b..84b7f012 100644
--- a/kopete/protocols/yahoo/libkyahoo/modifybuddytask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/modifybuddytask.cpp
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 
-ModifyBuddyTask::ModifyBuddyTask(Task* parent) : Task(parent)
+ModifyBuddyTask::ModifyBuddyTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/modifybuddytask.h b/kopete/protocols/yahoo/libkyahoo/modifybuddytask.h
index 1d2393a6..3d353086 100644
--- a/kopete/protocols/yahoo/libkyahoo/modifybuddytask.h
+++ b/kopete/protocols/yahoo/libkyahoo/modifybuddytask.h
@@ -27,9 +27,10 @@ class TQString;
 class ModifyBuddyTask : public Task
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	enum Type { AddBuddy, RemoveBuddy, MoveBuddy };
-	ModifyBuddyTask(Task *parent);
+	ModifyBuddyTask(Task *tqparent);
 	~ModifyBuddyTask();
 	
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
index 1264272a..b456746a 100644
--- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
@@ -31,7 +31,7 @@
 #include <kbufferedsocket.h>
 
 using namespace KNetwork;
-ModifyYABTask::ModifyYABTask(Task* parent) : Task(parent)
+ModifyYABTask::ModifyYABTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 	m_socket = 0;
@@ -68,7 +68,7 @@ void ModifyYABTask::setEntry( const YABEntry &entry )
 	doc.appendChild( root );
 
 	TQDomElement contact = doc.createElement( "ct" );
-	entry.fillQDomElement( contact );
+	entry.fillTQDomElement( contact );
 	switch( m_action )
 	{
 	case EditEntry:
@@ -91,7 +91,7 @@ void ModifyYABTask::connectFailed( int i)
 {
 	m_socket->close();
 	client()->notifyError( i18n( "An error occurred while saving the address book entry." ),
-			TQString( "%1 - %2").arg(i).arg(static_cast<const KBufferedSocket*>( sender() )->errorString()), Client::Error );
+			TQString( "%1 - %2").tqarg(i).tqarg(static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString()), Client::Error );
 }
 
 void ModifyYABTask::connectSucceeded()
@@ -99,14 +99,14 @@ void ModifyYABTask::connectSucceeded()
 	kdDebug(YAHOO_RAW_DEBUG) ;
 	KBufferedSocket* socket = const_cast<KBufferedSocket*>( static_cast<const KBufferedSocket*>( sender() ) );
 
-	TQString header = TQString::fromLatin1("POST /yab/us?v=XM&prog=ymsgr&.intl=us&sync=1&tags=short&noclear=1& HTTP/1.1\r\n"
+	TQString header = TQString::tqfromLatin1("POST /yab/us?v=XM&prog=ymsgr&.intl=us&sync=1&tags=short&noclear=1& HTTP/1.1\r\n"
 			"Cookie: Y=%1; T=%2; C=%3 ;B=fckeert1kk1nl&b=2\r\n"
 			"User-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\n"
 			"Host: address.yahoo.com\r\n"
 			"Content-length: %4\r\n"
 			"Cache-Control: no-cache\r\n\r\n")
-			.arg(client()->yCookie()).arg(client()->tCookie())
-			.arg(client()->cCookie()).arg(m_postData.utf8().size());
+			.tqarg(client()->yCookie()).tqarg(client()->tCookie())
+			.tqarg(client()->cCookie()).tqarg(m_postData.utf8().size());
 
 	TQByteArray buffer;
 	TQByteArray paket;
@@ -118,7 +118,7 @@ void ModifyYABTask::connectSucceeded()
 		kdDebug(YAHOO_RAW_DEBUG) << "Upload Successful. Waiting for confirmation..." << endl;
 	else
 	{
-		client()->notifyError( i18n( "An error occurred while saving the address book entry." ), m_socket->errorString(), Client::Error );
+		client()->notifyError( i18n( "An error occurred while saving the address book entry." ), m_socket->KSocketBase::errorString(), Client::Error );
 		setError();
 		return;
 	}
@@ -132,9 +132,9 @@ void ModifyYABTask::slotRead()
 	TQByteArray ar( socket->bytesAvailable() );
 	socket->readBlock( ar.data (), ar.size () );
 	TQString data( ar );
-	data = data.right( data.length() - data.find("<?xml") );
+	data = data.right( data.length() - data.tqfind("<?xml") );
 
-	if( m_data.find("</ab>") < 0 )
+	if( m_data.tqfind("</ab>") < 0 )
 		return;						// Need more data
 
 	m_socket->close();
@@ -166,7 +166,7 @@ void ModifyYABTask::slotRead()
 		e = list.item( it ).toElement();
 
 		YABEntry *entry = new YABEntry;
-		entry->fromQDomElement( e );
+		entry->fromTQDomElement( e );
 		entry->source = YABEntry::SourceYAB;
 
 		switch( m_action )
@@ -174,21 +174,21 @@ void ModifyYABTask::slotRead()
 		case EditEntry:
 			if( !e.attribute( "es" ).isEmpty() && e.attribute( "es" ) != "0" )		// Check for edit errors
 			{
-				emit error( entry, i18n("The Yahoo Address Book entry could not be saved:\n%1 - %2").arg( e.attribute("es") ).arg( e.attribute("ee") ) );
+				emit error( entry, i18n("The Yahoo Address Book entry could not be saved:\n%1 - %2").tqarg( e.attribute("es") ).tqarg( e.attribute("ee") ) );
 				continue;
 			}
 			break;
 		case AddEntry:
 			if( !e.attribute( "as" ).isEmpty() && e.attribute( "as" ) != "0" )		// Check for add errors
 			{
-				emit error( entry, i18n("The Yahoo Address Book entry could not be created:\n%1 - %2").arg( e.attribute("as") ).arg( e.attribute("ae") ) );
+				emit error( entry, i18n("The Yahoo Address Book entry could not be created:\n%1 - %2").tqarg( e.attribute("as") ).tqarg( e.attribute("ae") ) );
 				continue;
 			}
 			break;
 		case DeleteEntry:
 			if( !e.attribute( "ds" ).isEmpty() && e.attribute( "ds" ) != "0" )		// Check for delete errors
 			{
-				emit error( entry, i18n("The Yahoo Address Book entry could not be deleted:\n%1 - %2").arg( e.attribute("ds") ).arg( e.attribute("de") ) );
+				emit error( entry, i18n("The Yahoo Address Book entry could not be deleted:\n%1 - %2").tqarg( e.attribute("ds") ).tqarg( e.attribute("de") ) );
 				continue;
 			}
 			break;
diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h
index 543b582c..ef1a97eb 100644
--- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h
@@ -35,9 +35,10 @@ namespace KNetwork	{
 class ModifyYABTask : public Task
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	enum Action { AddEntry, EditEntry, DeleteEntry };
-	ModifyYABTask(Task *parent);
+	ModifyYABTask(Task *tqparent);
 	~ModifyYABTask();
 
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp
index d924b3a6..cf7a6e34 100644
--- a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 
 
-PictureNotifierTask::PictureNotifierTask(Task* parent) : Task(parent)
+PictureNotifierTask::PictureNotifierTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 }
@@ -47,8 +47,8 @@ bool PictureNotifierTask::take( Transfer* transfer )
 
 	switch( t->service() )
 	{
-		case Yahoo::ServicePictureStatus:
-			parsePictureStatus( t );
+		case Yahoo::ServicePicturetqStatus:
+			parsePicturetqStatus( t );
 			parsePicture( t );
 		break;
 		case Yahoo::ServicePictureChecksum:
@@ -80,17 +80,17 @@ bool PictureNotifierTask::forMe( const Transfer* transfer ) const
 		t->service() == Yahoo::ServicePicture ||
 		t->service() == Yahoo::ServicePictureUpdate ||
 		t->service() == Yahoo::ServicePictureUpload ||
-		t->service() == Yahoo::ServicePictureStatus )
+		t->service() == Yahoo::ServicePicturetqStatus )
 		return true;
 	else
 		return false;
 }
 
-void PictureNotifierTask::parsePictureStatus( YMSGTransfer *t )
+void PictureNotifierTask::parsePicturetqStatus( YMSGTransfer *t )
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 
-	QString	nick;		/* key = 4 */
+	TQString	nick;		/* key = 4 */
 	int state;		/* key = 213  */
 
 	nick = t->firstParam( 4 );
@@ -103,7 +103,7 @@ void PictureNotifierTask::parsePictureChecksum( YMSGTransfer *t )
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 
-	QString	nick;		/* key = 4 */
+	TQString	nick;		/* key = 4 */
 	int checksum;		/* key = 192  */
 
 	nick = t->firstParam( 4 );
@@ -117,7 +117,7 @@ void PictureNotifierTask::parsePicture( YMSGTransfer *t )
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 
-	QString	nick;		/* key = 4 */
+	TQString	nick;		/* key = 4 */
 	int type;		/* key = 13: 1 = request, 2 = notification, 0 = Just changed */
 	TQString url;		/* key = 20 */
 	int checksum;		/* key = 192  */
diff --git a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h
index 22bbaddb..bfd03303 100644
--- a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h
+++ b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h
@@ -29,8 +29,9 @@ class YMSGTransfer;
 class PictureNotifierTask : public Task
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	PictureNotifierTask(Task *parent);
+	PictureNotifierTask(Task *tqparent);
 	~PictureNotifierTask();
 
 	bool take(Transfer *transfer);
@@ -38,7 +39,7 @@ public:
 protected:
 	virtual bool forMe( const Transfer *transfer ) const;
 	void parsePictureChecksum( YMSGTransfer *transfer );
-	void parsePictureStatus( YMSGTransfer *transfer );
+	void parsePicturetqStatus( YMSGTransfer *transfer );
 	void parsePicture( YMSGTransfer *transfer );
 	void parsePictureUploadResponse( YMSGTransfer *transfer );
 signals:
diff --git a/kopete/protocols/yahoo/libkyahoo/pingtask.cpp b/kopete/protocols/yahoo/libkyahoo/pingtask.cpp
index c453ff9d..25b80abe 100644
--- a/kopete/protocols/yahoo/libkyahoo/pingtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/pingtask.cpp
@@ -24,7 +24,7 @@
 #include <tqstring.h>
 #include <kdebug.h>
 
-PingTask::PingTask(Task* parent) : Task(parent)
+PingTask::PingTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/pingtask.h b/kopete/protocols/yahoo/libkyahoo/pingtask.h
index f1c2f6a7..47453709 100644
--- a/kopete/protocols/yahoo/libkyahoo/pingtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/pingtask.h
@@ -27,7 +27,7 @@
 class PingTask : public Task
 {
 public:
-	PingTask(Task *parent);
+	PingTask(Task *tqparent);
 	~PingTask();
 	
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
index ec2e9f5f..a614f0b8 100644
--- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
@@ -28,7 +28,7 @@
 #include <kio/job.h>
 #include <kio/jobclasses.h>
 
-ReceiveFileTask::ReceiveFileTask(Task* parent) : Task(parent)
+ReceiveFileTask::ReceiveFileTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
 	m_transmitted = 0;
@@ -187,20 +187,20 @@ void ReceiveFileTask::parseFileTransfer7Info( YMSGTransfer *transfer )
 
 		send( t );
 		// The server expects a HTTP HEAD command prior to the GET
-		m_mimetypeJob = KIO::mimetype(TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4")
-				.arg( TQString(transfer->firstParam( 250 )) ).arg( TQString(transfer->firstParam( 251 )) ).arg(m_userId).arg(client()->userId()), false);
+		m_mimetypeJob = KIO::mimetype(TQString::tqfromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4")
+				.tqarg( TQString(transfer->firstParam( 250 )) ).tqarg( TQString(transfer->firstParam( 251 )) ).tqarg(m_userId).tqarg(client()->userId()), false);
 		m_mimetypeJob->addMetaData("cookies", "manual");
-		m_mimetypeJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; C=%3;")
-				.arg(client()->tCookie()).arg(client()->yCookie()).arg(client()->cCookie()) );
+		m_mimetypeJob->addMetaData("setcookies", TQString::tqfromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; C=%3;")
+				.tqarg(client()->tCookie()).tqarg(client()->yCookie()).tqarg(client()->cCookie()) );
 
 
-		m_transferJob = KIO::get( TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4")
-				.arg( TQString(transfer->firstParam( 250 )) ).arg( TQString(transfer->firstParam( 251 )) ).arg(m_userId).arg(client()->userId()), false, false );
+		m_transferJob = KIO::get( TQString::tqfromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4")
+				.tqarg( TQString(transfer->firstParam( 250 )) ).tqarg( TQString(transfer->firstParam( 251 )) ).tqarg(m_userId).tqarg(client()->userId()), false, false );
 		TQObject::connect( m_transferJob, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotComplete( KIO::Job* ) ) );
 		TQObject::connect( m_transferJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray & ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray & ) ) );
 		m_transferJob->addMetaData("cookies", "manual");
- 		m_transferJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2;  path=/; domain=.yahoo.com;")
- 				.arg(client()->tCookie()).arg(client()->yCookie()) );
+ 		m_transferJob->addMetaData("setcookies", TQString::tqfromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2;  path=/; domain=.yahoo.com;")
+ 				.tqarg(client()->tCookie()).tqarg(client()->yCookie()) );
 	}
 }
 
diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.h b/kopete/protocols/yahoo/libkyahoo/receivefiletask.h
index ac828658..93f3261e 100644
--- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.h
+++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.h
@@ -36,9 +36,10 @@ class YMSGTransfer;
 class ReceiveFileTask : public Task
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	enum Type { FileTransferAccept, FileTransfer7Accept, FileTransfer7Reject };
-	ReceiveFileTask(Task *parent);
+	ReceiveFileTask(Task *tqparent);
 	~ReceiveFileTask();
 
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/requestpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/requestpicturetask.cpp
index 55fb046e..59173389 100644
--- a/kopete/protocols/yahoo/libkyahoo/requestpicturetask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/requestpicturetask.cpp
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 
-RequestPictureTask::RequestPictureTask(Task* parent) : Task(parent)
+RequestPictureTask::RequestPictureTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/requestpicturetask.h b/kopete/protocols/yahoo/libkyahoo/requestpicturetask.h
index eccaa652..d2a901bb 100644
--- a/kopete/protocols/yahoo/libkyahoo/requestpicturetask.h
+++ b/kopete/protocols/yahoo/libkyahoo/requestpicturetask.h
@@ -27,8 +27,9 @@ class TQString;
 class RequestPictureTask : public Task
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	RequestPictureTask(Task *parent);
+	RequestPictureTask(Task *tqparent);
 	virtual ~RequestPictureTask();
 
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/safedelete.cpp b/kopete/protocols/yahoo/libkyahoo/safedelete.cpp
index 0b12c370..714b0960 100644
--- a/kopete/protocols/yahoo/libkyahoo/safedelete.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/safedelete.cpp
@@ -63,13 +63,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/yahoo/libkyahoo/safedelete.h b/kopete/protocols/yahoo/libkyahoo/safedelete.h
index ded0cb31..8e6d5abd 100644
--- a/kopete/protocols/yahoo/libkyahoo/safedelete.h
+++ b/kopete/protocols/yahoo/libkyahoo/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/yahoo/libkyahoo/sendauthresptask.cpp b/kopete/protocols/yahoo/libkyahoo/sendauthresptask.cpp
index 34e94c69..1f23a40b 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendauthresptask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendauthresptask.cpp
@@ -23,7 +23,7 @@
 #include <tqstring.h>
 #include <kdebug.h>
 
-SendAuthRespTask::SendAuthRespTask(Task* parent) : Task(parent)
+SendAuthRespTask::SendAuthRespTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/sendauthresptask.h b/kopete/protocols/yahoo/libkyahoo/sendauthresptask.h
index cbdadf48..8740cf50 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendauthresptask.h
+++ b/kopete/protocols/yahoo/libkyahoo/sendauthresptask.h
@@ -28,8 +28,9 @@ class TQString;
 class SendAuthRespTask : public Task
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	SendAuthRespTask(Task *parent);
+	SendAuthRespTask(Task *tqparent);
 	~SendAuthRespTask();
 	
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
index 48af8684..11844cd8 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
@@ -29,7 +29,7 @@
 
 using namespace KNetwork;
 
-SendFileTask::SendFileTask(Task* parent) : Task(parent)
+SendFileTask::SendFileTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
 	m_transmitted = 0;
@@ -205,7 +205,7 @@ void SendFileTask::connectSucceeded()
 	}
 	else
 	{
-		kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << "Error opening file: " << m_file.errorString() << endl;
+		kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << "Error opening file: " << m_file.errorString().data() << endl;
 		client()->notifyError( i18n( "An error occurred while sending the file." ), m_file.errorString(), Client::Error );
 		setError();
 		return;
@@ -227,7 +227,7 @@ void SendFileTask::connectSucceeded()
 
 	if( !m_socket->writeBlock( buffer, buffer.size() ) )
 	{
-		emit error( m_transferId, m_socket->error(), m_socket->errorString() );
+		emit error( m_transferId, m_socket->error(), m_socket->KSocketBase::errorString() );
 		m_socket->close();
 	}
 	else
@@ -255,7 +255,7 @@ void SendFileTask::transmitData()
 	if( written != read )
 	{
 		kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << "Upload Failed!" << endl;
-		emit error( m_transferId, m_socket->error(), m_socket->errorString() );
+		emit error( m_transferId, m_socket->error(), m_socket->KSocketBase::errorString() );
 		setError();
 		return;
 	}
diff --git a/kopete/protocols/yahoo/libkyahoo/sendfiletask.h b/kopete/protocols/yahoo/libkyahoo/sendfiletask.h
index c9052125..49f7fbaf 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.h
+++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.h
@@ -32,8 +32,9 @@ namespace KNetwork{
 class SendFileTask : public Task
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	SendFileTask(Task *parent);
+	SendFileTask(Task *tqparent);
 	~SendFileTask();
 	
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp
index 828c6832..438c330f 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-SendMessageTask::SendMessageTask(Task* parent) : Task(parent)
+SendMessageTask::SendMessageTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.h b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.h
index e21d9029..52846a3d 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.h
+++ b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.h
@@ -27,7 +27,7 @@ class TQString;
 class SendMessageTask : public Task
 {
 public:
-	SendMessageTask(Task *parent);
+	SendMessageTask(Task *tqparent);
 	~SendMessageTask();
 	
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp
index 638a1811..00055725 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 
-SendNotifyTask::SendNotifyTask(Task* parent) : Task(parent)
+SendNotifyTask::SendNotifyTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
 }
@@ -35,7 +35,7 @@ void SendNotifyTask::onGo()
 {
 	YMSGTransfer *t = new YMSGTransfer(Yahoo::ServiceNotify);
 	t->setId( client()->sessionID() );
-	t->setStatus( Yahoo::StatusNotify );
+	t->settqStatus( Yahoo::StatusNotify );
 
 	switch( m_type )
 	{
diff --git a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.h b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.h
index d235e858..b4e84658 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.h
+++ b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.h
@@ -27,11 +27,12 @@ class TQString;
 class SendNotifyTask : public Task
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	enum Type { NotifyTyping, NotifyWebcamInvite, NotifyGame };
 	enum State { Active = 1, NotActive = 0 };
 
-	SendNotifyTask(Task *parent);
+	SendNotifyTask(Task *tqparent);
 	~SendNotifyTask();
 	
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
index ab10873a..32500f1c 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
@@ -31,7 +31,7 @@
 
 using namespace KNetwork;
 
-SendPictureTask::SendPictureTask(Task* parent) : Task(parent)
+SendPictureTask::SendPictureTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
 	m_socket = 0;
@@ -55,8 +55,8 @@ void SendPictureTask::onGo()
 		case SendInformation:
 			sendInformation();
 		break;
-		case SendStatus:
-			sendStatus();
+		case SendtqStatus:
+			sendtqStatus();
 		break;
 	}
 }
@@ -74,9 +74,9 @@ void SendPictureTask::initiateUpload()
 
 void SendPictureTask::connectFailed( int i)
 {
-	kdDebug(YAHOO_RAW_DEBUG) << i << ": " << static_cast<const KBufferedSocket*>( sender() )->errorString() << endl;
+	kdDebug(YAHOO_RAW_DEBUG) << i << ": " << static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString() << endl;
 
-	client()->notifyError(i18n("The picture was not successfully uploaded"), TQString("%1 - %2").arg(i).arg(static_cast<const KBufferedSocket*>( sender() )->errorString()), Client::Error );
+	client()->notifyError(i18n("The picture was not successfully uploaded"), TQString("%1 - %2").tqarg(i).tqarg(static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString()), Client::Error );
 	setError();
 }
 
@@ -104,22 +104,22 @@ void SendPictureTask::connectSucceeded()
 	}
 	else
 	{
-		kdDebug(YAHOO_RAW_DEBUG) << "Error opening file: " << file.errorString() << endl;
-		client()->notifyError(i18n("Error opening file: %1").arg(m_path), file.errorString(), Client::Error );
+		kdDebug(YAHOO_RAW_DEBUG) << "Error opening file: " << file.errorString().data() << endl;
+		client()->notifyError(i18n("Error opening file: %1").tqarg(m_path), file.errorString(), Client::Error );
 		return;
 	}
 
 	paket = t.serialize();
 	kdDebug(YAHOO_RAW_DEBUG) << "Sizes: File (" << m_path << "): " << file.size() << " - paket: " << paket.size() << endl;
-	TQString header = TQString::fromLatin1("POST /notifyft HTTP/1.1\r\n"
+	TQString header = TQString::tqfromLatin1("POST /notifyft HTTP/1.1\r\n"
 			"Cookie: Y=%1; T=%2; C=%3 ;\r\n"
 			"User-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\n"
 			"Host: filetransfer.msg.yahoo.com\r\n"
 			"Content-length: %4\r\n"
-			"Cache-Control: no-cache\r\n\r\n").arg(client()->yCookie()).arg(client()->tCookie()).arg(client()->cCookie()).arg(file.size()+4+paket.size());
+			"Cache-Control: no-cache\r\n\r\n").tqarg(client()->yCookie()).tqarg(client()->tCookie()).tqarg(client()->cCookie()).tqarg(file.size()+4+paket.size());
 	stream.writeRawBytes( header.local8Bit(), header.length() );
 	stream.writeRawBytes( paket.data(), paket.size() );
-	stream << (Q_INT8)0x32 << (Q_INT8)0x39 << (Q_INT8)0xc0 << (Q_INT8)0x80;
+	stream << (TQ_INT8)0x32 << (TQ_INT8)0x39 << (TQ_INT8)0xc0 << (TQ_INT8)0x80;
 	stream.writeRawBytes( file.readAll(), file.size() );
 
 	kdDebug(YAHOO_RAW_DEBUG) << "Buffersize: " << buffer.size() << endl;
@@ -163,7 +163,7 @@ void SendPictureTask::readResult()
         TQString buf( ar );
 
         m_socket->close();
-        if( buf.find( "error", 0, false ) >= 0 )
+        if( buf.tqfind( "error", 0, false ) >= 0 )
         {
                 kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << "Picture upload failed" << endl;
                 setSuccess( false );
@@ -208,11 +208,11 @@ void SendPictureTask::sendInformation()
 	setSuccess();
 }
 
-void SendPictureTask::sendStatus()
+void SendPictureTask::sendtqStatus()
 {
 	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
 
-	YMSGTransfer *t = new YMSGTransfer(Yahoo::ServicePictureStatus);
+	YMSGTransfer *t = new YMSGTransfer(Yahoo::ServicePicturetqStatus);
 	t->setId( client()->sessionID() );
 	t->setParam(3, client()->userId().local8Bit());
 	t->setParam(213, m_status );
@@ -252,7 +252,7 @@ void SendPictureTask::setChecksum( int checksum )
 	m_checksum = checksum;
 }
 
-void SendPictureTask::setStatus( int status )
+void SendPictureTask::settqStatus( int status )
 {
 	m_status = status;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h
index dc20a34c..40e80378 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h
+++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h
@@ -35,10 +35,11 @@ namespace KNetwork	{
 class SendPictureTask : public Task
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	enum Type { UploadPicture, SendChecksum, SendInformation, SendStatus };
+	enum Type { UploadPicture, SendChecksum, SendInformation, SendtqStatus };
 
-	SendPictureTask(Task *parent);
+	SendPictureTask(Task *tqparent);
 	virtual ~SendPictureTask();
 
 	virtual void onGo();
@@ -49,13 +50,13 @@ public:
 	void setFilesize( int );
 	void setPath( const TQString & );
 	void setChecksum( int );
-	void setStatus( int );
+	void settqStatus( int );
 	void setUrl( const TQString & );
 private:
 	void initiateUpload();
 	void sendChecksum();
 	void sendInformation();
-	void sendStatus();
+	void sendtqStatus();
 private slots:
 	void connectSucceeded();
 	void connectFailed( int );
diff --git a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp
index 35796666..3d0802d1 100644
--- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-StatusNotifierTask::StatusNotifierTask(Task* parent) : Task(parent)
+StatusNotifierTask::StatusNotifierTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 }
@@ -42,11 +42,11 @@ bool StatusNotifierTask::take( Transfer* transfer )
 	YMSGTransfer *t = static_cast<YMSGTransfer*>(transfer);
 
 	if( t->service() == Yahoo::ServiceStealthOffline )
-		parseStealthStatus( t );
+		parseStealthtqStatus( t );
 	else if( t->service() == Yahoo::ServiceAuthorization )
 		parseAuthorization( t );
 	else
-		parseStatus( t );
+		parsetqStatus( t );
 
 	return true;
 }
@@ -67,17 +67,17 @@ bool StatusNotifierTask::forMe( const Transfer* transfer ) const
 		t->service() == Yahoo::ServiceGameLogoff ||
 		t->service() == Yahoo::ServiceIdAct ||
 		t->service() == Yahoo::ServiceIddeAct ||
-		t->service() == Yahoo::ServiceStatus ||
+		t->service() == Yahoo::ServicetqStatus ||
 		t->service() == Yahoo::ServiceStealthOffline ||
 		t->service() == Yahoo::ServiceAuthorization ||
-		t->service() == Yahoo::ServiceBuddyStatus
+		t->service() == Yahoo::ServiceBuddytqStatus
 	)
 		return true;
 	else
 		return false;
 }
 
-void StatusNotifierTask::parseStatus( YMSGTransfer* t )
+void StatusNotifierTask::parsetqStatus( YMSGTransfer* t )
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 
@@ -87,7 +87,7 @@ void StatusNotifierTask::parseStatus( YMSGTransfer* t )
 		emit loginResponse( Yahoo::LoginDupl, TQString() );
 	}
 
-	QString	myNick;		/* key = 1 */
+	TQString	myNick;		/* key = 1 */
 	TQString customError;	/* key = 16  */
 	TQString nick;		/* key = 7  */
 	int state;		/* key = 10  */
@@ -156,14 +156,14 @@ void StatusNotifierTask::parseAuthorization( YMSGTransfer* t )
 		TQString lname = t->firstParam( 254 );
 		TQString name;
 		if( !fname.isEmpty() || !lname.isEmpty() )
-			name = TQString("%1 %2").arg(fname).arg(lname);
+			name = TQString("%1 %2").tqarg(fname).tqarg(lname);
 
 		kdDebug(YAHOO_RAW_DEBUG) << "Emitting gotAuthorizationRequest( " << nick<< ", " << msg << ", " << name << " )" << endl;
 		emit gotAuthorizationRequest( nick, msg, name );
 	}
 }
 
-void StatusNotifierTask::parseStealthStatus( YMSGTransfer* t )
+void StatusNotifierTask::parseStealthtqStatus( YMSGTransfer* t )
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 
diff --git a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h
index 0d9e1d5a..62668947 100644
--- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h
+++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h
@@ -29,20 +29,21 @@ class YMSGTransfer;
 class StatusNotifierTask : public Task
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	StatusNotifierTask(Task *parent);
+	StatusNotifierTask(Task *tqparent);
 	~StatusNotifierTask();
 	
 	bool take(Transfer *transfer);
 
 protected:
 	virtual bool forMe( const Transfer *transfer ) const;
-	void parseStatus( YMSGTransfer *transfer );
-	void parseStealthStatus( YMSGTransfer *transfer );
+	void parsetqStatus( YMSGTransfer *transfer );
+	void parseStealthtqStatus( YMSGTransfer *transfer );
 	void parseAuthorization( YMSGTransfer *transfer );
 signals:
 	void statusChanged( const TQString &nick, int state, const TQString &message, int away, int idle, int pictureChecksum );
-	void stealthStatusChanged( const TQString&, Yahoo::StealthStatus );
+	void stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus );
 	void loginResponse( int, const TQString& );
 	void authorizationAccepted( const TQString & );
 	void authorizationRejected( const TQString &, const TQString & );
diff --git a/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp b/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp
index 6eba854a..ee9bb6d3 100644
--- a/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp
@@ -21,7 +21,7 @@
 #include "client.h"
 #include <tqstring.h>
 
-StealthTask::StealthTask(Task* parent) : Task(parent)
+StealthTask::StealthTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 }
@@ -70,7 +70,7 @@ void StealthTask::setTarget( const TQString &to )
 	m_target = to;
 }
 
-void StealthTask::setState( Yahoo::StealthStatus state)
+void StealthTask::setState( Yahoo::StealthtqStatus state)
 {
 	m_state = state;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/stealthtask.h b/kopete/protocols/yahoo/libkyahoo/stealthtask.h
index 370f06bc..6a1b0b2e 100644
--- a/kopete/protocols/yahoo/libkyahoo/stealthtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/stealthtask.h
@@ -29,18 +29,18 @@ class TQString;
 class StealthTask : public Task
 {
 public:
-	StealthTask(Task *parent);
+	StealthTask(Task *tqparent);
 	~StealthTask();
 	
 	virtual void onGo();
 
 	void setTarget( const TQString &to );
-	void setState( Yahoo::StealthStatus state );
+	void setState( Yahoo::StealthtqStatus state );
 	void setMode( Yahoo::StealthMode mode );
 private:
 	TQString m_target;
 	Yahoo::StealthMode m_mode;
-	Yahoo::StealthStatus m_state;
+	Yahoo::StealthtqStatus m_state;
 };
 
 #endif
diff --git a/kopete/protocols/yahoo/libkyahoo/stream.cpp b/kopete/protocols/yahoo/libkyahoo/stream.cpp
index 82d6fe52..240a8144 100644
--- a/kopete/protocols/yahoo/libkyahoo/stream.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/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/yahoo/libkyahoo/stream.h b/kopete/protocols/yahoo/libkyahoo/stream.h
index c7f9eeae..244519f7 100644
--- a/kopete/protocols/yahoo/libkyahoo/stream.h
+++ b/kopete/protocols/yahoo/libkyahoo/stream.h
@@ -25,9 +25,10 @@
 
 class Transfer;
 
-class Stream : public QObject
+class Stream : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	enum Error { ErrParse, ErrProtocol, ErrStream, ErrCustom = 10 };
 	enum StreamCond
@@ -43,7 +44,7 @@ public:
 		SystemShutdown
 	};
 
-	Stream(TQObject *parent=0);
+	Stream(TQObject *tqparent=0);
 	virtual ~Stream();
 
 	virtual void close()=0;
diff --git a/kopete/protocols/yahoo/libkyahoo/task.cpp b/kopete/protocols/yahoo/libkyahoo/task.cpp
index b604219b..c17568ee 100644
--- a/kopete/protocols/yahoo/libkyahoo/task.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/task.cpp
@@ -40,22 +40,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()));
 }
 
@@ -75,9 +75,9 @@ void Task::init()
 	d->transfer = 0;
 }
 
-Task *Task::parent() const
+Task *Task::tqparent() const
 {
-	return (Task *)TQObject::parent();
+	return (Task *)TQObject::tqparent();
 }
 
 Client *Task::client() const
@@ -124,12 +124,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)
 	{
@@ -252,7 +252,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/yahoo/libkyahoo/task.h b/kopete/protocols/yahoo/libkyahoo/task.h
index c977f3bc..fcdaf9ef 100644
--- a/kopete/protocols/yahoo/libkyahoo/task.h
+++ b/kopete/protocols/yahoo/libkyahoo/task.h
@@ -27,16 +27,17 @@ class TQString;
 class Client;
 class Transfer;
 
-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/yahoo/libkyahoo/tests/clientstream_test.cpp b/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp
index efcd63cf..6d8d9e0d 100644
--- a/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp
@@ -30,7 +30,7 @@ ClientStreamTest::~ClientStreamTest()
 
 void ClientStreamTest::slotDoTest()
 {
-	TQString server = TQString::fromLatin1("scs.msg.yahoo.com");
+	TQString server = TQString::tqfromLatin1("scs.msg.yahoo.com");
 	// connect to server
 	kdDebug(14180) << k_funcinfo << " connecting to server" << endl;
 	myTestObject->connectToServer( server, true ); // fine up to here...
diff --git a/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.h b/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.h
index 8842fcc2..e09c89bb 100644
--- a/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.h
+++ b/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.h
@@ -19,11 +19,12 @@
 
 #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/yahoo/libkyahoo/tests/logintest.cpp b/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp
index 5e9b04a5..ecf96906 100644
--- a/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp
@@ -46,7 +46,7 @@ LoginTest::~LoginTest()
 
 void LoginTest::slotDoTest()
 {
-	TQString server = TQString::fromLatin1("scs.msg.yahoo.com");
+	TQString server = TQString::tqfromLatin1("scs.msg.yahoo.com");
 	// connect to server
 	kdDebug(14180) << k_funcinfo << " connecting to server" << endl;
 	
diff --git a/kopete/protocols/yahoo/libkyahoo/tests/logintest.h b/kopete/protocols/yahoo/libkyahoo/tests/logintest.h
index 68a40b24..1fd43976 100644
--- a/kopete/protocols/yahoo/libkyahoo/tests/logintest.h
+++ b/kopete/protocols/yahoo/libkyahoo/tests/logintest.h
@@ -32,11 +32,12 @@
 
 #include "coreprotocol.h"
 
-#define QT_FATAL_ASSERT 1
+#define TQT_FATAL_ASSERT 1
 
-class LoginTest : public QApplication
+class LoginTest : public TQApplication
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	LoginTest(int argc, char ** argv);
 	
diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
index 2ad978f2..41d5019d 100644
--- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
@@ -33,7 +33,7 @@
 
 using namespace KNetwork;
 
-WebcamTask::WebcamTask(Task* parent) : Task(parent)
+WebcamTask::WebcamTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 	transmittingData = false;
@@ -94,7 +94,7 @@ void WebcamTask::parseWebcamInformation( YMSGTransfer *t )
 	info.sender = keyPending;
 	info.server = t->firstParam( 102 );
 	info.key = t->firstParam( 61 );
-	info.status = InitialStatus;
+	info.status = InitialtqStatus;
 	info.dataLength = 0;
 	info.buffer = 0L;
 	info.headerRead = false;
@@ -135,7 +135,7 @@ void WebcamTask::slotConnectionStage1Established()
 	if( socketMap[socket].direction == Incoming )
 	{
 		socket->writeBlock( TQCString("<RVWCFG>").data(), 8 );
-		s = TQString("g=%1\r\n").arg(socketMap[socket].sender);
+		s = TQString("g=%1\r\n").tqarg(socketMap[socket].sender);
 	}
 	else
 	{
@@ -144,7 +144,7 @@ void WebcamTask::slotConnectionStage1Established()
 	}
 
 	// Header: 08 00 01 00 00 00 00
-	stream << (Q_INT8)0x08 << (Q_INT8)0x00 << (Q_INT8)0x01 << (Q_INT8)0x00 << (Q_INT32)s.length();
+	stream << (TQ_INT8)0x08 << (TQ_INT8)0x00 << (TQ_INT8)0x01 << (TQ_INT8)0x00 << (TQ_INT32)s.length();
 	stream.writeRawBytes( s.local8Bit(), s.length() );
 
 	socket->writeBlock( buffer.data(), buffer.size() );
@@ -168,24 +168,24 @@ void WebcamTask::slotConnectionStage2Established()
 
 	if( socketMap[socket].direction == Incoming )
 	{
-		// Send <REQIMG>-Packet
-		socket->writeBlock( TQCString("<REQIMG>").data(), 8 );
+		// Send <RETQIMG>-Packet
+		socket->writeBlock( TQCString("<RETQIMG>").data(), 8 );
 		// Send request information
 		s = TQString("a=2\r\nc=us\r\ne=21\r\nu=%1\r\nt=%2\r\ni=\r\ng=%3\r\no=w-2-5-1\r\np=1")
-			.arg(client()->userId()).arg(socketMap[socket].key).arg(socketMap[socket].sender);
+			.tqarg(client()->userId()).tqarg(socketMap[socket].key).tqarg(socketMap[socket].sender);
 		// Header: 08 00 01 00 00 00 00
-		stream << (Q_INT8)0x08 << (Q_INT8)0x00 << (Q_INT8)0x01 << (Q_INT8)0x00 << (Q_INT32)s.length();
+		stream << (TQ_INT8)0x08 << (TQ_INT8)0x00 << (TQ_INT8)0x01 << (TQ_INT8)0x00 << (TQ_INT32)s.length();
 	}
 	else
 	{
-		// Send <REQIMG>-Packet
+		// Send <RETQIMG>-Packet
 		socket->writeBlock( TQCString("<SNDIMG>").data(), 8 );
 		// Send request information
 		s = TQString("a=2\r\nc=us\r\nu=%1\r\nt=%2\r\ni=%3\r\no=w-2-5-1\r\np=2\r\nb=KopeteWebcam\r\nd=\r\n")
-		.arg(client()->userId()).arg(socketMap[socket].key).arg(socket->localAddress().nodeName());
+		.tqarg(client()->userId()).tqarg(socketMap[socket].key).tqarg(socket->localAddress().nodeName());
 		// Header: 08 00 05 00 00 00 00	01 00 00 00 01
-		stream << (Q_INT8)0x0d << (Q_INT8)0x00 << (Q_INT8)0x05 << (Q_INT8)0x00 << (Q_INT32)s.length()
-			<< (Q_INT8)0x01 << (Q_INT8)0x00 << (Q_INT8)0x00 << (Q_INT8)0x00 << (Q_INT8)0x01;
+		stream << (TQ_INT8)0x0d << (TQ_INT8)0x00 << (TQ_INT8)0x05 << (TQ_INT8)0x00 << (TQ_INT32)s.length()
+			<< (TQ_INT8)0x01 << (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x01;
 	}
 
 	socket->writeBlock( buffer.data(), buffer.size() );
@@ -195,9 +195,9 @@ void WebcamTask::slotConnectionStage2Established()
 void WebcamTask::slotConnectionFailed( int error )
 {
 	KStreamSocket* socket = const_cast<KStreamSocket*>( dynamic_cast<const KStreamSocket*>( sender() ) );
-	kdDebug(YAHOO_RAW_DEBUG) << "Webcam connection to the user " << socketMap[socket].sender << " failed. Error " << error << " - " << socket->errorString() << endl;
+	kdDebug(YAHOO_RAW_DEBUG) << "Webcam connection to the user " << socketMap[socket].sender << " failed. Error " << error << " - " << socket->KSocketBase::errorString() << endl;
         client()->notifyError( i18n("Webcam connection to the user %1 could not be established.\n\nPlease relogin and try again.")
-                        .arg(socketMap[socket].sender), TQString("%1 - %2").arg(error).arg( socket->errorString()), Client::Error );
+                        .tqarg(socketMap[socket].sender), TQString("%1 - %2").tqarg(error).tqarg( socket->KSocketBase::errorString()), Client::Error );
         socketMap.remove( socket );
         socket->deleteLater();
 }
@@ -237,12 +237,12 @@ void WebcamTask::connectStage2( KStreamSocket *socket )
 	KStreamSocket *newSocket;
 	switch( (const char)data[2] )
 	{
-	case (Q_INT8)0x06:
+	case (TQ_INT8)0x06:
 		emit webcamNotAvailable(socketMap[socket].sender);
 		break;
-	case (Q_INT8)0x04:
-	case (Q_INT8)0x07:
-		while( (const char)data[i] != (Q_INT8)0x00 )
+	case (TQ_INT8)0x04:
+	case (TQ_INT8)0x07:
+		while( (const char)data[i] != (TQ_INT8)0x00 )
 			server += data[i++];
 		kdDebug(YAHOO_RAW_DEBUG) << "Server:" << server << endl;
 		if( server.isEmpty() )
@@ -355,7 +355,7 @@ void WebcamTask::parseData( TQByteArray &data, KStreamSocket *socket )
 					// Send Invitation packets
 					for(it = pendingInvitations.begin(); it != pendingInvitations.end(); it++)
 					{
-						SendNotifyTask *snt = new SendNotifyTask( parent() );
+						SendNotifyTask *snt = new SendNotifyTask( tqparent() );
 						snt->setTarget( *it );
 						snt->setType( SendNotifyTask::NotifyWebcamInvite );
 						snt->go( true );
@@ -425,9 +425,9 @@ void WebcamTask::parseData( TQByteArray &data, KStreamSocket *socket )
 		case UserRequest:
 			{
 			who.append( info->buffer->buffer() );
-			who = who.mid( 2, who.find('\n') - 3);
-			kdDebug(YAHOO_RAW_DEBUG) << "User wants to view webcam: " << who << " len: " << who.length() << " Index: " << accessGranted.findIndex( who ) << endl;
-			if( accessGranted.findIndex( who ) >= 0 )
+			who = who.mid( 2, who.tqfind('\n') - 3);
+			kdDebug(YAHOO_RAW_DEBUG) << "User wants to view webcam: " << who << " len: " << who.length() << " Index: " << accessGranted.tqfindIndex( who ) << endl;
+			if( accessGranted.tqfindIndex( who ) >= 0 )
 			{
 				grantAccess( who );
 			}
@@ -579,10 +579,10 @@ void WebcamTask::grantAccess( const TQString &userId )
 	}
 	TQByteArray ar;
 	TQDataStream stream( ar, IO_WriteOnly );
-	TQString user = TQString("u=%1").arg(userId);
+	TQString user = TQString("u=%1").tqarg(userId);
 
-	stream << (Q_INT8)0x0d << (Q_INT8)0x00 << (Q_INT8)0x05 << (Q_INT8)0x00 << (Q_INT32)user.length()
-	<< (Q_INT8)0x00 << (Q_INT8)0x00 << (Q_INT8)0x00 << (Q_INT8)0x00 << (Q_INT8)0x01;
+	stream << (TQ_INT8)0x0d << (TQ_INT8)0x00 << (TQ_INT8)0x05 << (TQ_INT8)0x00 << (TQ_INT32)user.length()
+	<< (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x01;
 	socket->writeBlock( ar.data(), ar.size() );
         socket->writeBlock( user.local8Bit(), user.length() );
 }
@@ -689,8 +689,8 @@ void WebcamTask::transmitWebcamImage()
 	socket->enableWrite( false );
 	TQByteArray buffer;
 	TQDataStream stream( buffer, IO_WriteOnly );
-	stream << (Q_INT8)0x0d << (Q_INT8)0x00 << (Q_INT8)0x05 << (Q_INT8)0x00 << (Q_INT32)pictureBuffer.size()
-			<< (Q_INT8)0x02 << (Q_INT32)timestamp++;
+	stream << (TQ_INT8)0x0d << (TQ_INT8)0x00 << (TQ_INT8)0x05 << (TQ_INT8)0x00 << (TQ_INT32)pictureBuffer.size()
+			<< (TQ_INT8)0x02 << (TQ_INT32)timestamp++;
 	socket->writeBlock( buffer.data(), buffer.size() );
 	if( pictureBuffer.size() )
 		socket->writeBlock( pictureBuffer.data(), pictureBuffer.size() );
diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.h b/kopete/protocols/yahoo/libkyahoo/webcamtask.h
index 7c232642..db3756ff 100644
--- a/kopete/protocols/yahoo/libkyahoo/webcamtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.h
@@ -30,21 +30,21 @@ namespace KNetwork {
 }
 using namespace KNetwork;
 
-enum ConnectionStatus{ InitialStatus, ConnectedStage1, ConnectedStage2, Receiving, Sending, SendingEmpty };
+enum ConnectiontqStatus{ InitialtqStatus, ConnectedStage1, ConnectedStage2, Receiving, Sending, SendingEmpty };
 enum PacketType { Image, ConnectionClosed, UserRequest, NewWatcher, WatcherLeft };
 enum Direction { Incoming, Outgoing };
 
 struct YahooWebcamInformation
 {
-	QString		sender;
-	QString		server;
-	QString		key;
-	ConnectionStatus status;
+	TQString		sender;
+	TQString		server;
+	TQString		key;
+	ConnectiontqStatus status;
 	PacketType	type;
 	Direction	direction;
 	uchar		reason;
-	Q_INT32		dataLength;
-	Q_INT32		timestamp;
+	TQ_INT32		dataLength;
+	TQ_INT32		timestamp;
 	bool		headerRead;
 	TQBuffer 	*buffer;
 };
@@ -57,8 +57,9 @@ typedef TQMap< KStreamSocket *, YahooWebcamInformation > SocketInfoMap;
 class WebcamTask : public Task
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	WebcamTask(Task *parent);
+	WebcamTask(Task *tqparent);
 	~WebcamTask();
 
 	bool take(Transfer *transfer);
diff --git a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp
index b9a4d72b..cee71da6 100644
--- a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp
@@ -16,7 +16,7 @@
 
 #include "yabentry.h"
 
-void YABEntry::fromQDomElement( const TQDomElement &e )
+void YABEntry::fromTQDomElement( const TQDomElement &e )
 {
 	yahooId = e.attribute("yi");
 	YABId = e.attribute("id", "-1").toInt();
@@ -36,13 +36,13 @@ void YABEntry::fromQDomElement( const TQDomElement &e )
 	privateURL = e.attribute("pu");
 	title = e.attribute("ti");
 	corporation = e.attribute("co");
-	workAdress = e.attribute("wa").replace( "&#xd;&#xa;", "\n" );
+	workAdress = e.attribute("wa").tqreplace( "&#xd;&#xa;", "\n" );
 	workCity = e.attribute("wc");
 	workState = e.attribute("ws");
 	workZIP = e.attribute("wz");
 	workCountry = e.attribute("wn");
 	workURL = e.attribute("wu");
-	privateAdress = e.attribute("ha").replace( "&#xd;&#xa;", "\n" );
+	privateAdress = e.attribute("ha").tqreplace( "&#xd;&#xa;", "\n" );
 	privateCity = e.attribute("hc");
 	privateState = e.attribute("hs");
 	privateZIP = e.attribute("hz");
@@ -55,7 +55,7 @@ void YABEntry::fromQDomElement( const TQDomElement &e )
 	additional2 = e.attribute("c2");
 	additional3 = e.attribute("c3");
 	additional4 = e.attribute("c4");
-	notes = e.attribute("cm").replace( "&#xd;&#xa;", "\n" );
+	notes = e.attribute("cm").tqreplace( "&#xd;&#xa;", "\n" );
 	imAIM = e.attribute("ima");
 	imGoogleTalk = e.attribute("img");
 	imICQ = e.attribute("imq");
@@ -65,7 +65,7 @@ void YABEntry::fromQDomElement( const TQDomElement &e )
 	imSkype = e.attribute("imk");
 }
 
-void YABEntry::fromQDomDocument( const TQDomDocument &d )
+void YABEntry::fromTQDomDocument( const TQDomDocument &d )
 {
 	kdDebug() << d.toString() <<
 		d.elementsByTagName("yi").item(0).toElement().text() << endl;
@@ -86,13 +86,13 @@ void YABEntry::fromQDomDocument( const TQDomDocument &d )
 	privateURL = d.elementsByTagName("pu").item(0).toElement().text();
 	title = d.elementsByTagName("ti").item(0).toElement().text();
 	corporation = d.elementsByTagName("co").item(0).toElement().text();
-	workAdress = d.elementsByTagName("wa").item(0).toElement().text().replace( "&#xd;&#xa;", "\n" );
+	workAdress = d.elementsByTagName("wa").item(0).toElement().text().tqreplace( "&#xd;&#xa;", "\n" );
 	workCity = d.elementsByTagName("wc").item(0).toElement().text();
 	workState = d.elementsByTagName("ws").item(0).toElement().text();
 	workZIP = d.elementsByTagName("wz").item(0).toElement().text();
 	workCountry = d.elementsByTagName("wn").item(0).toElement().text();
 	workURL = d.elementsByTagName("wu").item(0).toElement().text();
-	privateAdress = d.elementsByTagName("ha").item(0).toElement().text().replace( "&#xd;&#xa;", "\n" );
+	privateAdress = d.elementsByTagName("ha").item(0).toElement().text().tqreplace( "&#xd;&#xa;", "\n" );
 	privateCity = d.elementsByTagName("hc").item(0).toElement().text();
 	privateState = d.elementsByTagName("hs").item(0).toElement().text();
 	privateZIP = d.elementsByTagName("hz").item(0).toElement().text();
@@ -105,7 +105,7 @@ void YABEntry::fromQDomDocument( const TQDomDocument &d )
 	additional2 = d.elementsByTagName("c2").item(0).toElement().text();
 	additional3 = d.elementsByTagName("c3").item(0).toElement().text();
 	additional4 = d.elementsByTagName("c4").item(0).toElement().text();
-	notes = d.elementsByTagName("cm").item(0).toElement().text().replace( "&#xd;&#xa;", "\n" );
+	notes = d.elementsByTagName("cm").item(0).toElement().text().tqreplace( "&#xd;&#xa;", "\n" );
 	imAIM = d.elementsByTagName("ima").item(0).toElement().text();
 	imGoogleTalk = d.elementsByTagName("img").item(0).toElement().text();
 	imICQ = d.elementsByTagName("imq").item(0).toElement().text();
@@ -115,7 +115,7 @@ void YABEntry::fromQDomDocument( const TQDomDocument &d )
 	imSkype = d.elementsByTagName("imk").item(0).toElement().text();
 }
 
-void YABEntry::fillQDomElement( TQDomElement &e ) const
+void YABEntry::fillTQDomElement( TQDomElement &e ) const
 {
 	e.setAttribute( "yi", yahooId );
 	e.setAttribute( "id", YABId );
@@ -135,24 +135,24 @@ void YABEntry::fillQDomElement( TQDomElement &e ) const
 	e.setAttribute( "pu", privateURL );
 	e.setAttribute( "ti", title );
 	e.setAttribute( "co", corporation );
-	e.setAttribute( "wa", TQString( workAdress ).replace( '\n', "&#xd;&#xa;" ) );
+	e.setAttribute( "wa", TQString( workAdress ).tqreplace( '\n', "&#xd;&#xa;" ) );
 	e.setAttribute( "wc", workCity );
 	e.setAttribute( "ws", workState );
 	e.setAttribute( "wz", workZIP );
 	e.setAttribute( "wn", workCountry );
 	e.setAttribute( "wu", workURL );
-	e.setAttribute( "ha", TQString( privateAdress ).replace( '\n', "&#xd;&#xa;" ) );
+	e.setAttribute( "ha", TQString( privateAdress ).tqreplace( '\n', "&#xd;&#xa;" ) );
 	e.setAttribute( "hc", privateCity );
 	e.setAttribute( "hs", privateState );
 	e.setAttribute( "hz", privateZIP );
 	e.setAttribute( "hn", privateCountry );
-	e.setAttribute( "bi", TQString("%1/%2/%3").arg( birthday.day() ).arg( birthday.month() ).arg( birthday.year() ) );
-	e.setAttribute( "an", TQString("%1/%2/%3").arg( anniversary.day() ).arg( anniversary.month() ).arg( anniversary.year() ) );
+	e.setAttribute( "bi", TQString("%1/%2/%3").tqarg( birthday.day() ).tqarg( birthday.month() ).tqarg( birthday.year() ) );
+	e.setAttribute( "an", TQString("%1/%2/%3").tqarg( anniversary.day() ).tqarg( anniversary.month() ).tqarg( anniversary.year() ) );
 	e.setAttribute( "c1", additional1 );
 	e.setAttribute( "c2", additional2 );
 	e.setAttribute( "c3", additional3 );
 	e.setAttribute( "c4", additional4 );
-	e.setAttribute( "cm", TQString( notes ).replace( '\n', "&#xd;&#xa;" ) );
+	e.setAttribute( "cm", TQString( notes ).tqreplace( '\n', "&#xd;&#xa;" ) );
 	e.setAttribute( "ima", imAIM );
 	e.setAttribute( "img", imGoogleTalk );
 	e.setAttribute( "imq", imICQ );
@@ -191,8 +191,8 @@ void YABEntry::dump() const
 		"workZIP: " << workZIP << endl <<
 		"workCountry: " << workCountry << endl <<
 		"workURL: " << workURL << endl <<
-		"birthday: " << birthday.toString() << endl <<
-		"anniversary: " << anniversary.toString() << endl <<
+		"birthday: " << TQString(birthday.toString()) << endl <<
+		"anniversary: " << TQString(anniversary.toString()) << endl <<
 		"notes: " << notes << endl <<
 		"additional1: " << additional1 << endl <<
 		"additional2: " << additional2 << endl <<
diff --git a/kopete/protocols/yahoo/libkyahoo/yabentry.h b/kopete/protocols/yahoo/libkyahoo/yabentry.h
index 35620911..14cacef8 100644
--- a/kopete/protocols/yahoo/libkyahoo/yabentry.h
+++ b/kopete/protocols/yahoo/libkyahoo/yabentry.h
@@ -25,65 +25,65 @@ struct YABEntry
 	enum Source { SourceYAB, SourceContact };
 
 	// Personal
-	QString		firstName;
-	QString		secondName;
-	QString		lastName;
-	QString		nickName;
-	QString		title;
+	TQString		firstName;
+	TQString		secondName;
+	TQString		lastName;
+	TQString		nickName;
+	TQString		title;
 
 	// Primary Information	
-	QString		phoneMobile;
-	QString		email;
-	QString		yahooId;
+	TQString		phoneMobile;
+	TQString		email;
+	TQString		yahooId;
 	int		YABId;
 	Source		source;
 
 	// Additional Information
-	QString		pager;
-	QString		fax;
-	QString		additionalNumber;
-	QString		altEmail1;
-	QString		altEmail2;
-	QString		imAIM;
-	QString		imICQ;
-	QString		imMSN;
-	QString		imGoogleTalk;
-	QString		imSkype;
-	QString		imIRC;
-	QString		imQQ;
+	TQString		pager;
+	TQString		fax;
+	TQString		additionalNumber;
+	TQString		altEmail1;
+	TQString		altEmail2;
+	TQString		imAIM;
+	TQString		imICQ;
+	TQString		imMSN;
+	TQString		imGoogleTalk;
+	TQString		imSkype;
+	TQString		imIRC;
+	TQString		imQQ;
 
 	// Private Information
-	QString		privateAdress;
-	QString		privateCity;
-	QString		privateState;
-	QString		privateZIP;
-	QString		privateCountry;
-	QString		privatePhone;
-	QString		privateURL;
+	TQString		privateAdress;
+	TQString		privateCity;
+	TQString		privateState;
+	TQString		privateZIP;
+	TQString		privateCountry;
+	TQString		privatePhone;
+	TQString		privateURL;
 		
 	// Work Information
-	QString		corporation;
-	QString		workAdress;
-	QString		workCity;
-	QString		workState;
-	QString		workZIP;
-	QString		workCountry;
-	QString		workPhone;
-	QString		workURL;
+	TQString		corporation;
+	TQString		workAdress;
+	TQString		workCity;
+	TQString		workState;
+	TQString		workZIP;
+	TQString		workCountry;
+	TQString		workPhone;
+	TQString		workURL;
 
 	// Miscellaneous
-	QDate		birthday;
-	QDate		anniversary;
-	QString		notes;
-	QString		additional1;
-	QString		additional2;
-	QString		additional3;
-	QString		additional4;
+	TQDate		birthday;
+	TQDate		anniversary;
+	TQString		notes;
+	TQString		additional1;
+	TQString		additional2;
+	TQString		additional3;
+	TQString		additional4;
 
 	
-	void fromQDomElement( const TQDomElement &e );
-	void fromQDomDocument( const TQDomDocument &e );
-	void fillQDomElement( TQDomElement &e ) const;
+	void fromTQDomElement( const TQDomElement &e );
+	void fromTQDomDocument( const TQDomDocument &e );
+	void fillTQDomElement( TQDomElement &e ) const;
 
 	void dump() const;
 };
diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
index 1066640e..be274230 100644
--- a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
@@ -27,7 +27,7 @@
 #include <kio/jobclasses.h>
 #include <klocale.h>
 
-YABTask::YABTask(Task* parent) : Task(parent)
+YABTask::YABTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 }
@@ -82,7 +82,7 @@ void YABTask::parseContactDetails( YMSGTransfer* t )
 		TQDomDocument doc;
 		doc.setContent( s );
 		YABEntry *entry = new YABEntry;
-		entry->fromQDomDocument( doc );
+		entry->fromTQDomDocument( doc );
 		entry->source = YABEntry::SourceContact;
 		entry->dump();
 		emit gotEntry( entry );
@@ -93,14 +93,14 @@ void YABTask::parseContactDetails( YMSGTransfer* t )
 void YABTask::getAllEntries( long lastMerge, long lastRemoteRevision )
 {
 	kdDebug(YAHOO_RAW_DEBUG) << "LastMerge: " << lastMerge << " LastRemoteRevision: " << lastRemoteRevision << endl;
-	m_data = TQString::null;
-	TQString url = TQString::fromLatin1("http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&diffs=1&t=%1&tags=short&rt=%2&prog-ver=%3")
-		.arg( lastMerge ).arg( lastRemoteRevision ).arg( YMSG_PROGRAM_VERSION_STRING );
+	m_data = TQString();
+	TQString url = TQString::tqfromLatin1("http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&diffs=1&t=%1&tags=short&rt=%2&prog-ver=%3")
+		.tqarg( lastMerge ).tqarg( lastRemoteRevision ).tqarg( YMSG_PROGRAM_VERSION_STRING );
 
 	m_transferJob = KIO::get( url , false, false );
 	m_transferJob->addMetaData("cookies", "manual");
-	m_transferJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: Y=%1; T=%2; C=%3;")
-				.arg(client()->yCookie()).arg(client()->tCookie()).arg(client()->cCookie()) );
+	m_transferJob->addMetaData("setcookies", TQString::tqfromLatin1("Cookie: Y=%1; T=%2; C=%3;")
+				.tqarg(client()->yCookie()).tqarg(client()->tCookie()).tqarg(client()->cCookie()) );
 	connect( m_transferJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray & ) ) );
 	connect( m_transferJob, TQT_SIGNAL( result( KIO::Job *) ), this, TQT_SLOT( slotResult( KIO::Job* ) ) );
 }
@@ -149,7 +149,7 @@ void YABTask::slotResult( KIO::Job* job )
 			e = list.item( it ).toElement();
 
 			YABEntry *entry = new YABEntry;
-			entry->fromQDomElement( e );
+			entry->fromTQDomElement( e );
 			entry->source = YABEntry::SourceYAB;
 			emit gotEntry( entry );
 		}
diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.h b/kopete/protocols/yahoo/libkyahoo/yabtask.h
index 3086a01a..16620fcd 100644
--- a/kopete/protocols/yahoo/libkyahoo/yabtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/yabtask.h
@@ -34,8 +34,9 @@ namespace KIO	{
 class YABTask : public Task
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	YABTask(Task *parent);
+	YABTask(Task *tqparent);
 	~YABTask();
 
 	bool take(Transfer *transfer);
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
index 025386f0..81b2f53e 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
@@ -45,8 +45,8 @@ void YahooBuddyIconLoader::fetchBuddyIcon( const TQString &who, KURL url, int ch
 	kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << url << endl;
 	KIO::TransferJob *transfer;
 	TQString Url = url.url();
-	TQString ext = Url.left( Url.findRev( "?" ) );
-	ext = ext.right( ext.length() - ext.findRev( "." ) );
+	TQString ext = Url.left( Url.tqfindRev( "?" ) );
+	ext = ext.right( ext.length() - ext.tqfindRev( "." ) );
 
 	transfer = KIO::get( url, false, false );
 	connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotComplete( KIO::Job* ) ) );
@@ -81,7 +81,7 @@ void YahooBuddyIconLoader::slotComplete( KIO::Job *job )
 	{
 		kdDebug(YAHOO_RAW_DEBUG) << "An error occurred while downloading buddy icon." << endl;
 		if( m_client )
-			m_client->notifyError( i18n( "An error occurred while downloading a buddy icon (%1)").arg( m_jobs[transfer].url.url() ), job->errorString(), Client::Info );
+			m_client->notifyError( i18n( "An error occurred while downloading a buddy icon (%1)").tqarg( m_jobs[transfer].url.url() ), job->errorString(), Client::Info );
 	}
 	else
 	{
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h
index f200725d..4726f1ec 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h
+++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h
@@ -45,9 +45,10 @@ struct IconLoadJob {
  * If the download was succesfull it emits a signal with a pointer
  * to the temporary file, the icon was stored at
  */
-class YahooBuddyIconLoader : public QObject
+class YahooBuddyIconLoader : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	YahooBuddyIconLoader( Client *c );
 	~YahooBuddyIconLoader();
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp
index 028396c2..ed673c2f 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp
@@ -22,8 +22,8 @@
 
 #include "yahoobytestream.h"
 
-KNetworkByteStream::KNetworkByteStream( TQObject *parent )
- : ByteStream ( parent )
+KNetworkByteStream::KNetworkByteStream( TQObject *tqparent )
+ : ByteStream ( tqparent )
 {
 	kdDebug( 14181 ) << "Instantiating new KNetwork byte stream." << endl;
 
@@ -99,7 +99,7 @@ void KNetworkByteStream::slotConnectionClosed()
 	if ( mClosing )
 	{
 		kdDebug( 14181 ) << "..by ourselves!" << endl;
-		kdDebug( 14181 ) << "socket error is " << socket()->errorString() << endl;
+		kdDebug( 14181 ) << "socket error is " << socket()->KSocketBase::errorString() << endl;
 		emit connectionClosed ();
 	}
 	else
@@ -138,4 +138,4 @@ void KNetworkByteStream::slotError( int code )
 
 #include "yahoobytestream.moc"
 
-// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;
+// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off;
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h
index 5f7f0206..4ed96d3a 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h
+++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h
@@ -32,9 +32,10 @@ class KNetworkByteStream : public ByteStream
 {
 
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-	KNetworkByteStream ( TQObject *parent = 0 );
+	KNetworkByteStream ( TQObject *tqparent = 0 );
 
 	~KNetworkByteStream ();
 
@@ -65,4 +66,4 @@ private:
 
 #endif // YAHOOBYTESTREAM_H
 
-// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;
+// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off;
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
index 1c9528ff..3f3af310 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
@@ -27,7 +27,7 @@
 #include <kio/jobclasses.h>
 #include <tqdom.h>
 
-YahooChatTask::YahooChatTask(Task* parent) : Task(parent)
+YahooChatTask::YahooChatTask(Task* tqparent) : Task(tqparent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 	m_loggedIn = false;
@@ -95,7 +95,7 @@ void YahooChatTask::getYahooChatCategories()
 	transfer->addMetaData( "UserAgent", "Mozilla/4.0 (compatible; MSIE 5.5)");
 	transfer->addMetaData( "no-cache", "true" );
 	transfer->addMetaData( "cookies", "manual" );
-	transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").arg(client()->tCookie(), client()->yCookie()) );
+	transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").tqarg(client()->tCookie(), client()->yCookie()) );
 
 
 	connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotCategoriesComplete( KIO::Job* ) ) );
@@ -107,11 +107,11 @@ void YahooChatTask::getYahooChatRooms( const Yahoo::ChatCategory &category )
 	kdDebug(YAHOO_RAW_DEBUG) << "Category Id: " << category.id << endl;
 	KIO::TransferJob *transfer;
 
-	transfer = KIO::get( KURL(TQString("http://insider.msg.yahoo.com/ycontent/?chatroom_%1=0").arg( category.id )), false, false );
+	transfer = KIO::get( KURL(TQString("http://insider.msg.yahoo.com/ycontent/?chatroom_%1=0").tqarg( category.id )), false, false );
 	transfer->addMetaData( "UserAgent", "Mozilla/4.0 (compatible; MSIE 5.5)");
 	transfer->addMetaData( "no-cache", "true" );
 	transfer->addMetaData( "cookies", "manual" );
-	transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").arg(client()->tCookie(), client()->yCookie()) );
+	transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").tqarg(client()->tCookie(), client()->yCookie()) );
 
 
 	connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotChatRoomsComplete( KIO::Job* ) ) );
@@ -214,7 +214,7 @@ void YahooChatTask::login()
 	YMSGTransfer *t = new YMSGTransfer(Yahoo::ServiceChatOnline);
 	t->setId( client()->sessionID() );
 	t->setParam( 1, client()->userId().local8Bit() );
-	t->setParam( 135, TQString("ym%1").arg(YMSG_PROGRAM_VERSION_STRING).local8Bit() );
+	t->setParam( 135, TQString("ym%1").tqarg(YMSG_PROGRAM_VERSION_STRING).local8Bit() );
 
 	send( t );
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.h b/kopete/protocols/yahoo/libkyahoo/yahoochattask.h
index 94101d33..ef20a815 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.h
+++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.h
@@ -41,8 +41,9 @@ struct YahooChatJob {
 class YahooChatTask : public Task
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	YahooChatTask(Task *parent);
+	YahooChatTask(Task *tqparent);
 	virtual ~YahooChatTask();
 
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp
index 34eb649e..45716e35 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp
@@ -58,9 +58,9 @@ public:
 		conn = 0;
 		bs = 0;
 
-		username = TQString::null;
-		password = TQString::null;
-		server = TQString::null;
+		username = TQString();
+		password = TQString();
+		server = TQString();
 		haveLocalAddr = false;
 		doBinding = true;
 
@@ -79,7 +79,7 @@ public:
 	bool doAuth; //send the initial login sequences to get the cookie
 	bool haveLocalAddr;
 	TQHostAddress localAddr;
-	Q_UINT16 localPort;
+	TQ_UINT16 localPort;
 	bool doBinding;
 
 	Connector *conn;
@@ -102,8 +102,8 @@ public:
 	int noop_time;
 };
 
-ClientStream::ClientStream(Connector *conn, TQObject *parent)
-:Stream(parent), d(new Private())
+ClientStream::ClientStream(Connector *conn, TQObject *tqparent)
+:Stream(tqparent), d(new Private())
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 
@@ -203,7 +203,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;
@@ -256,7 +256,7 @@ void ClientStream::write( Transfer *request )
 void cs_dump( const TQByteArray &bytes )
 {
 #if 0
-	qDebug( "contains: %i bytes ", bytes.count() );
+	qDebug( "tqcontains: %i bytes ", bytes.count() );
 	uint count = 0;
 	while ( count < bytes.count() )
 	{
diff --git a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.h b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.h
index 89a116fd..bc56eafd 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.h
+++ b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.h
@@ -32,6 +32,7 @@ class Transfer;
 class ClientStream : public Stream
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	enum Error {
 		ErrConnection = ErrCustom,  // Connection error, ask Connector-subclass what's up
@@ -71,7 +72,7 @@ public:
 		BindConflict                // resource in-use
 	};
 
-	explicit ClientStream(Connector *conn, TQObject *parent=0);
+	explicit ClientStream(Connector *conn, TQObject *tqparent=0);
 	~ClientStream();
 
 	void connectToServer(const TQString& server, bool auth=true);
@@ -83,7 +84,7 @@ public:
 	void setUsername(const TQString &s);
 	void setPassword(const TQString &s);
 
-	void setLocalAddr(const TQHostAddress &addr, Q_UINT16 port);
+	void setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port);
 
 	void close();
 
@@ -152,7 +153,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/yahoo/libkyahoo/yahooconnector.cpp b/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp
index 9b7c8d8a..0e0f8436 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp
@@ -25,8 +25,8 @@
 #include "yahoobytestream.h"
 #include "yahootypes.h"
 
-KNetworkConnector::KNetworkConnector( TQObject *parent )
-		: Connector( parent )
+KNetworkConnector::KNetworkConnector( TQObject *tqparent )
+		: Connector( tqparent )
 {
 	kdDebug( YAHOO_RAW_DEBUG ) << "New KNetwork connector." << endl;
 
@@ -97,7 +97,7 @@ void KNetworkConnector::done()
 	mByteStream->close ();
 }
 
-void KNetworkConnector::setOptHostPort( const TQString &host, Q_UINT16 port )
+void KNetworkConnector::setOptHostPort( const TQString &host, TQ_UINT16 port )
 {
 	kdDebug ( YAHOO_RAW_DEBUG ) << "Manually specifying host " << host << " and port " << port << endl;
 
@@ -108,4 +108,4 @@ void KNetworkConnector::setOptHostPort( const TQString &host, Q_UINT16 port )
 
 #include "yahooconnector.moc"
 
-// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;
+// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off;
diff --git a/kopete/protocols/yahoo/libkyahoo/yahooconnector.h b/kopete/protocols/yahoo/libkyahoo/yahooconnector.h
index b4758e72..9a33a2e7 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahooconnector.h
+++ b/kopete/protocols/yahoo/libkyahoo/yahooconnector.h
@@ -34,9 +34,10 @@ class KNetworkConnector : public Connector
 {
 
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-	KNetworkConnector( TQObject *parent = 0 );
+	KNetworkConnector( TQObject *tqparent = 0 );
 
 	virtual ~KNetworkConnector();
 
@@ -44,7 +45,7 @@ public:
 	virtual ByteStream *stream() const;
 	virtual void done();
 
-	void setOptHostPort( const TQString &host, Q_UINT16 port );
+	void setOptHostPort( const TQString &host, TQ_UINT16 port );
 
 	int errorCode();
 
@@ -54,7 +55,7 @@ private slots:
 
 private:
 	TQString mHost;
-	Q_UINT16 mPort;
+	TQ_UINT16 mPort;
 	int mErrorCode;
 
 	KNetworkByteStream *mByteStream;
@@ -63,4 +64,4 @@ private:
 
 #endif
 
-// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;
+// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off;
diff --git a/kopete/protocols/yahoo/libkyahoo/yahootypes.h b/kopete/protocols/yahoo/libkyahoo/yahootypes.h
index 0e8858c5..a5017609 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahootypes.h
+++ b/kopete/protocols/yahoo/libkyahoo/yahootypes.h
@@ -93,8 +93,8 @@ namespace Yahoo
 		ServicePictureUpdate = 0xc1,
 		ServicePictureUpload = 0xc2,
 		ServiceVisibility = 0xc5,	/* YMSG13, key 13: 2 = invisible, 1 = visible */
-		ServiceStatus = 0xc6,		/* YMSG13 */
-		ServicePictureStatus = 0xc7,	/* YMSG13, key 213: 0 = none, 1 = avatar, 2 = picture */
+		ServicetqStatus = 0xc6,		/* YMSG13 */
+		ServicePicturetqStatus = 0xc7,	/* YMSG13, key 213: 0 = none, 1 = avatar, 2 = picture */
 		ServiceContactDetails = 0xd3,	/* YMSG13 */
 		ServiceChatSession = 0xd4,
 		ServiceAuthorization = 0xd6,	/* YMSG13 */
@@ -102,11 +102,11 @@ namespace Yahoo
 		ServiceFileTransfer7Info = 0xdd,	/* YMSG13 */
 		ServiceFileTransfer7Accept = 0xde,	/* YMSG13 */
 		ServiceBuddyChangeGroup = 0xe7,	/* YMSG13 */
-		ServiceBuddyStatus = 0xf0,
+		ServiceBuddytqStatus = 0xf0,
 		ServiceBuddyList = 0xf1
 	};
 
-	enum Status
+	enum tqStatus
 	{
 		StatusConnecting = -2,
 		StatusDisconnected = -1,
@@ -134,7 +134,7 @@ namespace Yahoo
 		StatusTypeAway
 	};
 
-	enum LoginStatus {
+	enum LogintqStatus {
 		LoginOk = 0,
 		LoginUname = 3,
 		LoginPasswd = 13,
@@ -150,7 +150,7 @@ namespace Yahoo
 		StealthPermOffline
 	};
 
-	enum StealthStatus {
+	enum StealthtqStatus {
 		StealthActive = 1,
 		StealthNotActive = 2,
 		StealthClear = 3
@@ -161,15 +161,15 @@ namespace Yahoo
 		ResponseDecline
 	};
 
-	enum PictureStatus {
+	enum PicturetqStatus {
 		NoPicture = 0,
 		Avatar = 1,
 		Picture = 2
 	};
 
-	typedef Q_UINT8 BYTE;
-	typedef Q_UINT16 WORD;
-	typedef Q_UINT32 DWORD;
+	typedef TQ_UINT8 BYTE;
+	typedef TQ_UINT16 WORD;
+	typedef TQ_UINT32 DWORD;
 
 	struct ChatRoom {
 		TQString name;
diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp
index b1e6e4e3..5517c3f2 100644
--- a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp
@@ -36,8 +36,8 @@
 
 using namespace Yahoo;
 
-YMSGProtocol::YMSGProtocol(TQObject *parent, const char *name)
- : InputProtocolBase(parent, name)
+YMSGProtocol::YMSGProtocol(TQObject *tqparent, const char *name)
+ : InputProtocolBase(tqparent, name)
 {
 }
 
@@ -64,7 +64,7 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes )
 	int pos = 0;
 	int len = 0;
 
-	Yahoo::Status status = Yahoo::StatusAvailable;
+	Yahoo::tqStatus status = Yahoo::StatusAvailable;
 	Yahoo::Service service = Yahoo::ServiceAuth;
 	int statusnum = 0;
 	int sessionid = 0;
@@ -149,9 +149,9 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes )
 			kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service -  This means ServiceIddeAct " << servicenum << endl;
 			service = Yahoo::ServiceIddeAct;
 		break;
-		case (Yahoo::ServiceStatus) :
-			kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service -  This means ServiceStatus " << servicenum << endl;
-			service = Yahoo::ServiceStatus;
+		case (Yahoo::ServicetqStatus) :
+			kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service -  This means ServicetqStatus " << servicenum << endl;
+			service = Yahoo::ServicetqStatus;
 		break;
 		case (Yahoo::ServiceMessage) :
 			kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service -  This means ServiceMessage " << servicenum << endl;
@@ -177,9 +177,9 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes )
 			kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service -  This means ServicePictureChecksum " << servicenum << endl;
 			service = Yahoo::ServicePictureChecksum;
 		break;
-		case (Yahoo::ServicePictureStatus) :
-			kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service -  This means ServicePictureStatus " << servicenum << endl;
-			service = Yahoo::ServicePictureStatus;
+		case (Yahoo::ServicePicturetqStatus) :
+			kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service -  This means ServicePicturetqStatus " << servicenum << endl;
+			service = Yahoo::ServicePicturetqStatus;
 		break;
 		case (Yahoo::ServicePicture) :
 			kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service -  This means ServicePicture " << servicenum << endl;
@@ -297,9 +297,9 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes )
 			kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service -  This means ServiceComment " << servicenum << endl;
 			service = Yahoo::ServiceComment;
 		break;
-		case (Yahoo::ServiceBuddyStatus) :
-			kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service -  This means ServiceBuddyStatus " << servicenum << endl;
-			service = Yahoo::ServiceBuddyStatus;
+		case (Yahoo::ServiceBuddytqStatus) :
+			kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service -  This means ServiceBuddytqStatus " << servicenum << endl;
+			service = Yahoo::ServiceBuddytqStatus;
 		break;
 		case (Yahoo::ServiceBuddyList) :
 			kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service -  This means ServiceBuddyList " << servicenum << endl;
@@ -329,7 +329,7 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes )
 		ServiceGroupRename = 0x89, // > 1, 65(new), 66(0), 67(old)
 		ServicePictureUpdate = 0xc1,
 		ServiceVisibility = 0xc5,	// YMSG13, key 13: 2 = invisible, 1 = visible
-		ServiceStatus = 0xc6,		// YMSG13
+		ServicetqStatus = 0xc6,		// YMSG13
 		*/
 
 		default:
@@ -378,7 +378,7 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes )
 	YMSGTransfer *t = new YMSGTransfer();
 	t->setService(service);
 	t->setId(sessionid);
-	t->setStatus(status);
+	t->settqStatus(status);
 	t->setPacketLength(len);
 
         TQString d = TQString::fromAscii( packet.data() + pos, packet.size() - pos );
diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h
index a3ac04a6..1703e36f 100644
--- a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h
+++ b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h
@@ -25,10 +25,11 @@
 class YMSGProtocol : public InputProtocolBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 
 
-	YMSGProtocol( TQObject *parent = 0, const char *name = 0 );
+	YMSGProtocol( TQObject *tqparent = 0, const char *name = 0 );
 	~YMSGProtocol();
 
 	/**
diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp b/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp
index dcee98d9..3ed2192a 100644
--- a/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp
@@ -39,7 +39,7 @@ public:
 	int version;
 	int packetLength;
 	Yahoo::Service service;
-	Yahoo::Status status;
+	Yahoo::tqStatus status;
 	unsigned int id;
 	ParamList data;
 	bool valid;
@@ -62,7 +62,7 @@ YMSGTransfer::YMSGTransfer(Yahoo::Service service)
 	d->status = Yahoo::StatusAvailable;
 }
 
-YMSGTransfer::YMSGTransfer(Yahoo::Service service, Yahoo::Status status)
+YMSGTransfer::YMSGTransfer(Yahoo::Service service, Yahoo::tqStatus status)
 {
 	d = new YMSGTransferPrivate;
 	d->valid = true;
@@ -96,12 +96,12 @@ void YMSGTransfer::setService(Yahoo::Service service)
 	d->service = service;
 }
 
-Yahoo::Status YMSGTransfer::status() const
+Yahoo::tqStatus YMSGTransfer::status() const
 {
 	return d->status;
 }
 
-void YMSGTransfer::setStatus(Yahoo::Status status)
+void YMSGTransfer::settqStatus(Yahoo::tqStatus status)
 {
 	d->status = status;
 }
@@ -222,27 +222,27 @@ TQByteArray YMSGTransfer::serialize() const
 	TQByteArray buffer;
 	TQDataStream stream( buffer, IO_WriteOnly );
 
-	stream << (Q_INT8)'Y' << (Q_INT8)'M' << (Q_INT8)'S' << (Q_INT8)'G';
+	stream << (TQ_INT8)'Y' << (TQ_INT8)'M' << (TQ_INT8)'S' << (TQ_INT8)'G';
 	if( d->service == Yahoo::ServicePictureUpload )
-		stream << (Q_INT16)0x0f00;
+		stream << (TQ_INT16)0x0f00;
 	else
-		stream << (Q_INT16)0x000f;
-	stream << (Q_INT16)0x0000;
+		stream << (TQ_INT16)0x000f;
+	stream << (TQ_INT16)0x0000;
 	if( d->service == Yahoo::ServicePictureUpload ||
 		d->service == Yahoo::ServiceFileTransfer )
-		stream << (Q_INT16)(length()+4);
+		stream << (TQ_INT16)(length()+4);
 	else
-		stream << (Q_INT16)length();
-	stream << (Q_INT16)d->service;
-	stream << (Q_INT32)d->status;
-	stream << (Q_INT32)d->id;
+		stream << (TQ_INT16)length();
+	stream << (TQ_INT16)d->service;
+	stream << (TQ_INT32)d->status;
+	stream << (TQ_INT32)d->id;
  	for (ParamList::ConstIterator it = d->data.constBegin(); it !=  d->data.constEnd(); ++it)
 	{
  		kdDebug(YAHOO_RAW_DEBUG) << " Serializing key " << (*it).first << " value " << (*it).second << endl;
 		stream.writeRawBytes ( TQString::number( (*it).first ).local8Bit(), TQString::number( (*it).first ).length() );
-		stream << (Q_INT8)0xc0 << (Q_INT8)0x80;
+		stream << (TQ_INT8)0xc0 << (TQ_INT8)0x80;
 		stream.writeRawBytes( (*it).second, (*it).second.length() );
-		stream << (Q_INT8)0xc0 << (Q_INT8)0x80;
+		stream << (TQ_INT8)0xc0 << (TQ_INT8)0x80;
 	}
 	kdDebug(YAHOO_RAW_DEBUG) << " pos=" << pos << " (packet size)" << buffer << endl;
 	return buffer;
diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h b/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h
index 0b157792..953d3993 100644
--- a/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h
+++ b/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h
@@ -30,7 +30,7 @@
 
 class YMSGTransferPrivate;
 
-typedef QPair< int, TQCString > Param;
+typedef TQPair< int, TQCString > Param;
 typedef TQValueList< Param > ParamList;
 
 /**
@@ -40,7 +40,7 @@ class YMSGTransfer : public Transfer
 {
 public:
 	YMSGTransfer(Yahoo::Service service);
-	YMSGTransfer(Yahoo::Service service, Yahoo::Status status);
+	YMSGTransfer(Yahoo::Service service, Yahoo::tqStatus status);
 	YMSGTransfer();
 	~YMSGTransfer();
 
@@ -51,8 +51,8 @@ public:
 	bool isValid() const;
 	Yahoo::Service service() const;
 	void setService(Yahoo::Service service);
-	Yahoo::Status status() const;
-	void setStatus(Yahoo::Status status);
+	Yahoo::tqStatus status() const;
+	void settqStatus(Yahoo::tqStatus status);
 	unsigned int id() const;
 	void setId(unsigned int id);
 	int packetLength() const;