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

34 files changed, 140 insertions, 140 deletions

diff --git a/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp b/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp
index a92cfc8f..1943aa6b 100644
--- a/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp
@@ -1,6 +1,6 @@
 /*
     Kopete Yahoo Protocol
-    Change our tqStatus
+    Change our Status
 
     Copyright (c) 2005-2006 André Duffeck <[email protected]>
 
@@ -41,7 +41,7 @@ void ChangeStatusTask::onGo()
 	}
 	else
 	{
-		YMSGTransfer *t = new YMSGTransfer( Yahoo::ServicetqStatus );
+		YMSGTransfer *t = new YMSGTransfer( Yahoo::ServiceStatus );
 		t->setId( client()->sessionID() );
 
 		if( !m_message.isEmpty() )
@@ -55,7 +55,7 @@ void ChangeStatusTask::onGo()
 
 		send( t );
 
-		if( client()->status() == Yahoo::StatusInvisible )	// Invisible --> tqStatus
+		if( client()->status() == Yahoo::StatusInvisible )	// Invisible --> Status
 			sendVisibility( Visible );
 	}
 	setSuccess();
@@ -74,7 +74,7 @@ void ChangeStatusTask::setMessage( const TQString &msg )
 	m_message = msg;
 }
 
-void ChangeStatusTask::settqStatus( Yahoo::tqStatus status )
+void ChangeStatusTask::setStatus( Yahoo::Status status )
 {
 	m_status = status;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/changestatustask.h b/kopete/protocols/yahoo/libkyahoo/changestatustask.h
index ffeb5301..200a6f34 100644
--- a/kopete/protocols/yahoo/libkyahoo/changestatustask.h
+++ b/kopete/protocols/yahoo/libkyahoo/changestatustask.h
@@ -1,6 +1,6 @@
 /*
     Kopete Yahoo Protocol
-    Change our tqStatus
+    Change our Status
 
     Copyright (c) 2005 André Duffeck <[email protected]>
 
@@ -36,12 +36,12 @@ public:
 	virtual void onGo();
 
 	void setMessage( const TQString &msg );
-	void settqStatus( Yahoo::tqStatus status );
+	void setStatus( Yahoo::Status status );
 	void setType( Yahoo::StatusType type );
 private:
 	enum Visibility { Visible = 1, Invisible = 2 };
 	TQString m_message;
-	Yahoo::tqStatus m_status;
+	Yahoo::Status m_status;
 	Yahoo::StatusType m_type;
 
 	void sendVisibility( Visibility visible );
diff --git a/kopete/protocols/yahoo/libkyahoo/client.cpp b/kopete/protocols/yahoo/libkyahoo/client.cpp
index 366b256e..e5ca520d 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::tqStatus status;
-	Yahoo::tqStatus statusOnConnect;
+	Yahoo::Status status;
+	Yahoo::Status statusOnConnect;
 	TQString statusMessageOnConnect;
-	Yahoo::PicturetqStatus pictureFlag;
+	Yahoo::PictureStatus 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;
-	settqStatus( Yahoo::StatusDisconnected );
+	setStatus( 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::StealthtqStatus ) ),
-					TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ) ) );
+	TQObject::connect( d->listTask, TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ),
+					TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ) );
 }
 
 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;
-	settqStatus( Yahoo::StatusConnecting );
+	setStatus( 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() )
-			changetqStatus( d->statusOnConnect, d->statusMessageOnConnect, Yahoo::StatusTypeAway );
+			changeStatus( d->statusOnConnect, d->statusMessageOnConnect, Yahoo::StatusTypeAway );
 		d->statusMessageOnConnect = TQString();
-		settqStatus( d->statusOnConnect );
+		setStatus( 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::tqfromLatin1( "<ding>" ) );
+	smt->setText( TQString::fromLatin1( "<ding>" ) );
 	smt->setPicureFlag( pictureFlag() );
 	smt->go( true );
 }
@@ -404,13 +404,13 @@ void Client::cancelFileTransfer( unsigned int transferId )
 	emit fileTransferCanceled( transferId );
 }
 
-void Client::changetqStatus( Yahoo::tqStatus status, const TQString &message, Yahoo::StatusType type )
+void Client::changeStatus( Yahoo::Status 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->settqStatus( status );
+	cst->setStatus( status );
 	cst->setMessage( message );
 	cst->setType( type );
 	cst->go( true );
@@ -418,7 +418,7 @@ void Client::changetqStatus( Yahoo::tqStatus status, const TQString &message, Ya
 	if( status == Yahoo::StatusInvisible )
 		stealthContact( TQString(), Yahoo::StealthOnline, Yahoo::StealthClear );
 
-	settqStatus( status );
+	setStatus( 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::StealthtqStatus state)
+void Client::stealthContact(TQString const &userId, Yahoo::StealthMode mode, Yahoo::StealthStatus state)
 {
 	StealthTask *st = new StealthTask( d->root );
 	st->setTarget( userId );
@@ -575,7 +575,7 @@ void Client::sendPictureInformation( const TQString &userId, const TQString &url
 	spt->go( true );
 }
 
-void Client::setPicturetqStatus( Yahoo::PicturetqStatus status )
+void Client::setPictureStatus( Yahoo::PictureStatus status )
 {
 	if( d->pictureFlag == status )
 		return;
@@ -583,8 +583,8 @@ void Client::setPicturetqStatus( Yahoo::PicturetqStatus status )
 	kdDebug(YAHOO_RAW_DEBUG) << "Setting PictureStatus to: " << status << endl;
 	d->pictureFlag = status;
 	SendPictureTask *spt = new SendPictureTask( d->root );
-	spt->setType( SendPictureTask::SendtqStatus );
-	spt->settqStatus( status );
+	spt->setType( SendPictureTask::SendStatus );
+	spt->setStatus( 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::tqfromLatin1("\nThe following error occurred: %1\n    Reason: %2\n    LogLevel: %3")
-		.tqarg(info).tqarg(errorString).tqarg(level) << endl;
+	kdDebug(YAHOO_RAW_DEBUG) << TQString::fromLatin1("\nThe following error occurred: %1\n    Reason: %2\n    LogLevel: %3")
+		.arg(info).arg(errorString).arg(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::tqStatus Client::status()
+Yahoo::Status Client::status()
 {
 	return d->status;
 }
 
-void Client::settqStatus( Yahoo::tqStatus status )
+void Client::setStatus( Yahoo::Status status )
 {
 	d->status = status;
 }
 
 
-void Client::setStatusOnConnect( Yahoo::tqStatus status )
+void Client::setStatusOnConnect( Yahoo::Status 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::StealthtqStatus ) ),
-				TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ) ) );
+	TQObject::connect( d->statusTask, TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ),
+				TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ) );
 	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 586eead5..4e1602eb 100644
--- a/kopete/protocols/yahoo/libkyahoo/client.h
+++ b/kopete/protocols/yahoo/libkyahoo/client.h
@@ -100,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::tqStatus status );
+		void setStatusOnConnect( Yahoo::Status status );
 
 		/**
 		 * Specifies the status message we connect with.
@@ -147,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 changetqStatus(Yahoo::tqStatus status, const TQString &message, Yahoo::StatusType type);
+		void changeStatus(Yahoo::Status status, const TQString &message, Yahoo::StatusType type);
 
 		/**
 		 * Set the verification word that is needed for a account verification after
@@ -162,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::tqfromLatin1("Please add me")  );
+		void addBuddy( const TQString &userId, const TQString &group, const TQString &message = TQString::fromLatin1("Please add me")  );
 
 		/**
 		 * Remove a buddy from the contact list
@@ -185,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::StealthtqStatus state );
+		void stealthContact( TQString const &userId, Yahoo::StealthMode mode, Yahoo::StealthStatus state );
 
 		/**
 		 * Request the buddy's picture
@@ -226,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 setPicturetqStatus( Yahoo::PicturetqStatus flag );
+		void setPictureStatus( Yahoo::PictureStatus flag );
 
 		/**
 		 * Send a response to the webcam invite ( Accept / Decline )
@@ -432,13 +432,13 @@ Q_OBJECT
 		int pictureChecksum();
 
 		/** Get our status */
-		Yahoo::tqStatus status();
+		Yahoo::Status status();
 
 		/**
 		 * Set our status
 		 * @param status the new status
 		 */
-		void settqStatus( Yahoo::tqStatus status );
+		void setStatus( Yahoo::Status status );
 
 		/** Access the root Task for this client, so tasks may be added to it. */
 		Task* rootTask();
@@ -503,7 +503,7 @@ Q_OBJECT
 		/**
 		 * Notifies about the stealth status of buddies
 		 */
-		void stealthStatusChanged( const TQString &, Yahoo::StealthtqStatus );
+		void stealthStatusChanged( const TQString &, Yahoo::StealthStatus );
 		/**
 		 * Notifies about mails
 		 */
diff --git a/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp b/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp
index 6ca9ae06..59d3b3fa 100644
--- a/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp
@@ -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").tqarg( who[i] );
+		whoList += TQString(",%1").arg( who[i] );
 	t->setParam( 51, whoList.local8Bit() );
 
 	t->setParam( 57, room.local8Bit() );
diff --git a/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp b/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp
index 573c5ccf..1e4166f7 100644
--- a/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp
@@ -24,7 +24,7 @@
 
 #include <tqdatastream.h>
 #include <tqdatetime.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <kdebug.h>
 #include <kurl.h>
diff --git a/kopete/protocols/yahoo/libkyahoo/listtask.h b/kopete/protocols/yahoo/libkyahoo/listtask.h
index cd7718e3..8f8e69ba 100644
--- a/kopete/protocols/yahoo/libkyahoo/listtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/listtask.h
@@ -41,7 +41,7 @@ protected:
 	void parseStealthList( YMSGTransfer *transfer );
 signals:
 	void gotBuddy(const TQString&, const TQString&, const TQString&);
-	void stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus );
+	void stealthStatusChanged( const TQString&, Yahoo::StealthStatus );
 };
 
 #endif
diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.cpp b/kopete/protocols/yahoo/libkyahoo/logintask.cpp
index d653ecf1..f6b8a47e 100644
--- a/kopete/protocols/yahoo/libkyahoo/logintask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/logintask.cpp
@@ -212,7 +212,7 @@ void LoginTask::sendAuthSixteenStage1(const TQString& sn, const TQString& seed)
 	m_stage1Data= TQString();
 	/* construct a URL from the seed and request tokens */
 	TQByteArray encodedUrl;
-	TQString fullUrl = YahooTokenUrl.tqarg(sn, client()->password(), seed);
+	TQString fullUrl = YahooTokenUrl.arg(sn, client()->password(), seed);
 	KURL tokenUrl(fullUrl);
 	KIO::Job* job = KIO::get(tokenUrl, true, false);
 	connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
@@ -292,7 +292,7 @@ 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();
-	TQString fullUrl = YahooLoginUrl.tqarg(token);
+	TQString fullUrl = YahooLoginUrl.arg(token);
 	KURL loginUrl(fullUrl);
 	KIO::Job* job = KIO::get(loginUrl, true, false);
 	connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
@@ -404,7 +404,7 @@ void LoginTask::handleAuthResp(YMSGTransfer *t)
 	mState = InitialState;
 }
 
-void LoginTask::setStateOnConnect( Yahoo::tqStatus status )
+void LoginTask::setStateOnConnect( Yahoo::Status status )
 {
 	m_stateOnConnect = status;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.h b/kopete/protocols/yahoo/libkyahoo/logintask.h
index 30c01ffe..4ed1ac95 100644
--- a/kopete/protocols/yahoo/libkyahoo/logintask.h
+++ b/kopete/protocols/yahoo/libkyahoo/logintask.h
@@ -47,7 +47,7 @@ public:
 	virtual void onGo();
 
 	void reset();
-	void setStateOnConnect( Yahoo::tqStatus status );
+	void setStateOnConnect( Yahoo::Status status );
 	void setVerificationWord( const TQString &word );
 
 	const TQString &yCookie();
@@ -80,7 +80,7 @@ signals:
 	void buddyListReady();
 private:
 	State mState;
-	Yahoo::tqStatus m_stateOnConnect;
+	Yahoo::Status m_stateOnConnect;
 	TQString m_yCookie;
 	TQString m_tCookie;
 	TQString m_cCookie;
diff --git a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp
index 133b17cf..de6a1080 100644
--- a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp
@@ -68,7 +68,7 @@ void MailNotifierTask::parseMail( YMSGTransfer *t )
 	TQString subject = t->firstParam( 18 );
 
 	if( !mail.isEmpty() && !from.isEmpty() && !subject.isEmpty() )
-		emit mailNotify( TQString::tqfromLatin1( "%1 <%2>").tqarg( from, mail ), subject, count.toInt() );
+		emit mailNotify( TQString::fromLatin1( "%1 <%2>").arg( from, mail ), subject, count.toInt() );
 	else
 		emit mailNotify( TQString(), TQString(), count.toInt());
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
index 3888bef8..4dd00d90 100644
--- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
@@ -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").tqarg(i).tqarg(static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString()), Client::Error );
+			TQString( "%1 - %2").arg(i).arg(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::tqfromLatin1("POST /yab/us?v=XM&prog=ymsgr&.intl=us&sync=1&tags=short&noclear=1& HTTP/1.1\r\n"
+	TQString header = TQString::fromLatin1("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")
-			.tqarg(client()->yCookie()).tqarg(client()->tCookie())
-			.tqarg(client()->cCookie()).tqarg(m_postData.utf8().size());
+			.arg(client()->yCookie()).arg(client()->tCookie())
+			.arg(client()->cCookie()).arg(m_postData.utf8().size());
 
 	TQByteArray buffer;
 	TQByteArray paket;
@@ -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").tqarg( e.attribute("es") ).tqarg( e.attribute("ee") ) );
+				emit error( entry, i18n("The Yahoo Address Book entry could not be saved:\n%1 - %2").arg( e.attribute("es") ).arg( 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").tqarg( e.attribute("as") ).tqarg( e.attribute("ae") ) );
+				emit error( entry, i18n("The Yahoo Address Book entry could not be created:\n%1 - %2").arg( e.attribute("as") ).arg( 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").tqarg( e.attribute("ds") ).tqarg( e.attribute("de") ) );
+				emit error( entry, i18n("The Yahoo Address Book entry could not be deleted:\n%1 - %2").arg( e.attribute("ds") ).arg( e.attribute("de") ) );
 				continue;
 			}
 			break;
diff --git a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp
index a7245fe6..07c3d225 100644
--- a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp
@@ -47,8 +47,8 @@ bool PictureNotifierTask::take( Transfer* transfer )
 
 	switch( t->service() )
 	{
-		case Yahoo::ServicePicturetqStatus:
-			parsePicturetqStatus( t );
+		case Yahoo::ServicePictureStatus:
+			parsePictureStatus( t );
 			parsePicture( t );
 		break;
 		case Yahoo::ServicePictureChecksum:
@@ -80,13 +80,13 @@ bool PictureNotifierTask::forMe( const Transfer* transfer ) const
 		t->service() == Yahoo::ServicePicture ||
 		t->service() == Yahoo::ServicePictureUpdate ||
 		t->service() == Yahoo::ServicePictureUpload ||
-		t->service() == Yahoo::ServicePicturetqStatus )
+		t->service() == Yahoo::ServicePictureStatus )
 		return true;
 	else
 		return false;
 }
 
-void PictureNotifierTask::parsePicturetqStatus( YMSGTransfer *t )
+void PictureNotifierTask::parsePictureStatus( YMSGTransfer *t )
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 
diff --git a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h
index 7e09be19..832efc35 100644
--- a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h
+++ b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h
@@ -39,7 +39,7 @@ public:
 protected:
 	virtual bool forMe( const Transfer *transfer ) const;
 	void parsePictureChecksum( YMSGTransfer *transfer );
-	void parsePicturetqStatus( YMSGTransfer *transfer );
+	void parsePictureStatus( YMSGTransfer *transfer );
 	void parsePicture( YMSGTransfer *transfer );
 	void parsePictureUploadResponse( YMSGTransfer *transfer );
 signals:
diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
index 3943cd22..ec2e9f5f 100644
--- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
@@ -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::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 = 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->addMetaData("cookies", "manual");
-		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_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_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 );
+		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 );
 		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::tqfromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2;  path=/; domain=.yahoo.com;")
- 				.tqarg(client()->tCookie()).tqarg(client()->yCookie()) );
+ 		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()) );
 	}
 }
 
diff --git a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp
index 3f4f83b2..638a1811 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp
@@ -35,7 +35,7 @@ void SendNotifyTask::onGo()
 {
 	YMSGTransfer *t = new YMSGTransfer(Yahoo::ServiceNotify);
 	t->setId( client()->sessionID() );
-	t->settqStatus( Yahoo::StatusNotify );
+	t->setStatus( Yahoo::StatusNotify );
 
 	switch( m_type )
 	{
diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
index a9e76332..04673c62 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
@@ -55,8 +55,8 @@ void SendPictureTask::onGo()
 		case SendInformation:
 			sendInformation();
 		break;
-		case SendtqStatus:
-			sendtqStatus();
+		case SendStatus:
+			sendStatus();
 		break;
 	}
 }
@@ -76,7 +76,7 @@ void SendPictureTask::connectFailed( int i)
 {
 	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").tqarg(i).tqarg(static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString()), Client::Error );
+	client()->notifyError(i18n("The picture was not successfully uploaded"), TQString("%1 - %2").arg(i).arg(static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString()), Client::Error );
 	setError();
 }
 
@@ -105,18 +105,18 @@ void SendPictureTask::connectSucceeded()
 	else
 	{
 		kdDebug(YAHOO_RAW_DEBUG) << "Error opening file: " << TQString(file.errorString()).ascii() << endl;
-		client()->notifyError(i18n("Error opening file: %1").tqarg(m_path), file.errorString(), Client::Error );
+		client()->notifyError(i18n("Error opening file: %1").arg(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::tqfromLatin1("POST /notifyft HTTP/1.1\r\n"
+	TQString header = TQString::fromLatin1("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").tqarg(client()->yCookie()).tqarg(client()->tCookie()).tqarg(client()->cCookie()).tqarg(file.size()+4+paket.size());
+			"Cache-Control: no-cache\r\n\r\n").arg(client()->yCookie()).arg(client()->tCookie()).arg(client()->cCookie()).arg(file.size()+4+paket.size());
 	stream.writeRawBytes( header.local8Bit(), header.length() );
 	stream.writeRawBytes( paket.data(), paket.size() );
 	stream << (TQ_INT8)0x32 << (TQ_INT8)0x39 << (TQ_INT8)0xc0 << (TQ_INT8)0x80;
@@ -208,11 +208,11 @@ void SendPictureTask::sendInformation()
 	setSuccess();
 }
 
-void SendPictureTask::sendtqStatus()
+void SendPictureTask::sendStatus()
 {
 	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
 
-	YMSGTransfer *t = new YMSGTransfer(Yahoo::ServicePicturetqStatus);
+	YMSGTransfer *t = new YMSGTransfer(Yahoo::ServicePictureStatus);
 	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::settqStatus( int status )
+void SendPictureTask::setStatus( int status )
 {
 	m_status = status;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h
index 861d0dd5..4bac4f31 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h
+++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h
@@ -37,7 +37,7 @@ class SendPictureTask : public Task
 Q_OBJECT
   TQ_OBJECT
 public:
-	enum Type { UploadPicture, SendChecksum, SendInformation, SendtqStatus };
+	enum Type { UploadPicture, SendChecksum, SendInformation, SendStatus };
 
 	SendPictureTask(Task *parent);
 	virtual ~SendPictureTask();
@@ -50,13 +50,13 @@ public:
 	void setFilesize( int );
 	void setPath( const TQString & );
 	void setChecksum( int );
-	void settqStatus( int );
+	void setStatus( int );
 	void setUrl( const TQString & );
 private:
 	void initiateUpload();
 	void sendChecksum();
 	void sendInformation();
-	void sendtqStatus();
+	void sendStatus();
 private slots:
 	void connectSucceeded();
 	void connectFailed( int );
diff --git a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp
index 95e06b3c..4038301e 100644
--- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp
@@ -42,11 +42,11 @@ bool StatusNotifierTask::take( Transfer* transfer )
 	YMSGTransfer *t = static_cast<YMSGTransfer*>(transfer);
 
 	if( t->service() == Yahoo::ServiceStealthOffline )
-		parseStealthtqStatus( t );
+		parseStealthStatus( t );
 	else if( t->service() == Yahoo::ServiceAuthorization )
 		parseAuthorization( t );
 	else
-		parsetqStatus( t );
+		parseStatus( 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::ServicetqStatus ||
+		t->service() == Yahoo::ServiceStatus ||
 		t->service() == Yahoo::ServiceStealthOffline ||
 		t->service() == Yahoo::ServiceAuthorization ||
-		t->service() == Yahoo::ServiceBuddytqStatus
+		t->service() == Yahoo::ServiceBuddyStatus
 	)
 		return true;
 	else
 		return false;
 }
 
-void StatusNotifierTask::parsetqStatus( YMSGTransfer* t )
+void StatusNotifierTask::parseStatus( YMSGTransfer* t )
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 
@@ -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").tqarg(fname).tqarg(lname);
+			name = TQString("%1 %2").arg(fname).arg(lname);
 
 		kdDebug(YAHOO_RAW_DEBUG) << "Emitting gotAuthorizationRequest( " << nick<< ", " << msg << ", " << name << " )" << endl;
 		emit gotAuthorizationRequest( nick, msg, name );
 	}
 }
 
-void StatusNotifierTask::parseStealthtqStatus( YMSGTransfer* t )
+void StatusNotifierTask::parseStealthStatus( YMSGTransfer* t )
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 
diff --git a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h
index 8ed029f5..4941d479 100644
--- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h
+++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h
@@ -38,12 +38,12 @@ public:
 
 protected:
 	virtual bool forMe( const Transfer *transfer ) const;
-	void parsetqStatus( YMSGTransfer *transfer );
-	void parseStealthtqStatus( YMSGTransfer *transfer );
+	void parseStatus( YMSGTransfer *transfer );
+	void parseStealthStatus( 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::StealthtqStatus );
+	void stealthStatusChanged( const TQString&, Yahoo::StealthStatus );
 	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 9dcc2431..6eba854a 100644
--- a/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp
@@ -70,7 +70,7 @@ void StealthTask::setTarget( const TQString &to )
 	m_target = to;
 }
 
-void StealthTask::setState( Yahoo::StealthtqStatus state)
+void StealthTask::setState( Yahoo::StealthStatus state)
 {
 	m_state = state;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/stealthtask.h b/kopete/protocols/yahoo/libkyahoo/stealthtask.h
index aef13038..370f06bc 100644
--- a/kopete/protocols/yahoo/libkyahoo/stealthtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/stealthtask.h
@@ -35,12 +35,12 @@ public:
 	virtual void onGo();
 
 	void setTarget( const TQString &to );
-	void setState( Yahoo::StealthtqStatus state );
+	void setState( Yahoo::StealthStatus state );
 	void setMode( Yahoo::StealthMode mode );
 private:
 	TQString m_target;
 	Yahoo::StealthMode m_mode;
-	Yahoo::StealthtqStatus m_state;
+	Yahoo::StealthStatus m_state;
 };
 
 #endif
diff --git a/kopete/protocols/yahoo/libkyahoo/task.cpp b/kopete/protocols/yahoo/libkyahoo/task.cpp
index 6ad9994c..ccebaef3 100644
--- a/kopete/protocols/yahoo/libkyahoo/task.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/task.cpp
@@ -128,7 +128,7 @@ bool Task::take( Transfer * transfer)
 	if(p.isEmpty())
 		return false;
 
-	// pass along the transfer to our tqchildren
+	// pass along the transfer to our children
 	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: ").tqarg(className()) + str);
+	client()->debug(TQString("%1: ").arg(className()) + str);
 }
 
 bool Task::forMe( 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 6d8d9e0d..efcd63cf 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::tqfromLatin1("scs.msg.yahoo.com");
+	TQString server = TQString::fromLatin1("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/logintest.cpp b/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp
index ecf96906..5e9b04a5 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::tqfromLatin1("scs.msg.yahoo.com");
+	TQString server = TQString::fromLatin1("scs.msg.yahoo.com");
 	// connect to server
 	kdDebug(14180) << k_funcinfo << " connecting to server" << endl;
 	
diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
index 8c85705c..90245b29 100644
--- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
@@ -94,7 +94,7 @@ void WebcamTask::parseWebcamInformation( YMSGTransfer *t )
 	info.sender = keyPending;
 	info.server = t->firstParam( 102 );
 	info.key = t->firstParam( 61 );
-	info.status = InitialtqStatus;
+	info.status = InitialStatus;
 	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").tqarg(socketMap[socket].sender);
+		s = TQString("g=%1\r\n").arg(socketMap[socket].sender);
 	}
 	else
 	{
@@ -172,7 +172,7 @@ void WebcamTask::slotConnectionStage2Established()
 		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")
-			.tqarg(client()->userId()).tqarg(socketMap[socket].key).tqarg(socketMap[socket].sender);
+			.arg(client()->userId()).arg(socketMap[socket].key).arg(socketMap[socket].sender);
 		// Header: 08 00 01 00 00 00 00
 		stream << (TQ_INT8)0x08 << (TQ_INT8)0x00 << (TQ_INT8)0x01 << (TQ_INT8)0x00 << (TQ_INT32)s.length();
 	}
@@ -182,7 +182,7 @@ void WebcamTask::slotConnectionStage2Established()
 		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")
-		.tqarg(client()->userId()).tqarg(socketMap[socket].key).tqarg(socket->localAddress().nodeName());
+		.arg(client()->userId()).arg(socketMap[socket].key).arg(socket->localAddress().nodeName());
 		// Header: 08 00 05 00 00 00 00	01 00 00 00 01
 		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;
@@ -197,7 +197,7 @@ 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->KSocketBase::errorString() << endl;
         client()->notifyError( i18n("Webcam connection to the user %1 could not be established.\n\nPlease relogin and try again.")
-                        .tqarg(socketMap[socket].sender), TQString("%1 - %2").tqarg(error).tqarg( socket->KSocketBase::errorString()), Client::Error );
+                        .arg(socketMap[socket].sender), TQString("%1 - %2").arg(error).arg( socket->KSocketBase::errorString()), Client::Error );
         socketMap.remove( socket );
         socket->deleteLater();
 }
@@ -579,7 +579,7 @@ void WebcamTask::grantAccess( const TQString &userId )
 	}
 	TQByteArray ar;
 	TQDataStream stream( ar, IO_WriteOnly );
-	TQString user = TQString("u=%1").tqarg(userId);
+	TQString user = TQString("u=%1").arg(userId);
 
 	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;
diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.h b/kopete/protocols/yahoo/libkyahoo/webcamtask.h
index 1aff0537..66dd92c8 100644
--- a/kopete/protocols/yahoo/libkyahoo/webcamtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.h
@@ -30,7 +30,7 @@ namespace KNetwork {
 }
 using namespace KNetwork;
 
-enum ConnectiontqStatus{ InitialtqStatus, ConnectedStage1, ConnectedStage2, Receiving, Sending, SendingEmpty };
+enum ConnectionStatus{ InitialStatus, ConnectedStage1, ConnectedStage2, Receiving, Sending, SendingEmpty };
 enum PacketType { Image, ConnectionClosed, UserRequest, NewWatcher, WatcherLeft };
 enum Direction { Incoming, Outgoing };
 
@@ -39,7 +39,7 @@ struct YahooWebcamInformation
 	TQString		sender;
 	TQString		server;
 	TQString		key;
-	ConnectiontqStatus status;
+	ConnectionStatus status;
 	PacketType	type;
 	Direction	direction;
 	uchar		reason;
diff --git a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp
index 65c48f54..9ca9af3d 100644
--- a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp
@@ -146,8 +146,8 @@ void YABEntry::fillTQDomElement( TQDomElement &e ) const
 	e.setAttribute( "hs", privateState );
 	e.setAttribute( "hz", privateZIP );
 	e.setAttribute( "hn", privateCountry );
-	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( "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( "c1", additional1 );
 	e.setAttribute( "c2", additional2 );
 	e.setAttribute( "c3", additional3 );
diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
index 278dcd31..951f88d8 100644
--- a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
@@ -94,13 +94,13 @@ void YABTask::getAllEntries( long lastMerge, long lastRemoteRevision )
 {
 	kdDebug(YAHOO_RAW_DEBUG) << "LastMerge: " << lastMerge << " LastRemoteRevision: " << lastRemoteRevision << endl;
 	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 );
+	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_transferJob = KIO::get( url , false, false );
 	m_transferJob->addMetaData("cookies", "manual");
-	m_transferJob->addMetaData("setcookies", TQString::tqfromLatin1("Cookie: Y=%1; T=%2; C=%3;")
-				.tqarg(client()->yCookie()).tqarg(client()->tCookie()).tqarg(client()->cCookie()) );
+	m_transferJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: Y=%1; T=%2; C=%3;")
+				.arg(client()->yCookie()).arg(client()->tCookie()).arg(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* ) ) );
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
index a317cb12..025386f0 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
@@ -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)").tqarg( m_jobs[transfer].url.url() ), job->errorString(), Client::Info );
+			m_client->notifyError( i18n( "An error occurred while downloading a buddy icon (%1)").arg( m_jobs[transfer].url.url() ), job->errorString(), Client::Info );
 	}
 	else
 	{
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
index ad70d3c6..1c9528ff 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
@@ -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").tqarg(client()->tCookie(), client()->yCookie()) );
+	transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").arg(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").tqarg( category.id )), false, false );
+	transfer = KIO::get( KURL(TQString("http://insider.msg.yahoo.com/ycontent/?chatroom_%1=0").arg( 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").tqarg(client()->tCookie(), client()->yCookie()) );
+	transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").arg(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").tqarg(YMSG_PROGRAM_VERSION_STRING).local8Bit() );
+	t->setParam( 135, TQString("ym%1").arg(YMSG_PROGRAM_VERSION_STRING).local8Bit() );
 
 	send( t );
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/yahootypes.h b/kopete/protocols/yahoo/libkyahoo/yahootypes.h
index a5017609..376036b3 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 */
-		ServicetqStatus = 0xc6,		/* YMSG13 */
-		ServicePicturetqStatus = 0xc7,	/* YMSG13, key 213: 0 = none, 1 = avatar, 2 = picture */
+		ServiceStatus = 0xc6,		/* YMSG13 */
+		ServicePictureStatus = 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 */
-		ServiceBuddytqStatus = 0xf0,
+		ServiceBuddyStatus = 0xf0,
 		ServiceBuddyList = 0xf1
 	};
 
-	enum tqStatus
+	enum Status
 	{
 		StatusConnecting = -2,
 		StatusDisconnected = -1,
@@ -134,7 +134,7 @@ namespace Yahoo
 		StatusTypeAway
 	};
 
-	enum LogintqStatus {
+	enum LoginStatus {
 		LoginOk = 0,
 		LoginUname = 3,
 		LoginPasswd = 13,
@@ -150,7 +150,7 @@ namespace Yahoo
 		StealthPermOffline
 	};
 
-	enum StealthtqStatus {
+	enum StealthStatus {
 		StealthActive = 1,
 		StealthNotActive = 2,
 		StealthClear = 3
@@ -161,7 +161,7 @@ namespace Yahoo
 		ResponseDecline
 	};
 
-	enum PicturetqStatus {
+	enum PictureStatus {
 		NoPicture = 0,
 		Avatar = 1,
 		Picture = 2
diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp
index 6cc99f24..b1e6e4e3 100644
--- a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp
@@ -64,7 +64,7 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes )
 	int pos = 0;
 	int len = 0;
 
-	Yahoo::tqStatus status = Yahoo::StatusAvailable;
+	Yahoo::Status 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::ServicetqStatus) :
+		case (Yahoo::ServiceStatus) :
 			kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service -  This means ServiceStatus " << servicenum << endl;
-			service = Yahoo::ServicetqStatus;
+			service = Yahoo::ServiceStatus;
 		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::ServicePicturetqStatus) :
+		case (Yahoo::ServicePictureStatus) :
 			kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service -  This means ServicePictureStatus " << servicenum << endl;
-			service = Yahoo::ServicePicturetqStatus;
+			service = Yahoo::ServicePictureStatus;
 		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::ServiceBuddytqStatus) :
+		case (Yahoo::ServiceBuddyStatus) :
 			kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service -  This means ServiceBuddyStatus " << servicenum << endl;
-			service = Yahoo::ServiceBuddytqStatus;
+			service = Yahoo::ServiceBuddyStatus;
 		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
-		ServicetqStatus = 0xc6,		// YMSG13
+		ServiceStatus = 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->settqStatus(status);
+	t->setStatus(status);
 	t->setPacketLength(len);
 
         TQString d = TQString::fromAscii( packet.data() + pos, packet.size() - pos );
diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp b/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp
index 3ed2192a..b1f77863 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::tqStatus status;
+	Yahoo::Status 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::tqStatus status)
+YMSGTransfer::YMSGTransfer(Yahoo::Service service, Yahoo::Status status)
 {
 	d = new YMSGTransferPrivate;
 	d->valid = true;
@@ -96,12 +96,12 @@ void YMSGTransfer::setService(Yahoo::Service service)
 	d->service = service;
 }
 
-Yahoo::tqStatus YMSGTransfer::status() const
+Yahoo::Status YMSGTransfer::status() const
 {
 	return d->status;
 }
 
-void YMSGTransfer::settqStatus(Yahoo::tqStatus status)
+void YMSGTransfer::setStatus(Yahoo::Status status)
 {
 	d->status = status;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h b/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h
index 953d3993..09ba7a27 100644
--- a/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h
+++ b/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h
@@ -40,7 +40,7 @@ class YMSGTransfer : public Transfer
 {
 public:
 	YMSGTransfer(Yahoo::Service service);
-	YMSGTransfer(Yahoo::Service service, Yahoo::tqStatus status);
+	YMSGTransfer(Yahoo::Service service, Yahoo::Status status);
 	YMSGTransfer();
 	~YMSGTransfer();
 
@@ -51,8 +51,8 @@ public:
 	bool isValid() const;
 	Yahoo::Service service() const;
 	void setService(Yahoo::Service service);
-	Yahoo::tqStatus status() const;
-	void settqStatus(Yahoo::tqStatus status);
+	Yahoo::Status status() const;
+	void setStatus(Yahoo::Status status);
 	unsigned int id() const;
 	void setId(unsigned int id);
 	int packetLength() const;