Rename old tq methods that no longer need a unique name

1 files changed, 23 insertions, 23 deletions

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& ) ),