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

This reverts commit 808e453c56036211f57482ed847d54aca01bba68.

1 files changed, 6 insertions, 6 deletions

diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
index 90245b29..8c85705c 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 = InitialStatus;
+	info.status = InitialtqStatus;
 	info.dataLength = 0;
 	info.buffer = 0L;
 	info.headerRead = false;
@@ -135,7 +135,7 @@ void WebcamTask::slotConnectionStage1Established()
 	if( socketMap[socket].direction == Incoming )
 	{
 		socket->writeBlock( TQCString("<RVWCFG>").data(), 8 );
-		s = TQString("g=%1\r\n").arg(socketMap[socket].sender);
+		s = TQString("g=%1\r\n").tqarg(socketMap[socket].sender);
 	}
 	else
 	{
@@ -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")
-			.arg(client()->userId()).arg(socketMap[socket].key).arg(socketMap[socket].sender);
+			.tqarg(client()->userId()).tqarg(socketMap[socket].key).tqarg(socketMap[socket].sender);
 		// Header: 08 00 01 00 00 00 00
 		stream << (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")
-		.arg(client()->userId()).arg(socketMap[socket].key).arg(socket->localAddress().nodeName());
+		.tqarg(client()->userId()).tqarg(socketMap[socket].key).tqarg(socket->localAddress().nodeName());
 		// Header: 08 00 05 00 00 00 00	01 00 00 00 01
 		stream << (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.")
-                        .arg(socketMap[socket].sender), TQString("%1 - %2").arg(error).arg( socket->KSocketBase::errorString()), Client::Error );
+                        .tqarg(socketMap[socket].sender), TQString("%1 - %2").tqarg(error).tqarg( 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").arg(userId);
+	TQString user = TQString("u=%1").tqarg(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;