1 files changed, 16 insertions, 16 deletions

diff --git a/kopete/protocols/oscar/liboscar/messagereceivertask.cpp b/kopete/protocols/oscar/liboscar/messagereceivertask.cpp
index 2db05eb1..0dd26e3d 100644
--- a/kopete/protocols/oscar/liboscar/messagereceivertask.cpp
+++ b/kopete/protocols/oscar/liboscar/messagereceivertask.cpp
@@ -16,7 +16,7 @@
 
 #include "messagereceivertask.h"
 
-#include <qtextcodec.h>
+#include <tqtextcodec.h>
 #include <kdebug.h>
 #include "transfer.h"
 #include "buffer.h"
@@ -109,7 +109,7 @@ bool MessageReceiverTask::take( Transfer* transfer )
 		else
 		{
 			int screenNameLength = b->getByte();
-			m_fromUser = QString( b->getBlock( screenNameLength ) );
+			m_fromUser = TQString( b->getBlock( screenNameLength ) );
 			setTransfer( transfer );
 			handleAutoResponse();
 			setTransfer( 0 );
@@ -122,7 +122,7 @@ bool MessageReceiverTask::take( Transfer* transfer )
 void MessageReceiverTask::handleType1Message()
 {
 	Oscar::Message msg;
-	QValueList<TLV> messageTLVList = transfer()->buffer()->getTLVList();
+	TQValueList<TLV> messageTLVList = transfer()->buffer()->getTLVList();
 	TLV t = Oscar::findTLV( messageTLVList, 0x0002 );
 	if ( !t )
 	{
@@ -130,8 +130,8 @@ void MessageReceiverTask::handleType1Message()
 		return;
 	}
 	Buffer messageBuffer( t.data );
-	QValueList<TLV> innerTLVList = messageBuffer.getTLVList();
-	QValueList<TLV>::iterator it = innerTLVList.begin(), listEnd = innerTLVList.end();
+	TQValueList<TLV> innerTLVList = messageBuffer.getTLVList();
+	TQValueList<TLV>::iterator it = innerTLVList.begin(), listEnd = innerTLVList.end();
 	for ( ; (*it); ++it )
 	{
 		switch ( ( *it ).type )
@@ -154,7 +154,7 @@ void MessageReceiverTask::handleType1Message()
 
 			//message length is buffer length - length of ( charset + subcharset ) */
 			int msgLength = ( *it ).length - 4;
-			QByteArray msgArray( message.getBlock( msgLength ) );
+			TQByteArray msgArray( message.getBlock( msgLength ) );
 			msg.setTextArray( msgArray );
 
 			break;
@@ -176,7 +176,7 @@ void MessageReceiverTask::handleType1Message()
 
 	msg.setSender( m_fromUser );
 	msg.setReceiver( client()->userId() );
-	msg.setTimestamp( QDateTime::currentDateTime() );
+	msg.setTimestamp( TQDateTime::currentDateTime() );
 	msg.setType( 0x01 );
 
 	emit receivedMessage( msg );
@@ -187,7 +187,7 @@ void MessageReceiverTask::handleType2Message()
 	kdDebug(14151) << k_funcinfo << "Received Type 2 message. Trying to handle it..." << endl;
 
 	Oscar::Message msg;
-	QValueList<TLV> messageTLVList = transfer()->buffer()->getTLVList();
+	TQValueList<TLV> messageTLVList = transfer()->buffer()->getTLVList();
 	TLV t = Oscar::findTLV( messageTLVList, 0x0005 );
 	if ( !t )
 	{
@@ -280,7 +280,7 @@ void MessageReceiverTask::handleType4Message()
 	Buffer tlv5buffer(tlv5.data, tlv5.length);
 
 	DWORD uin = tlv5buffer.getLEDWord(); // little endian for no sane reason!
-	if ( QString::number(uin) != m_fromUser )
+	if ( TQString::number(uin) != m_fromUser )
 		kdWarning(14151) << k_funcinfo << "message uin does not match uin found in packet header!" << endl;
 
 	BYTE msgType = tlv5buffer.getByte();
@@ -291,7 +291,7 @@ void MessageReceiverTask::handleType4Message()
 
 	//handle the special user types
 	Oscar::Message msg;
-	QString msgSender;
+	TQString msgSender;
 	switch ( msgType )
 	{
 	case 0x0D:
@@ -307,7 +307,7 @@ void MessageReceiverTask::handleType4Message()
 		break;
 	};
 
-	QCString msgText = tlv5buffer.getLNTS();
+	TQCString msgText = tlv5buffer.getLNTS();
 	int msgLength = msgText.size();
 	if ( msgType == 0x0D || msgType == 0x0E )
 	{
@@ -332,7 +332,7 @@ void MessageReceiverTask::handleType4Message()
 	}
 
 	msg.setType( 0x04 );
-	msg.setTimestamp( QDateTime::currentDateTime() );
+	msg.setTimestamp( TQDateTime::currentDateTime() );
 	msg.setSender( msgSender );
 	msg.setReceiver( client()->userId() );
 	msg.setEncoding( Oscar::Message::UserDefined );
@@ -404,7 +404,7 @@ void MessageReceiverTask::parseRendezvousData( Buffer* b, Oscar::Message* msg )
 
 		kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Message type is: " << messageType << endl;
 		
-		QCString msgText( b->getLELNTS() );
+		TQCString msgText( b->getLELNTS() );
 		Oscar::Message::Encoding encoding = Oscar::Message::UserDefined;
 		int fgcolor = 0x00000000;
 		int bgcolor = 0x00ffffff;
@@ -421,7 +421,7 @@ void MessageReceiverTask::parseRendezvousData( Buffer* b, Oscar::Message* msg )
 				if ( b->length() < capLength )
 					break;
 
-				QByteArray cap( b->getBlock( capLength ) );
+				TQByteArray cap( b->getBlock( capLength ) );
 				if ( qstrncmp ( cap.data(), "{0946134E-4C7F-11D1-8222-444553540000}", capLength ) == 0 )
 					encoding = Oscar::Message::UTF8;
 			}
@@ -437,7 +437,7 @@ void MessageReceiverTask::parseRendezvousData( Buffer* b, Oscar::Message* msg )
 		
 		msg->setSender( m_fromUser );
 		msg->setReceiver( client()->userId() );
-		msg->setTimestamp( QDateTime::currentDateTime() );
+		msg->setTimestamp( TQDateTime::currentDateTime() );
 		msg->setType( 0x02 );
 		msg->setIcbmCookie( m_icbmCookie );
 		msg->setProtocolVersion( protocolVersion );
@@ -451,7 +451,7 @@ void MessageReceiverTask::parseRendezvousData( Buffer* b, Oscar::Message* msg )
 	}
 }
 
-QTextCodec* MessageReceiverTask::guessCodec( const QCString& string )
+TQTextCodec* MessageReceiverTask::guessCodec( const TQCString& string )
 {
 	Q_UNUSED( string );
 	return 0;