Rename old tq methods that no longer need a unique name

43 files changed, 218 insertions, 218 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..30867e02 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,7 +710,7 @@ 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")
+	kdDebug(YAHOO_RAW_DEBUG) << TQString::fromLatin1("\nThe following error occurred: %1\n    Reason: %2\n    LogLevel: %3")
 		.tqarg(info).tqarg(errorString).tqarg(level) << endl;
 	d->errorString = errorString;
 	d->errorInformation = info;
@@ -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/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..301b5083 100644
--- a/kopete/protocols/yahoo/libkyahoo/logintask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/logintask.cpp
@@ -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..1a813a66 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>").tqarg( 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..4da8517f 100644
--- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
@@ -99,7 +99,7 @@ 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"
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..5910fbfe 100644
--- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
@@ -187,19 +187,19 @@ 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")
+		m_mimetypeJob = KIO::mimetype(TQString::fromLatin1("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::tqfromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; C=%3;")
+		m_mimetypeJob->addMetaData("setcookies", TQString::fromLatin1("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::tqfromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4")
+		m_transferJob = KIO::get( TQString::fromLatin1("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::tqfromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2;  path=/; domain=.yahoo.com;")
+ 		m_transferJob->addMetaData("setcookies", TQString::fromLatin1("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/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..48d2af8c 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;
 	}
 }
@@ -111,7 +111,7 @@ void SendPictureTask::connectSucceeded()
 
 	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"
@@ -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..ac900a83 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) ;
 
@@ -163,7 +163,7 @@ void StatusNotifierTask::parseAuthorization( YMSGTransfer* t )
 	}
 }
 
-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/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..addcb15a 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;
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/yabtask.cpp b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
index 278dcd31..391d494e 100644
--- a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
@@ -94,12 +94,12 @@ 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")
+	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")
 		.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::tqfromLatin1("Cookie: Y=%1; T=%2; C=%3;")
+	m_transferJob->addMetaData("setcookies", TQString::fromLatin1("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* ) ) );
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;
diff --git a/kopete/protocols/yahoo/ui/yahooadd.ui b/kopete/protocols/yahoo/ui/yahooadd.ui
index f497da37..252bc424 100644
--- a/kopete/protocols/yahoo/ui/yahooadd.ui
+++ b/kopete/protocols/yahoo/ui/yahooadd.ui
@@ -84,7 +84,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>80</height>
diff --git a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui
index 144a0f33..60dcf519 100644
--- a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui
+++ b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui
@@ -29,7 +29,7 @@
             <property name="name">
                 <cstring>tabWidget11</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>460</width>
                     <height>0</height>
@@ -147,7 +147,7 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
@@ -189,7 +189,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>81</height>
@@ -219,7 +219,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>110</height>
@@ -371,13 +371,13 @@
                                 <property name="name">
                                     <cstring>m_Picture</cstring>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>96</width>
                                         <height>96</height>
                                     </size>
                                 </property>
-                                <property name="tqmaximumSize">
+                                <property name="maximumSize">
                                     <size>
                                         <width>96</width>
                                         <height>96</height>
diff --git a/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui b/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui
index 16af6016..8089a9d3 100644
--- a/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui
+++ b/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui
@@ -218,7 +218,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>30</height>
@@ -516,7 +516,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>78</height>
diff --git a/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui b/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui
index c1d88464..056a93f4 100644
--- a/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui
+++ b/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui
@@ -63,7 +63,7 @@
                                     <property name="name">
                                         <cstring>listFriends</cstring>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>0</width>
                                             <height>180</height>
@@ -97,7 +97,7 @@
                                     <property name="name">
                                         <cstring>listInvited</cstring>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>0</width>
                                             <height>150</height>
@@ -147,7 +147,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -180,7 +180,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>90</height>
@@ -217,7 +217,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>21</height>
@@ -265,7 +265,7 @@
                             <property name="sizeType">
                                 <enum>Maximum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>350</width>
                                     <height>31</height>
diff --git a/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui b/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui
index 197de528..2193118e 100644
--- a/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui
+++ b/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui
@@ -106,7 +106,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>130</height>
diff --git a/kopete/protocols/yahoo/ui/yahoostealthsetting.ui b/kopete/protocols/yahoo/ui/yahoostealthsetting.ui
index d0254985..92246ba1 100644
--- a/kopete/protocols/yahoo/ui/yahoostealthsetting.ui
+++ b/kopete/protocols/yahoo/ui/yahoostealthsetting.ui
@@ -12,7 +12,7 @@
             <height>114</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>195</width>
             <height>75</height>
diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp
index a19ebfff..bdf56e79 100644
--- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp
+++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp
@@ -47,21 +47,21 @@ YahooUserInfoDialog::YahooUserInfoDialog( YahooContact *c, TQWidget * parent, co
 	showButton( User2, false );
 	TQFrame* genInfo = addPage( i18n( "General Info" ),
 	                                         i18n( "General Yahoo Information" ),
-	                                         KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "identity" ), KIcon::Desktop ) );
+	                                         KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), KIcon::Desktop ) );
 	TQVBoxLayout* genLayout = new TQVBoxLayout( genInfo );
 	m_genInfoWidget = new YahooGeneralInfoWidget( genInfo, "Basic Information" );
 	genLayout->addWidget( m_genInfoWidget );
 	
 	TQFrame* workInfo = addPage( i18n( "Work Info" ),
 	                                          i18n( "Work Information" ),
-	                                          KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "attach" ), KIcon::Desktop ) );
+	                                          KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "attach" ), KIcon::Desktop ) );
 	TQVBoxLayout* workLayout = new TQVBoxLayout( workInfo );
 	m_workInfoWidget = new YahooWorkInfoWidget( workInfo, "Work Information" );
 	workLayout->addWidget( m_workInfoWidget );
 	
 	TQFrame* otherInfo = addPage( i18n( "Other Info" ),
 	                                           i18n( "Other Yahoo Information" ),
-	                                           KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "email" ), KIcon::Desktop ) );
+	                                           KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) );
 	TQVBoxLayout* otherLayout = new TQVBoxLayout( otherInfo );
 	m_otherInfoWidget = new YahooOtherInfoWidget( otherInfo, "Other Information"  );
 	otherLayout->addWidget( m_otherInfoWidget );
diff --git a/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui b/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui
index 5a18d662..351bcec4 100644
--- a/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui
+++ b/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui
@@ -12,7 +12,7 @@
             <height>200</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>450</width>
             <height>200</height>
@@ -61,7 +61,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>110</width>
                             <height>20</height>
@@ -80,7 +80,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -105,7 +105,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>72</width>
                             <height>20</height>
@@ -116,7 +116,7 @@
                     <property name="name">
                         <cstring>mPicture</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>240</width>
                             <height>75</height>
@@ -139,7 +139,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>72</width>
                             <height>20</height>
diff --git a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp
index 640164f1..0bff9120 100644
--- a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp
+++ b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp
@@ -44,11 +44,11 @@ YahooWebcamDialog::YahooWebcamDialog( const TQString &contactId, TQWidget * pare
 	m_imageContainer = new Kopete::WebcamWidget( page );
 	m_imageContainer->setText( i18n( "No webcam image received" ) );
 	m_imageContainer->setMinimumSize(320,240);
-	m_imageContainer->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	m_imageContainer->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	topLayout->add( m_imageContainer );
 	
 	m_Viewer = new TQLabel( page );
-	m_Viewer->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	m_Viewer->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_Viewer->hide();
 	topLayout->add( m_Viewer );
 
@@ -67,7 +67,7 @@ void YahooWebcamDialog::newImage( const TQPixmap &image )
 
 void YahooWebcamDialog::webcamPaused()
 {
-	m_imageContainer->setText( TQString::tqfromLatin1("*** Webcam paused ***") );
+	m_imageContainer->setText( TQString::fromLatin1("*** Webcam paused ***") );
 }
 
 void YahooWebcamDialog::webcamClosed( int reason  )
diff --git a/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui b/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui
index c501d6b5..a70bc620 100644
--- a/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui
+++ b/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui
@@ -143,7 +143,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -210,7 +210,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>150</height>
diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp
index eabf6fdd..c6c861c9 100644
--- a/kopete/protocols/yahoo/yahooaccount.cpp
+++ b/kopete/protocols/yahoo/yahooaccount.cpp
@@ -109,7 +109,7 @@ YahooAccount::YahooAccount(YahooProtocol *parent, const TQString& accountId, con
 
 // 	initConnectionSignals( MakeConnections );
 
-	TQString displayName = configGroup()->readEntry(TQString::tqfromLatin1("displayName"), TQString());
+	TQString displayName = configGroup()->readEntry(TQString::fromLatin1("displayName"), TQString());
 	if(!displayName.isEmpty())
 		_myself->setNickName(displayName);
 
@@ -130,15 +130,15 @@ YahooAccount::~YahooAccount()
 
 void YahooAccount::setServer( const TQString &server )
 {
-	configGroup()->writeEntry( TQString::tqfromLatin1( "Server" ), server );
+	configGroup()->writeEntry( TQString::fromLatin1( "Server" ), server );
 }
 
 void YahooAccount::setPort( int port )
 {
-	configGroup()->writeEntry( TQString::tqfromLatin1( "Port" ), port );
+	configGroup()->writeEntry( TQString::fromLatin1( "Port" ), port );
 }
 
-void YahooAccount::slotGotqStatus( int status, const TQString &awayMessage)
+void YahooAccount::slotGoStatus( int status, const TQString &awayMessage)
 {
 	kdDebug(YAHOO_GEN_DEBUG) << "GoStatus: " << status << " msg: " << awayMessage << endl;
 	if( !isConnected() )
@@ -148,7 +148,7 @@ void YahooAccount::slotGotqStatus( int status, const TQString &awayMessage)
 	}
 	else
 	{
-		m_session->changetqStatus( Yahoo::tqStatus( status ), awayMessage,
+		m_session->changeStatus( Yahoo::Status( status ), awayMessage,
 			(status == Yahoo::StatusAvailable)? Yahoo::StatusTypeAvailable : Yahoo::StatusTypeAway );
 
 		//sets the awayMessage property for the owner of the account. shows up in the statusbar icon's tooltip. the property is unset when awayMessage is null
@@ -265,8 +265,8 @@ void YahooAccount::initConnectionSignals( enum SignalConnectionType sct )
 		TQObject::connect(m_session, TQT_SIGNAL(statusChanged(const TQString&,int,const TQString&,int,int,int)),
 		                 this, TQT_SLOT(slotStatusChanged(const TQString&,int,const TQString&,int,int,int)));
 
-		TQObject::connect(m_session, TQT_SIGNAL(stealthStatusChanged(const TQString &, Yahoo::StealthtqStatus)),
-		                 this, TQT_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthtqStatus)) );
+		TQObject::connect(m_session, TQT_SIGNAL(stealthStatusChanged(const TQString &, Yahoo::StealthStatus)),
+		                 this, TQT_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthStatus)) );
 
 		TQObject::connect(m_session, TQT_SIGNAL(gotIm(const TQString&, const TQString&, long, int)),
 		                 this, TQT_SLOT(slotGotIm(const TQString &, const TQString&, long, int)));
@@ -407,8 +407,8 @@ void YahooAccount::initConnectionSignals( enum SignalConnectionType sct )
 		TQObject::disconnect(m_session, TQT_SIGNAL(statusChanged(const TQString&,int,const TQString&,int,int,int)),
 		                    this, TQT_SLOT(slotStatusChanged(const TQString&,int,const TQString&,int,int,int)));
 
-		TQObject::disconnect(m_session, TQT_SIGNAL(stealthStatusChanged(const TQString &, Yahoo::StealthtqStatus)),
-		                 this, TQT_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthtqStatus)) );
+		TQObject::disconnect(m_session, TQT_SIGNAL(stealthStatusChanged(const TQString &, Yahoo::StealthStatus)),
+		                 this, TQT_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthStatus)) );
 
 		TQObject::disconnect(m_session, TQT_SIGNAL(gotIm(const TQString&, const TQString&, long, int)),
 		                    this, TQT_SLOT(slotGotIm(const TQString &, const TQString&, long, int)));
@@ -526,7 +526,7 @@ void YahooAccount::connectWithPassword( const TQString &passwd )
 	}
 
 	if ( isConnected() ||
-	     myself()->onlinetqStatus() == m_protocol->Connecting )
+	     myself()->onlineStatus() == m_protocol->Connecting )
 	{
 		kdDebug(YAHOO_GEN_DEBUG) << "Yahoo plugin: Ignoring connect request (already connected)." << endl;
 		return;
@@ -549,7 +549,7 @@ void YahooAccount::connectWithPassword( const TQString &passwd )
 	kdDebug(YAHOO_GEN_DEBUG) << "Attempting to connect to Yahoo on <" << server << ":"
 		<< port << ">. user <" << accountId() << ">"  << endl;
 	static_cast<YahooContact *>( myself() )->setOnlineStatus( m_protocol->Connecting );
-	m_session->setStatusOnConnect( Yahoo::tqStatus( initialtqStatus().internalStatus() ) );
+	m_session->setStatusOnConnect( Yahoo::Status( initialStatus().internalStatus() ) );
 	m_session->connect( server, port, accountId().lower(), passwd );
 }
 
@@ -607,9 +607,9 @@ void YahooAccount::setAway(bool status, const TQString &awayMessage)
 	kdDebug(YAHOO_GEN_DEBUG) ;
 
 	if( awayMessage.isEmpty() )
-		slotGotqStatus( status ? 2 : 0 );
+		slotGoStatus( status ? 2 : 0 );
 	else
-		slotGotqStatus( status ? 99 : 0, awayMessage );
+		slotGoStatus( status ? 99 : 0, awayMessage );
 }
 
 void YahooAccount::slotConnected()
@@ -623,7 +623,7 @@ void YahooAccount::slotGoOnline()
 	if( !isConnected() )
 		connect( m_protocol->Online );
 	else
-		slotGotqStatus(0);
+		slotGoStatus(0);
 }
 
 void YahooAccount::slotGoOffline()
@@ -722,9 +722,9 @@ void YahooAccount::slotLoginResponse( int succ , const TQString &url )
 	setupActions( succ == Yahoo::LoginOk );
 	if ( succ == Yahoo::LoginOk || (succ == Yahoo::LoginDupl && m_lastDisconnectCode == 2) )
 	{
-		if ( initialtqStatus().internalStatus() )
+		if ( initialStatus().internalStatus() )
 		{
-			static_cast<YahooContact *>( myself() )->setOnlineStatus( initialtqStatus() );
+			static_cast<YahooContact *>( myself() )->setOnlineStatus( initialStatus() );
 		}
 		else
 		{
@@ -802,7 +802,7 @@ void YahooAccount::slotDisconnected()
 	TQString message;
 	message = i18n( "%1 has been disconnected.\nError message:\n%2 - %3" )
 		.tqarg( accountId() ).tqarg( m_session->error() ).tqarg( m_session->errorString() );
-	KNotification::event( "connection_lost", message, myself()->onlinetqStatus().protocolIcon() );
+	KNotification::event( "connection_lost", message, myself()->onlineStatus().protocolIcon() );
 }
 
 void YahooAccount::slotLoginFailed()
@@ -815,7 +815,7 @@ void YahooAccount::slotLoginFailed()
 	TQString message;
 	message = i18n( "There was an error while connecting %1 to the Yahoo server.\nError message:\n%2 - %3" )
 		.tqarg( accountId()).tqarg( m_session->error() ).tqarg( m_session->errorString() );
-	KNotification::event( "cannot_connect", message, myself()->onlinetqStatus().protocolIcon() );
+	KNotification::event( "cannot_connect", message, myself()->onlineStatus().protocolIcon() );
 }
 
 void YahooAccount::slotError( int level )
@@ -889,7 +889,7 @@ void YahooAccount::slotAuthorizationAccepted( const TQString &who )
 	kdDebug(YAHOO_GEN_DEBUG) ;
 	TQString message;
 	message = i18n( "User %1 has granted your authorization request." ).tqarg( who );
-	KNotification::event( TQString::tqfromLatin1("kopete_authorization"), message );
+	KNotification::event( TQString::fromLatin1("kopete_authorization"), message );
 
 	if( contact( who ) )
 		contact( who )->setOnlineStatus( m_protocol->Online );
@@ -901,7 +901,7 @@ void YahooAccount::slotAuthorizationRejected( const TQString &who, const TQStrin
 	TQString message;
 	message = i18n( "User %1 has rejected your authorization request.\n%2" )
 		.tqarg( who ).tqarg( msg );
-	KNotification::event( TQString::tqfromLatin1("kopete_authorization"), message );
+	KNotification::event( TQString::fromLatin1("kopete_authorization"), message );
 }
 
 void YahooAccount::slotgotAuthorizationRequest( const TQString &user, const TQString &msg, const TQString &name )
@@ -995,24 +995,24 @@ void YahooAccount::slotStatusChanged( const TQString &who, int stat, const TQStr
 
 	if ( kc )
 	{
-		Kopete::OnlineStatus newtqStatus = m_protocol->statusFromYahoo( stat );
-		Kopete::OnlineStatus oldtqStatus = kc->onlinetqStatus();
+		Kopete::OnlineStatus newStatus = m_protocol->statusFromYahoo( stat );
+		Kopete::OnlineStatus oldStatus = kc->onlineStatus();
 
-		if( newtqStatus == m_protocol->Custom ) {
+		if( newStatus == m_protocol->Custom ) {
 			if( away == 0 )
-				newtqStatus =m_protocol->Online;
+				newStatus =m_protocol->Online;
 			kc->setProperty( m_protocol->awayMessage, msg);
 		}
 		else
 			kc->removeProperty( m_protocol->awayMessage );
 
 		// from original file
-		if( newtqStatus != m_protocol->Offline && oldtqStatus == m_protocol->Offline && contact(who) != myself() )
+		if( newStatus != m_protocol->Offline && oldStatus == m_protocol->Offline && contact(who) != myself() )
 		{
 			//m_session->requestBuddyIcon( who );           // Try to get Buddy Icon
 
 			if ( !myself()->property( Kopete::Global::Properties::self()->photo() ).isNull() &&
-					myself()->onlinetqStatus() != m_protocol->Invisible &&
+					myself()->onlineStatus() != m_protocol->Invisible &&
 					!kc->stealthed() )
 			{
 				kc->sendBuddyIconUpdate( m_session->pictureFlag() );
@@ -1020,19 +1020,19 @@ void YahooAccount::slotStatusChanged( const TQString &who, int stat, const TQStr
 			}
 		}
 
-		//if( newtqStatus == static_cast<YahooProtocol*>( m_protocol )->Idle ) {
-		if( newtqStatus == m_protocol->Idle )
+		//if( newStatus == static_cast<YahooProtocol*>( m_protocol )->Idle ) {
+		if( newStatus == m_protocol->Idle )
 			kc->setIdleTime( idle ? idle : 1 );
 		else
 			kc->setIdleTime( 0 );
 
-		kc->setOnlineStatus( newtqStatus );
+		kc->setOnlineStatus( newStatus );
 
 		slotGotBuddyIconChecksum( who, pictureChecksum );
 	}
 }
 
-void YahooAccount::slotStealthStatusChanged( const TQString &who, Yahoo::StealthtqStatus state )
+void YahooAccount::slotStealthStatusChanged( const TQString &who, Yahoo::StealthStatus state )
 {
 	//kdDebug(YAHOO_GEN_DEBUG) << "Stealth Status of " << who << "changed to " << state;
 
@@ -1053,7 +1053,7 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText )
 
 	kdDebug(YAHOO_GEN_DEBUG) << "Message after stripping color codes '" << newMsgText << "'" << endl;
 
-	newMsgText.replace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&amp;" ) );
+	newMsgText.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&amp;" ) );
 
 	// Replace Font tags
 	regExp.setMinimal( true );
@@ -1063,7 +1063,7 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText )
 		pos = regExp.search( newMsgText, pos );
 		if ( pos >= 0 ) {
 			pos += regExp.matchedLength();
-		newMsgText.replace( regExp, TQString::tqfromLatin1("<font\\1style=\"font-size:\\2pt\">" ) );
+		newMsgText.replace( regExp, TQString::fromLatin1("<font\\1style=\"font-size:\\2pt\">" ) );
 		}
 	}
 
@@ -1095,7 +1095,7 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText )
 		pos = regExp.search( newMsgText, pos );
 		if ( pos >= 0 ) {
 			pos += regExp.matchedLength();
-			newMsgText.replace( regExp, TQString::tqfromLatin1("&lt;" ) );
+			newMsgText.replace( regExp, TQString::fromLatin1("&lt;" ) );
 		}
 	}
 	regExp.setPattern( "([^\"bui])>" );
@@ -1104,22 +1104,22 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText )
 		pos = regExp.search( newMsgText, pos );
 		if ( pos >= 0 ) {
 			pos += regExp.matchedLength();
-			newMsgText.replace( regExp, TQString::tqfromLatin1("\\1&gt;" ) );
+			newMsgText.replace( regExp, TQString::fromLatin1("\\1&gt;" ) );
 		}
 	}
 
 	// add closing tags when needed
 	regExp.setMinimal( false );
 	regExp.setPattern( "(<b>.*)(?!</b>)" );
-	newMsgText.replace( regExp, TQString::tqfromLatin1("\\1</b>" ) );
+	newMsgText.replace( regExp, TQString::fromLatin1("\\1</b>" ) );
 	regExp.setPattern( "(<i>.*)(?!</i>)" );
-	newMsgText.replace( regExp, TQString::tqfromLatin1("\\1</i>" ) );
+	newMsgText.replace( regExp, TQString::fromLatin1("\\1</i>" ) );
 	regExp.setPattern( "(<u>.*)(?!</u>)" );
-	newMsgText.replace( regExp, TQString::tqfromLatin1("\\1</u>" ) );
+	newMsgText.replace( regExp, TQString::fromLatin1("\\1</u>" ) );
 	regExp.setPattern( "(<font.*)(?!</font>)" );
-	newMsgText.replace( regExp, TQString::tqfromLatin1("\\1</font>" ) );
+	newMsgText.replace( regExp, TQString::fromLatin1("\\1</font>" ) );
 
-	newMsgText.replace( TQString::tqfromLatin1( "\r" ), TQString::tqfromLatin1( "<br/>" ) );
+	newMsgText.replace( TQString::fromLatin1( "\r" ), TQString::fromLatin1( "<br/>" ) );
 
 	return newMsgText;
 }
@@ -1143,7 +1143,7 @@ void YahooAccount::slotGotIm( const TQString &who, const TQString &msg, long tm,
 
 	// FIXME to check
 	if (tm == 0)
-		//msgDT = TQDateTime( TQDate::tqcurrentDate(), TQTime::currentTime(), TQt::LocalTime );
+		//msgDT = TQDateTime( TQDate::currentDate(), TQTime::currentTime(), TQt::LocalTime );
 		msgDT.setTime_t(time(0L));
 	else
 		//msgDT = TQDateTime::fromTime_t(tm);
@@ -1181,7 +1181,7 @@ void YahooAccount::slotGotBuzz( const TQString &who, long tm )
 
 	// FIXME: to check
 	if (tm == 0)
-		//msgDT = TQDateTime( TQDate::tqcurrentDate(), TQTime::currentTime(), TQt::LocalTime );
+		//msgDT = TQDateTime( TQDate::currentDate(), TQTime::currentTime(), TQt::LocalTime );
 		msgDT.setTime_t(time(0L));
 	else
 		//msgDT = TQDateTime::fromTime_t(tm);
@@ -1642,7 +1642,7 @@ void YahooAccount::slotMailNotify( const TQString& from, const TQString&  subjec
 
 	if ( cnt > 0 && from.isEmpty() )
 	{
-		TQObject::connect(KNotification::event( TQString::tqfromLatin1("yahoo_mail"), i18n( "You have one unread message in your Yahoo inbox.",
+		TQObject::connect(KNotification::event( TQString::fromLatin1("yahoo_mail"), i18n( "You have one unread message in your Yahoo inbox.",
 			"You have %n unread messages in your Yahoo inbox.", cnt ), TQPixmap() , 0 ),
 			TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) );
 
@@ -1651,7 +1651,7 @@ void YahooAccount::slotMailNotify( const TQString& from, const TQString&  subjec
 	else if ( cnt > 0 )
 	{	kdDebug(YAHOO_GEN_DEBUG) << "attempting to trigger event" << endl;
 
-		TQObject::connect(KNotification::event( TQString::tqfromLatin1("yahoo_mail"), i18n( "You have a message from %1 in your Yahoo inbox. <br><br>Subject: %2").tqarg( from ).tqarg( subject ),
+		TQObject::connect(KNotification::event( TQString::fromLatin1("yahoo_mail"), i18n( "You have a message from %1 in your Yahoo inbox. <br><br>Subject: %2").tqarg( from ).tqarg( subject ),
 			TQPixmap() , 0 ), TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) );
 
 		m_currentMailCount = cnt;
@@ -1777,7 +1777,7 @@ void YahooAccount::setBuddyIcon( const KURL &url )
 		myself()->removeProperty( YahooProtocol::protocol()->iconExpire );
 
 		if ( m_session )
-			m_session->setPicturetqStatus( Yahoo::NoPicture );
+			m_session->setPictureStatus( Yahoo::NoPicture );
 	}
 	else
 	{
@@ -1827,7 +1827,7 @@ void YahooAccount::setBuddyIcon( const KURL &url )
 		configGroup()->writeEntry( "iconLocalUrl", newlocation );
 
 		if ( checksum != static_cast<uint>(myself()->property( YahooProtocol::protocol()->iconCheckSum ).value().toInt()) ||
-		     TQDateTime::tqcurrentDateTime().toTime_t() > expire )
+		     TQDateTime::currentDateTime().toTime_t() > expire )
 		{
 			myself()->setProperty( YahooProtocol::protocol()->iconCheckSum, checksum );
 			configGroup()->writeEntry( "iconCheckSum", checksum );
@@ -1848,7 +1848,7 @@ void YahooAccount::slotBuddyIconChanged( const TQString &url, int expires )
 		myself()->setProperty( YahooProtocol::protocol()->iconExpire , expires );
 		configGroup()->writeEntry( "iconRemoteUrl", url );
 		configGroup()->writeEntry( "iconExpire", expires );
-		m_session->setPicturetqStatus( Yahoo::Picture );
+		m_session->setPictureStatus( Yahoo::Picture );
 		m_session->sendPictureChecksum( TQString(), checksum );
 	}
 }
@@ -1928,52 +1928,52 @@ void YahooAccount::slotWebcamPaused( const TQString &who )
 void YahooAccount::setOnlineStatus( const Kopete::OnlineStatus &status, const TQString &reason)
 {
 	kdDebug(YAHOO_GEN_DEBUG) ;
-	if ( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline &&
+	if ( myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline &&
 	     status.status() != Kopete::OnlineStatus::Offline )
 	{
 		if( !reason.isEmpty() )
 			m_session->setStatusMessageOnConnect( reason );
 		connect( status );
 	}
-	else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline &&
+	else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline &&
 	          status.status() == Kopete::OnlineStatus::Offline )
 	{
 		disconnect();
 	}
-	else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline &&
+	else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline &&
 	          status.internalStatus() == 2 && !reason.isEmpty())
 	{
-		slotGotqStatus( 99, reason );
+		slotGoStatus( 99, reason );
 	}
-	else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline &&
+	else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline &&
 	          status.internalStatus() == 99 && reason.isEmpty())
 	{
-		slotGotqStatus( 2, reason );
+		slotGoStatus( 2, reason );
 	}
-	else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline )
+	else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline )
 	{
-		slotGotqStatus( status.internalStatus(), reason );
+		slotGoStatus( status.internalStatus(), reason );
 	}
 }
 
 /* FIXME: not ported yet
 void YahooAccount::setStatusMessage(const Kopete::StatusMessage &statusMessage)
 {
-	int currenttqStatus = myself()->onlinetqStatus().internalStatus();
-	m_session->changetqStatus( Yahoo::tqStatus( currenttqStatus ), statusMessage.message(),
-	                         (currenttqStatus == Yahoo::StatusAvailable)? Yahoo::StatusTypeAvailable : Yahoo::StatusTypeAway );
+	int currentStatus = myself()->onlineStatus().internalStatus();
+	m_session->changeStatus( Yahoo::Status( currentStatus ), statusMessage.message(),
+	                         (currentStatus == Yahoo::StatusAvailable)? Yahoo::StatusTypeAvailable : Yahoo::StatusTypeAway );
 	myself()->setStatusMessage( statusMessage );
 }
 */
 
 void YahooAccount::slotOpenInbox()
 {
-	KRun::runURL( KURL( TQString::tqfromLatin1("http://mail.yahoo.com/") ) , "text/html" );
+	KRun::runURL( KURL( TQString::fromLatin1("http://mail.yahoo.com/") ) , "text/html" );
 }
 
 void YahooAccount::slotOpenYAB()
 {
-	KRun::runURL( KURL( TQString::tqfromLatin1("http://address.yahoo.com/") ) , "text/html" );
+	KRun::runURL( KURL( TQString::fromLatin1("http://address.yahoo.com/") ) , "text/html" );
 }
 
 void YahooAccount::slotEditOwnYABEntry()
diff --git a/kopete/protocols/yahoo/yahooaccount.h b/kopete/protocols/yahoo/yahooaccount.h
index 7cfc6f84..de647bbe 100644
--- a/kopete/protocols/yahoo/yahooaccount.h
+++ b/kopete/protocols/yahoo/yahooaccount.h
@@ -176,7 +176,7 @@ protected slots:
 	void slotJoinChatRoom();
 	void slotChatCategorySelected( const Yahoo::ChatCategory &category );
 
-	void slotGotqStatus(int status, const TQString &awayMessage = TQString());
+	void slotGoStatus(int status, const TQString &awayMessage = TQString());
 	void slotLoginResponse(int succ, const TQString &url);
 	void slotDisconnected();
 	void slotLoginFailed();
@@ -192,7 +192,7 @@ protected slots:
 	void slotGotIgnore(const TQStringList &);
 	void slotGotIdentities(const TQStringList &);
 	void slotStatusChanged(const TQString &who, int stat, const TQString &msg, int away, int idle, int pictureChecksum);
-	void slotStealthStatusChanged(const TQString &who, Yahoo::StealthtqStatus state);
+	void slotStealthStatusChanged(const TQString &who, Yahoo::StealthStatus state);
 	void slotGotIm(const TQString &who, const TQString &msg, long tm, int stat);
 	void slotGotBuzz(const TQString &who, long tm);
 	void slotGotConfInvite(const TQString &who, const TQString &room, const TQString &msg, const TQStringList &members);
diff --git a/kopete/protocols/yahoo/yahoochatsession.cpp b/kopete/protocols/yahoo/yahoochatsession.cpp
index ef0bf09e..5402919c 100644
--- a/kopete/protocols/yahoo/yahoochatsession.cpp
+++ b/kopete/protocols/yahoo/yahoochatsession.cpp
@@ -127,7 +127,7 @@ void YahooChatSession::slotDisplayPictureChanged()
 			int sz=22;
 			// get the size of the toolbar were the aciton is plugged.
 			//  if you know a better way to get the toolbar, let me know
-			KMainWindow *w= view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : 0L;
+			KMainWindow *w= view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 0L;
 			if(w)
 			{
 				//We connected that in the constructor.  we don't need to keep this slot active.
diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp
index 06559f8f..f74fd1b6 100644
--- a/kopete/protocols/yahoo/yahoocontact.cpp
+++ b/kopete/protocols/yahoo/yahoocontact.cpp
@@ -128,7 +128,7 @@ void YahooContact::setOnlineStatus(const Kopete::OnlineStatus &status)
 void YahooContact::setStealthed( bool stealthed )
 {
 	m_stealthed = stealthed;
-	setOnlineStatus( onlinetqStatus() );
+	setOnlineStatus( onlineStatus() );
 }
 
 bool YahooContact::stealthed()
@@ -187,7 +187,7 @@ void YahooContact::sync(unsigned int flags)
 bool YahooContact::isOnline() const
 {
 	//kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
-	return onlinetqStatus().status() != Kopete::OnlineStatus::Offline && onlinetqStatus().status() != Kopete::OnlineStatus::Unknown;
+	return onlineStatus().status() != Kopete::OnlineStatus::Offline && onlineStatus().status() != Kopete::OnlineStatus::Unknown;
 }
 
 bool YahooContact::isReachable()
@@ -232,7 +232,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText )
 		pos = regExp.search( messageText, pos );
 		if ( pos >= 0 ) {
 			pos += regExp.matchedLength();
-		newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1font-weight:600\\2>\033[1m\\3\033[x1m</span>" ) );
+		newMsg.replace( regExp, TQString::fromLatin1("<span\\1font-weight:600\\2>\033[1m\\3\033[x1m</span>" ) );
 		}
 	}
 
@@ -243,7 +243,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText )
 		pos = regExp.search( messageText, pos );
 		if ( pos >= 0 ) {
 			pos += regExp.matchedLength();
-		newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1text-decoration:underline\\2>\033[4m\\3\033[x4m</span>" ) );
+		newMsg.replace( regExp, TQString::fromLatin1("<span\\1text-decoration:underline\\2>\033[4m\\3\033[x4m</span>" ) );
 		}
 	}
 
@@ -254,7 +254,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText )
 		pos = regExp.search( messageText, pos );
 		if ( pos >= 0 ) {
 			pos += regExp.matchedLength();
-		newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1font-style:italic\\2>\033[2m\\3\033[x2m</span>" ) );
+		newMsg.replace( regExp, TQString::fromLatin1("<span\\1font-style:italic\\2>\033[2m\\3\033[x2m</span>" ) );
 		}
 	}
 
@@ -265,7 +265,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText )
 		pos = regExp.search( messageText, pos );
 		if ( pos >= 0 ) {
 			pos += regExp.matchedLength();
-			newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1\\3>\033[#\\2m\\4\033[#000000m</span>" ) );
+			newMsg.replace( regExp, TQString::fromLatin1("<span\\1\\3>\033[#\\2m\\4\033[#000000m</span>" ) );
 		}
 	}
 
@@ -276,7 +276,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText )
 		pos = regExp.search( messageText, pos );
 		if ( pos >= 0 ) {
 			pos += regExp.matchedLength();
-			newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1\\3><font face=\"\\2\">\\4</span>" ) );
+			newMsg.replace( regExp, TQString::fromLatin1("<span\\1\\3><font face=\"\\2\">\\4</span>" ) );
 		}
 	}
 
@@ -287,7 +287,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText )
 		pos = regExp.search( messageText, pos );
 		if ( pos >= 0 ) {
 			pos += regExp.matchedLength();
-			newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1\\3><font size=\"\\2\">\\4</span>" ) );
+			newMsg.replace( regExp, TQString::fromLatin1("<span\\1\\3><font size=\"\\2\">\\4</span>" ) );
 		}
 	}
 
@@ -298,18 +298,18 @@ TQString YahooContact::prepareMessage( const TQString &messageText )
 		pos = regExp.search( messageText, pos );
 		if ( pos >= 0 ) {
 			pos += regExp.matchedLength();
-			newMsg.replace( regExp, TQString::tqfromLatin1("\\2") );
+			newMsg.replace( regExp, TQString::fromLatin1("\\2") );
 		}
 	}
 
 	// convert escaped chars
-	newMsg.replace( TQString::tqfromLatin1( "&gt;" ), TQString::tqfromLatin1( ">" ) );
-	newMsg.replace( TQString::tqfromLatin1( "&lt;" ), TQString::tqfromLatin1( "<" ) );
-	newMsg.replace( TQString::tqfromLatin1( "&quot;" ), TQString::tqfromLatin1( "\"" ) );
-	newMsg.replace( TQString::tqfromLatin1( "&nbsp;" ), TQString::tqfromLatin1( " " ) );
-	newMsg.replace( TQString::tqfromLatin1( "&amp;" ), TQString::tqfromLatin1( "&" ) );
-	newMsg.replace( TQString::tqfromLatin1( "<br />" ), TQString::tqfromLatin1( "\r" ) );
-	newMsg.replace( TQString::tqfromLatin1( "<br/>" ), TQString::tqfromLatin1( "\r" ) );
+	newMsg.replace( TQString::fromLatin1( "&gt;" ), TQString::fromLatin1( ">" ) );
+	newMsg.replace( TQString::fromLatin1( "&lt;" ), TQString::fromLatin1( "<" ) );
+	newMsg.replace( TQString::fromLatin1( "&quot;" ), TQString::fromLatin1( "\"" ) );
+	newMsg.replace( TQString::fromLatin1( "&nbsp;" ), TQString::fromLatin1( " " ) );
+	newMsg.replace( TQString::fromLatin1( "&amp;" ), TQString::fromLatin1( "&" ) );
+	newMsg.replace( TQString::fromLatin1( "<br />" ), TQString::fromLatin1( "\r" ) );
+	newMsg.replace( TQString::fromLatin1( "<br/>" ), TQString::fromLatin1( "\r" ) );
 
 	return newMsg;
 }
@@ -447,7 +447,7 @@ void YahooContact::slotUserProfile()
 {
 	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
 
-	TQString profileSiteString = TQString::tqfromLatin1("http://profiles.yahoo.com/") + userId();
+	TQString profileSiteString = TQString::fromLatin1("http://profiles.yahoo.com/") + userId();
 	KRun::runURL( KURL( profileSiteString ) , "text/html" );
 }
 
@@ -467,7 +467,7 @@ void YahooContact::stealthContact()
 	stealthSettingDialog->setMainWidget( stealthWidget );
 
 	// Prepare dialog
-	if( m_account->myself()->onlinetqStatus() == YahooProtocol::protocol()->Invisible )
+	if( m_account->myself()->onlineStatus() == YahooProtocol::protocol()->Invisible )
 	{
 		stealthWidget->radioOffline->setEnabled( true );
 		stealthWidget->radioOffline->setChecked( true );
@@ -490,7 +490,7 @@ void YahooContact::stealthContact()
 		m_account->yahooSession()->stealthContact( m_userId, Yahoo::StealthPermOffline, Yahoo::StealthActive );
 
 	// Apply temporary setting
-	if( m_account->myself()->onlinetqStatus() == YahooProtocol::protocol()->Invisible )
+	if( m_account->myself()->onlineStatus() == YahooProtocol::protocol()->Invisible )
 	{
 		if( stealthWidget->radioOnline->isChecked() )
 		{
diff --git a/kopete/protocols/yahoo/yahoocontact.h b/kopete/protocols/yahoo/yahoocontact.h
index e9f8b517..acd69e0d 100644
--- a/kopete/protocols/yahoo/yahoocontact.h
+++ b/kopete/protocols/yahoo/yahoocontact.h
@@ -54,7 +54,7 @@ public:
 	virtual void serialize( TQMap<TQString, TQString> &serializedData, TQMap<TQString, TQString> &addressBookData );
 
 	void setOnlineStatus(const Kopete::OnlineStatus &status);
-	void setYahootqStatus( const Kopete::OnlineStatus& );
+	void setYahooStatus( const Kopete::OnlineStatus& );
 	void setStealthed( bool );
 	bool stealthed();