TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

53 files changed, 745 insertions, 722 deletions

diff --git a/kopete/protocols/msn/config/msnpreferences.cpp b/kopete/protocols/msn/config/msnpreferences.cpp
index a6f5371f..6366e849 100644
--- a/kopete/protocols/msn/config/msnpreferences.cpp
+++ b/kopete/protocols/msn/config/msnpreferences.cpp
@@ -26,7 +26,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kopete_msn, MSNProtocolConfigFactory( "kcm_kopet
 class MSNPreferences : public KCAutoConfigModule
 {
 public:
-	MSNPreferences( TQWidget *parent = 0, const char * = 0, const TQStringList &args = TQStringList() ) : KCAutoConfigModule( MSNProtocolConfigFactory::instance(), parent, args )
+	MSNPreferences( TQWidget *tqparent = 0, const char * = 0, const TQStringList &args = TQStringList() ) : KCAutoConfigModule( MSNProtocolConfigFactory::instance(), tqparent, args )
 	{
 		setMainWidget( new msnPrefsUI( this ) , "MSN");
 	}
diff --git a/kopete/protocols/msn/config/msnprefs.ui b/kopete/protocols/msn/config/msnprefs.ui
index c9321a60..e6d95217 100644
--- a/kopete/protocols/msn/config/msnprefs.ui
+++ b/kopete/protocols/msn/config/msnprefs.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>msnPrefsUI</class>
 <author>Duncan Mac-Vicar P.</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>msnPrefsUI</cstring>
     </property>
@@ -17,7 +17,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>TextLabel3_2_2_2_3</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <string>General</string>
             </property>
         </widget>
-        <widget class="QFrame">
+        <widget class="TQFrame">
             <property name="name">
                 <cstring>Frame3_3_3_2_3</cstring>
             </property>
@@ -49,7 +49,7 @@
                 <enum>Sunken</enum>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>NotifyNewChat</cstring>
             </property>
@@ -57,7 +57,7 @@
                 <string>&amp;Automatically open a chat window when someone starts a conversation</string>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>AutoDownloadPicture</cstring>
             </property>
@@ -68,7 +68,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>useCustomEmoticons</cstring>
             </property>
@@ -76,7 +76,7 @@
                 <string>Download and show custom emoticons (experimental)</string>
             </property>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>TextLabel1_3_3_3</cstring>
             </property>
@@ -84,7 +84,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>TextLabel3_2_2_2_2</cstring>
             </property>
@@ -97,7 +97,7 @@
                 <string>Away Messages</string>
             </property>
         </widget>
-        <widget class="QFrame">
+        <widget class="TQFrame">
             <property name="name">
                 <cstring>Frame3_3_3_2_2</cstring>
             </property>
@@ -116,7 +116,7 @@
                 <enum>Sunken</enum>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>SendAwayMessages</cstring>
             </property>
@@ -135,15 +135,15 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout18</cstring>
+                <cstring>tqlayout18</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel3</cstring>
                     </property>
@@ -162,7 +162,7 @@
                         <number>1</number>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel4</cstring>
                     </property>
@@ -182,7 +182,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>70</height>
@@ -209,7 +209,7 @@
 <includes>
     <include location="global" impldecl="in implementation">knuminput.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kopete/protocols/msn/dispatcher.cpp b/kopete/protocols/msn/dispatcher.cpp
index fb88e8bc..91f3361a 100644
--- a/kopete/protocols/msn/dispatcher.cpp
+++ b/kopete/protocols/msn/dispatcher.cpp
@@ -36,7 +36,7 @@ using P2P::OutgoingTransfer;
 #include <kstandarddirs.h>
 #include <ktempfile.h>
 
-// Qt includes
+// TQt includes
 #include <tqdatastream.h>
 #include <tqfile.h>
 #include <tqregexp.h>
@@ -50,8 +50,8 @@ using P2P::OutgoingTransfer;
 
 #include <stdlib.h>
 
-Dispatcher::Dispatcher(TQObject *parent, const TQString& contact, const TQStringList &ip)
-	: TQObject(parent) ,  m_contact(contact) , m_callbackChannel(0l) , m_ip(ip)
+Dispatcher::Dispatcher(TQObject *tqparent, const TQString& contact, const TQStringList &ip)
+	: TQObject(tqparent) ,  m_contact(contact) , m_callbackChannel(0l) , m_ip(ip)
 {}
 
 Dispatcher::~Dispatcher()
@@ -78,7 +78,7 @@ TQString Dispatcher::localContact()
 
 void Dispatcher::requestDisplayIcon(const TQString& from, const TQString& msnObject)
 {
-	Q_UINT32 sessionId = rand()%0xFFFFFF00 + 4;
+	TQ_UINT32 sessionId = rand()%0xFFFFFF00 + 4;
 	TransferContext* current =
 		new IncomingTransfer(from, this, sessionId);
 
@@ -94,7 +94,7 @@ void Dispatcher::requestDisplayIcon(const TQString& from, const TQString& msnObj
 	TQString context = TQString::fromUtf8(KCodecs::base64Encode(msnObject.utf8()));
 	// NOTE remove the \0 character automatically
 	// appended to a TQCString.
-	context.replace("=", TQString::null);
+	context.tqreplace("=", TQString());
 	TQString content =
 			"EUF-GUID: {A4268EEC-FEC5-49E5-95C3-F126696BDBF6}\r\n"
 			"SessionID: " + TQString::number(sessionId) + "\r\n"
@@ -105,11 +105,11 @@ void Dispatcher::requestDisplayIcon(const TQString& from, const TQString& msnObj
 	current->sendMessage(INVITE, content);
 }
 
-void Dispatcher::sendFile(const TQString& path, Q_INT64 fileSize, const TQString& to)
+void Dispatcher::sendFile(const TQString& path, TQ_INT64 fileSize, const TQString& to)
 {
 	// Create a new transfer context that will handle
 	// the file transfer.
-	Q_UINT32 sessionId = rand()%0xFFFFFF00 + 4;
+	TQ_UINT32 sessionId = rand()%0xFFFFFF00 + 4;
 	TransferContext *current =
 		new OutgoingTransfer(to, this, sessionId);
 	current->m_branch = P2P::Uid::createUid();
@@ -129,26 +129,26 @@ void Dispatcher::sendFile(const TQString& path, Q_INT64 fileSize, const TQString
 	writer.setByteOrder(TQDataStream::LittleEndian);
 
 	// Write the header length to the stream.
-	writer << (Q_INT32)638;
+	writer << (TQ_INT32)638;
 	// Write client version to the stream.
-	writer << (Q_INT32)3;
+	writer << (TQ_INT32)3;
 	// Write the file size to the stream.
 	writer << fileSize;
 	// Write the file transfer flag to the stream.
 	// TODO support file preview. For now disable file preview.
-	writer << (Q_INT32)1;
+	writer << (TQ_INT32)1;
 	// Write the file name in utf-16 to the stream.
 	TQTextStream ts(header, IO_WriteOnly);
 	ts.setEncoding(TQTextStream::RawUnicode);
-	ts.device()->at(20);
+	ts.tqdevice()->tqat(20);
 	ts << path.section('/', -1);
 	// NOTE Background Sharing base64 [540..569]
 	// TODO add support for background sharing.
 	// Write file exchange type to the stream.
 	// NOTE File - 0xFFFFFFFF
 	// NOTE Background Sharing - 0xFFFFFFFE
-	writer.device()->at(570);
-	writer << (Q_UINT32)0xFFFFFFFF;
+	writer.tqdevice()->tqat(570);
+	writer << (TQ_UINT32)0xFFFFFFFF;
 
 	// Encode the file context header to base64 encoding.
 	context = TQString::fromUtf8(KCodecs::base64Encode(header));
@@ -182,7 +182,7 @@ void Dispatcher::sendImage(const TQString& /*fileName*/, const TQString& /*to*/)
 #if MSN_WEBCAM
 void Dispatcher::startWebcam(const TQString &/*myHandle*/, const TQString &msgHandle, bool wantToReceive)
 {
-	Q_UINT32 sessionId = rand()%0xFFFFFF00 + 4;
+	TQ_UINT32 sessionId = rand()%0xFFFFFF00 + 4;
 	Webcam::Who who= wantToReceive ? Webcam::wViewer : Webcam::wProducer;
 	TransferContext* current =
 			new Webcam(who, msgHandle, this, sessionId);
@@ -200,7 +200,7 @@ void Dispatcher::startWebcam(const TQString &/*myHandle*/, const TQString &msgHa
 	TQString content="EUF-GUID: {"+GUID+"}\r\n"
 			"SessionID: "+ TQString::number(sessionId)+"\r\n"
 			"AppID: 4\r\n"
-			"Context: ewBCADgAQgBFADcAMABEAEUALQBFADIAQwBBAC0ANAA0ADAAMAAtAEEARQAwADMALQA4ADgARgBGADgANQBCADkARgA0AEUAOAB9AA==\r\n\r\n";
+			"Context: ewBCADgAQgBFADcAMABEAEUALTQBFADIAQwBBAC0ANAA0ADAAMAAtAEEARTQAwADMALQA4ADgARgBGADgANTQBCADkARgA0AEUAOAB9AA==\r\n\r\n";
 
         // context is the base64 of the utf16 of {B8BE70DE-E2CA-4400-AE03-88FF85B9F4E8}
 
@@ -222,7 +222,7 @@ void Dispatcher::slotReadMessage(const TQString &from, const TQByteArray& stream
 		if((receivedMessage.header.dataSize == 0)/* && ((receivedMessage.header.flag & 0x02) == 0x02)*/)
 		{
 			TransferContext *current = 0l;
-			TQMap<Q_UINT32, TransferContext*>::Iterator it = m_sessions.begin();
+			TQMap<TQ_UINT32, TransferContext*>::Iterator it = m_sessions.begin();
 			for(; it != m_sessions.end(); it++)
 			{
 				if(receivedMessage.header.ackSessionIdentifier == it.data()->m_identifier){
@@ -247,10 +247,10 @@ void Dispatcher::slotReadMessage(const TQString &from, const TQByteArray& stream
 			return;
 		}
 
-		if(m_messageBuffer.contains(receivedMessage.header.identifier))
+		if(m_messageBuffer.tqcontains(receivedMessage.header.identifier))
 		{
 			kdDebug(14140) << k_funcinfo
-				<< TQString("retrieving buffered messsage, %1").arg(receivedMessage.header.identifier)
+				<< TQString("retrieving buffered messsage, %1").tqarg(receivedMessage.header.identifier)
 				<< endl;
 
 			// The message was split, try to reconstruct the message
@@ -260,7 +260,7 @@ void Dispatcher::slotReadMessage(const TQString &from, const TQByteArray& stream
 			m_messageBuffer.remove(receivedMessage.header.identifier);
 
 			bufferedMessage.body.resize(bufferedMessage.body.size() + receivedMessage.header.dataSize);
-			for(Q_UINT32 i=0; i < receivedMessage.header.dataSize; i++){
+			for(TQ_UINT32 i=0; i < receivedMessage.header.dataSize; i++){
 				// Add the remaining message data to the buffered message.
 				bufferedMessage.body[receivedMessage.header.dataOffset + i] = receivedMessage.body[i];
 			}
@@ -282,7 +282,7 @@ void Dispatcher::dispatch(const P2P::Message& message)
 
 	if(message.header.sessionId > 0)
 	{
-		if(m_sessions.contains(message.header.sessionId)){
+		if(m_sessions.tqcontains(message.header.sessionId)){
 			messageHandler = m_sessions[message.header.sessionId];
 		}
 	}
@@ -293,8 +293,8 @@ void Dispatcher::dispatch(const P2P::Message& message)
 		TQRegExp regex("SessionID: ([0-9]*)\r\n");
 		if(regex.search(body) > 0)
 		{
-			Q_UINT32 sessionId = regex.cap(1).toUInt();
-			if(m_sessions.contains(sessionId)){
+			TQ_UINT32 sessionId = regex.cap(1).toUInt();
+			if(m_sessions.tqcontains(sessionId)){
 				// Retrieve the message handler associated with the specified session Id.
 				messageHandler = m_sessions[sessionId];
 			}
@@ -303,7 +303,7 @@ void Dispatcher::dispatch(const P2P::Message& message)
 		{
 			// Otherwise, try to retrieve the message handler
 			// based on the acknowlegded unique identifier.
-			if(m_sessions.contains(message.header.ackUniqueIdentifier)){
+			if(m_sessions.tqcontains(message.header.ackUniqueIdentifier)){
 				messageHandler =
 					m_sessions[message.header.ackUniqueIdentifier];
 			}
@@ -317,7 +317,7 @@ void Dispatcher::dispatch(const P2P::Message& message)
 				TQString callId = regex.cap(1);
 
 				TransferContext *current = 0l;
-				TQMap<Q_UINT32, TransferContext*>::Iterator it = m_sessions.begin();
+				TQMap<TQ_UINT32, TransferContext*>::Iterator it = m_sessions.begin();
 				for(; it != m_sessions.end(); it++)
 				{
 					current = it.data();
@@ -347,7 +347,7 @@ void Dispatcher::dispatch(const P2P::Message& message)
 			// The entire message has not been received;
 			// buffer the recevied portion of the original message.
 			kdDebug(14140) << k_funcinfo
-				<< TQString("Buffering messsage, %1").arg(message.header.identifier)
+				<< TQString("Buffering messsage, %1").tqarg(message.header.identifier)
 				<< endl;
 			m_messageBuffer.insert(message.header.identifier, message);
 			return;
@@ -380,7 +380,7 @@ void Dispatcher::dispatch(const P2P::Message& message)
 			// is being requested.
 			regex = TQRegExp("AppID: ([0-9]*)\r\n");
 			regex.search(body);
-			Q_UINT32 applicationId = regex.cap(1).toUInt();
+			TQ_UINT32 applicationId = regex.cap(1).toUInt();
 
 			if(applicationId == 1  || applicationId == 11 || applicationId == 12 )
 			{                         //the AppID is 12 since Messenger 7.5
@@ -407,7 +407,7 @@ void Dispatcher::dispatch(const P2P::Message& message)
 				m_sessions.insert(sessionId.toUInt(), current);
 
 				// Determine the display icon being requested.
-				TQString fileName = objectList.contains(msnobj)
+				TQString fileName = objectList.tqcontains(msnobj)
 				    ? objectList[msnobj]
 					: m_pictureUrl;
 				TQFile *source = new TQFile(fileName);
@@ -427,7 +427,7 @@ void Dispatcher::dispatch(const P2P::Message& message)
 				current->m_ackSessionIdentifier = message.header.identifier;
     			current->m_ackUniqueIdentifier = message.header.ackSessionIdentifier;
 				// Send a 200 OK message to the recipient.
-				TQString content = TQString("SessionID: %1\r\n\r\n").arg(sessionId);
+				TQString content = TQString("SessionID: %1\r\n\r\n").tqarg(sessionId);
 				current->sendMessage(OK, content);
 			}
 			else if(applicationId == 2)
@@ -457,14 +457,14 @@ void Dispatcher::dispatch(const P2P::Message& message)
 				reader.setByteOrder(TQDataStream::LittleEndian);
 				//Retrieve the file info from the context field.
 				// File Size [8..15] Int64
-				reader.device()->at(8);
-				Q_INT64 fileSize;
+				reader.tqdevice()->tqat(8);
+				TQ_INT64 fileSize;
 				reader >> fileSize;
 				// Flag [15..18] Int32
 				// 0x00 File transfer with preview data.
 				// 0x01 File transfer without preview data.
 				// 0x02 Background sharing.
-				Q_INT32 flag;
+				TQ_INT32 flag;
 				reader >> flag;
 				kdDebug(14140) << flag << endl;
 				// FileName UTF16 (Unicode) [19..539]
@@ -478,7 +478,7 @@ void Dispatcher::dispatch(const P2P::Message& message)
 				emit incomingTransfer(from, fileName, fileSize);
 
    				kdDebug(14140) <<
-   					TQString("%1, %2 bytes.").arg(fileName, TQString::number(fileSize))
+   					TQString("%1, %2 bytes.").tqarg(fileName, TQString::number(fileSize))
    					<< endl
    					<< endl;
 
@@ -497,7 +497,7 @@ void Dispatcher::dispatch(const P2P::Message& message)
 					TQObject::connect(Kopete::TransferManager::transferManager(), TQT_SIGNAL(refused(const Kopete::FileTransferInfo&)), transfer, TQT_SLOT(slotTransferRefused(const Kopete::FileTransferInfo&)));
 
 					// Show the file transfer accept/decline dialog.
-					Kopete::TransferManager::transferManager()->askIncomingTransfer(contact, fileName, fileSize, TQString::null, sessionId);
+					Kopete::TransferManager::transferManager()->askIncomingTransfer(contact, fileName, fileSize, TQString(), sessionId);
 				}
 				else
 				{
@@ -551,7 +551,7 @@ void Dispatcher::dispatch(const P2P::Message& message)
 			// A contact has sent an inkformat (handwriting) gif.
 			// NOTE The entire message body is UTF16 encoded.
 			TQString body = "";
-			for (Q_UINT32 i=0; i < message.header.totalDataSize; i++){
+			for (TQ_UINT32 i=0; i < message.header.totalDataSize; i++){
 				if (message.body[i] != TQChar('\0')){
 					body += TQChar(message.body[i]);
 				}
@@ -590,7 +590,7 @@ void Dispatcher::messageAcknowledged(unsigned int correlationId, bool fullReceiv
 	if(fullReceive)
 	{
 		TransferContext *current = 0l;
-		TQMap<Q_UINT32, TransferContext*>::Iterator it = m_sessions.begin();
+		TQMap<TQ_UINT32, TransferContext*>::Iterator it = m_sessions.begin();
 		for(; it != m_sessions.end(); it++)
 		{
 			current = it.data();
@@ -607,10 +607,10 @@ void Dispatcher::messageAcknowledged(unsigned int correlationId, bool fullReceiv
 Kopete::Contact* Dispatcher::getContactByAccountId(const TQString& accountId)
 {
 	Kopete::Contact *contact = 0l;
-	if(parent())
+	if(tqparent())
 	{
 		// Retrieve the contact from the current chat session context.
-		Kopete::ChatSession *session = dynamic_cast<Kopete::ChatSession*>(parent()->parent());
+		Kopete::ChatSession *session = dynamic_cast<Kopete::ChatSession*>(tqparent()->tqparent());
 		if(session)
 		{
 			contact = session->account()->contacts()[accountId];
@@ -628,7 +628,7 @@ Dispatcher::CallbackChannel::CallbackChannel(MSNSwitchBoardSocket *switchboard)
 Dispatcher::CallbackChannel::~CallbackChannel()
 {}
 
-Q_UINT32 Dispatcher::CallbackChannel::send(const TQByteArray& stream)
+TQ_UINT32 Dispatcher::CallbackChannel::send(const TQByteArray& stream)
 {
 	return m_switchboard->sendCommand("MSG", "D", true, stream, true);
 }
@@ -636,7 +636,7 @@ Q_UINT32 Dispatcher::CallbackChannel::send(const TQByteArray& stream)
 Dispatcher::CallbackChannel* Dispatcher::callbackChannel()
 {
 	if(m_callbackChannel == 0l){
-		MSNSwitchBoardSocket *callback = dynamic_cast<MSNSwitchBoardSocket *>(parent());
+		MSNSwitchBoardSocket *callback = dynamic_cast<MSNSwitchBoardSocket *>(tqparent());
 		if(callback == 0l) return 0l;
 		m_callbackChannel = new Dispatcher::CallbackChannel(callback);
 	}
diff --git a/kopete/protocols/msn/dispatcher.h b/kopete/protocols/msn/dispatcher.h
index 72a9cc12..690a7992 100644
--- a/kopete/protocols/msn/dispatcher.h
+++ b/kopete/protocols/msn/dispatcher.h
@@ -38,16 +38,17 @@ namespace P2P{
 	class IncomingTransfer;
 	class OutgoingTransfer;
 
-	class KOPETE_EXPORT Dispatcher : public QObject
+	class KOPETE_EXPORT Dispatcher : public TQObject
 	{	Q_OBJECT
+  TQ_OBJECT
 		public:
-			Dispatcher(TQObject *parent, const TQString& contact, const TQStringList &ip);
+			Dispatcher(TQObject *tqparent, const TQString& contact, const TQStringList &ip);
 			~Dispatcher();
 
 			void detach(TransferContext* transfer);
 			TQString localContact();
 			void requestDisplayIcon(const TQString& from, const TQString& msnObject);
-			void sendFile(const TQString& path, Q_INT64 fileSize, const TQString& to);
+			void sendFile(const TQString& path, TQ_INT64 fileSize, const TQString& to);
 			void sendImage(const TQString& fileName, const TQString& to);
 			TQString m_pictureUrl;
 			TQMap<TQString, TQString> objectList;
@@ -62,9 +63,9 @@ namespace P2P{
 			void messageAcknowledged(unsigned int correlationId, bool fullReceive);
 
 		signals:
-			void sendCommand(const TQString &cmd, const TQString &args = TQString::null, bool addId = true, const TQByteArray &body = TQByteArray(), bool binary=false);
+			void sendCommand(const TQString &cmd, const TQString &args = TQString(), bool addId = true, const TQByteArray &body = TQByteArray(), bool binary=false);
 			void displayIconReceived(KTempFile* file, const TQString& msnObject);
-			void incomingTransfer(const TQString& from, const TQString& fileName, Q_INT64 fileSize);
+			void incomingTransfer(const TQString& from, const TQString& fileName, TQ_INT64 fileSize);
 
 		private:
 				class CallbackChannel
@@ -73,7 +74,7 @@ namespace P2P{
 						CallbackChannel(MSNSwitchBoardSocket *switchboard);
 						~CallbackChannel();
 
-						Q_UINT32 send(const TQByteArray& stream);
+						TQ_UINT32 send(const TQByteArray& stream);
 
 					private:
 						MSNSwitchBoardSocket *m_switchboard;
@@ -92,8 +93,8 @@ namespace P2P{
 			Kopete::Contact* getContactByAccountId(const TQString& accountId);
 
 			P2P::MessageFormatter m_messageFormatter;
-			TQMap<Q_UINT32, P2P::TransferContext*> m_sessions;
-			TQMap<Q_UINT32, P2P::Message> m_messageBuffer;
+			TQMap<TQ_UINT32, P2P::TransferContext*> m_sessions;
+			TQMap<TQ_UINT32, P2P::Message> m_messageBuffer;
 			TQString m_contact;
 			CallbackChannel *m_callbackChannel;
 			TQStringList m_ip;
diff --git a/kopete/protocols/msn/incomingtransfer.cpp b/kopete/protocols/msn/incomingtransfer.cpp
index c7757219..b7b90296 100644
--- a/kopete/protocols/msn/incomingtransfer.cpp
+++ b/kopete/protocols/msn/incomingtransfer.cpp
@@ -28,14 +28,14 @@ using P2P::Message;
 #include <ktempfile.h>
 using namespace KNetwork;
 
-// Qt includes
+// TQt includes
 #include <tqfile.h>
 #include <tqregexp.h>
 
 // Kopete includes
 #include <kopetetransfermanager.h>
 
-IncomingTransfer::IncomingTransfer(const TQString& from, P2P::Dispatcher *dispatcher, Q_UINT32 sessionId)
+IncomingTransfer::IncomingTransfer(const TQString& from, P2P::Dispatcher *dispatcher, TQ_UINT32 sessionId)
 : TransferContext(from,dispatcher,sessionId)
 {
 	m_direction = P2P::Incoming;
@@ -61,14 +61,14 @@ IncomingTransfer::~IncomingTransfer()
 
 void IncomingTransfer::slotTransferAccepted(Kopete::Transfer* transfer, const TQString& /*fileName*/)
 {
-	Q_UINT32 sessionId = transfer->info().internalId().toUInt();
+	TQ_UINT32 sessionId = transfer->info().internalId().toUInt();
 	if(sessionId!=m_sessionId)
 		return;
 	
 	TQObject::connect(transfer , TQT_SIGNAL(transferCanceled()), this, TQT_SLOT(abort()));
 	m_transfer = transfer;
 		
-	TQString content = TQString("SessionID: %1\r\n\r\n").arg(sessionId);
+	TQString content = TQString("SessionID: %1\r\n\r\n").tqarg(sessionId);
 	sendMessage(OK, content);
 	
 	TQObject::disconnect(Kopete::TransferManager::transferManager(), 0l, this, 0l);
@@ -76,11 +76,11 @@ void IncomingTransfer::slotTransferAccepted(Kopete::Transfer* transfer, const TQ
 
 void IncomingTransfer::slotTransferRefused(const Kopete::FileTransferInfo& info)
 {
-	Q_UINT32 sessionId = info.internalId().toUInt();
+	TQ_UINT32 sessionId = info.internalId().toUInt();
 	if(sessionId!=m_sessionId)
 		return;
 	
-	TQString content = TQString("SessionID: %1\r\n\r\n").arg(sessionId);
+	TQString content = TQString("SessionID: %1\r\n\r\n").tqarg(sessionId);
 	// Send the sending client a cancelation message.
 	sendMessage(DECLINE, content);
 	m_state=Finished;
@@ -141,7 +141,7 @@ void IncomingTransfer::processMessage(const Message& message)
 	{
 		// UserDisplayIcon data or File data is in this message.
 		// Write the recieved data to the file.
-		kdDebug(14140) << k_funcinfo << TQString("Received, %1 bytes").arg(message.header.dataSize) << endl;
+		kdDebug(14140) << k_funcinfo << TQString("Received, %1 bytes").tqarg(message.header.dataSize) << endl;
 		
 		m_file->writeBlock(message.body.data(), message.header.dataSize);
 		if(m_transfer){
@@ -254,9 +254,9 @@ void IncomingTransfer::processMessage(const Message& message)
 				
 				content = "Bridge: TCPv1\r\n"
 					"Listening: true\r\n" +
-					TQString("Hashed-Nonce: {%1}\r\n").arg(P2P::Uid::createUid()) +
-					TQString("IPv4Internal-Addrs: %1\r\n").arg(m_listener->localAddress().nodeName())   +
-					TQString("IPv4Internal-Port: %1\r\n").arg(m_listener->localAddress().serviceName()) +
+					TQString("Hashed-Nonce: {%1}\r\n").tqarg(P2P::Uid::createUid()) +
+					TQString("IPv4Internal-Addrs: %1\r\n").tqarg(m_listener->localAddress().nodeName())   +
+					TQString("IPv4Internal-Port: %1\r\n").tqarg(m_listener->localAddress().serviceName()) +
 					"\r\n";
 			}
 			else
diff --git a/kopete/protocols/msn/incomingtransfer.h b/kopete/protocols/msn/incomingtransfer.h
index ca879deb..aeac991e 100644
--- a/kopete/protocols/msn/incomingtransfer.h
+++ b/kopete/protocols/msn/incomingtransfer.h
@@ -30,8 +30,9 @@ namespace KNetwork{
 namespace P2P{
 	class IncomingTransfer : public P2P::TransferContext
 	{	Q_OBJECT
+  TQ_OBJECT
 		public:
-			IncomingTransfer(const TQString& from, P2P::Dispatcher *dispatcher, Q_UINT32 sessionId);
+			IncomingTransfer(const TQString& from, P2P::Dispatcher *dispatcher, TQ_UINT32 sessionId);
 			virtual ~IncomingTransfer();
 
 		private slots:
diff --git a/kopete/protocols/msn/messageformatter.cpp b/kopete/protocols/msn/messageformatter.cpp
index 7d830ea6..f869d87e 100644
--- a/kopete/protocols/msn/messageformatter.cpp
+++ b/kopete/protocols/msn/messageformatter.cpp
@@ -16,7 +16,7 @@
 #include "messageformatter.h"
 #include "p2p.h"
 
-// Qt includes
+// TQt includes
 #include <tqdatastream.h>
 #include <tqregexp.h>
 
@@ -26,7 +26,7 @@
 using P2P::MessageFormatter;
 using P2P::Message;
 
-MessageFormatter::MessageFormatter(TQObject *parent, const char *name) : TQObject(parent, name)
+MessageFormatter::MessageFormatter(TQObject *tqparent, const char *name) : TQObject(tqparent, name)
 {}
 
 MessageFormatter::~MessageFormatter()
@@ -36,7 +36,7 @@ Message MessageFormatter::readMessage(const TQByteArray& stream, bool compact)
 {
 	Message inbound;
 	
-	Q_UINT32 index = 0;
+	TQ_UINT32 index = 0;
 	if(compact == false)
 	{
 		// Determine the end position of the message header.
@@ -75,7 +75,7 @@ Message MessageFormatter::readMessage(const TQByteArray& stream, bool compact)
 	reader.setByteOrder(TQDataStream::LittleEndian);
 	// Seek to the start position of the message
 	// transport header.
-	reader.device()->at(index);
+	reader.tqdevice()->tqat(index);
 
 	// Read the message transport headers from the stream.
 	reader >> inbound.header.sessionId;
@@ -143,7 +143,7 @@ void MessageFormatter::writeMessage(const Message& message, TQByteArray& stream,
 		// Set the capacity of the message buffer.
 		stream.resize(4 + 48 + message.body.size());
 		// Write the message size to the stream.
-		writer << (Q_INT32)(48+message.body.size());
+		writer << (TQ_INT32)(48+message.body.size());
 	}
 
 	
diff --git a/kopete/protocols/msn/messageformatter.h b/kopete/protocols/msn/messageformatter.h
index f86d679d..c5e7e77a 100644
--- a/kopete/protocols/msn/messageformatter.h
+++ b/kopete/protocols/msn/messageformatter.h
@@ -26,10 +26,11 @@ namespace P2P{
 @author Kopete Developers
 */
 namespace P2P{
-	class MessageFormatter : public QObject
+	class MessageFormatter : public TQObject
 	{	Q_OBJECT
+  TQ_OBJECT
 		public:
-			MessageFormatter(TQObject *parent = 0, const char *name = 0);
+			MessageFormatter(TQObject *tqparent = 0, const char *name = 0);
 			~MessageFormatter();
 
 			Message readMessage(const TQByteArray& stream, bool compact=false);
diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp
index 267cd0d7..567ff91e 100644
--- a/kopete/protocols/msn/msnaccount.cpp
+++ b/kopete/protocols/msn/msnaccount.cpp
@@ -61,8 +61,8 @@
 #include "avdevice/videodevicepool.h"
 #endif
 
-MSNAccount::MSNAccount( MSNProtocol *parent, const TQString& AccountID, const char *name )
-	: Kopete::PasswordedAccount ( parent, AccountID.lower(), 0, name )
+MSNAccount::MSNAccount( MSNProtocol *tqparent, const TQString& AccountID, const char *name )
+	: Kopete::PasswordedAccount ( tqparent, AccountID.lower(), 0, name )
 {
 	m_notifySocket = 0L;
 	m_connectstatus = MSNProtocol::protocol()->NLN;
@@ -81,7 +81,7 @@ MSNAccount::MSNAccount( MSNProtocol *parent, const TQString& AccountID, const ch
 	TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( globalIdentityChanged(const TQString&, const TQVariant& ) ), TQT_SLOT( slotGlobalIdentityChanged(const TQString&, const TQVariant& ) ));
 
 	m_openInboxAction = new KAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, TQT_SLOT( slotOpenInbox() ), this, "m_openInboxAction" );
-	m_changeDNAction = new KAction( i18n( "&Change Display Name..." ), TQString::null, 0, this, TQT_SLOT( slotChangePublicName() ), this, "renameAction" );
+	m_changeDNAction = new KAction( i18n( "&Change Display Name..." ), TQString(), 0, this, TQT_SLOT( slotChangePublicName() ), this, "renameAction" );
 	m_startChatAction = new KAction( i18n( "&Start Chat..." ), "mail_generic", 0, this, TQT_SLOT( slotStartChat() ), this, "startChatAction" );
 
 
@@ -92,7 +92,7 @@ MSNAccount::MSNAccount( MSNProtocol *parent, const TQString& AccountID, const ch
 	m_reverseList = config->readListEntry(  "reverseList"  ) ;
 
 	// Load the avatar
-	m_pictureFilename = locateLocal( "appdata", "msnpicture-"+ accountId().lower().replace(TQRegExp("[./~]"),"-")  +".png"  );
+	m_pictureFilename = locateLocal( "appdata", "msnpicture-"+ accountId().lower().tqreplace(TQRegExp("[./~]"),"-")  +".png"  );
 	resetPictureObject(true);
 
 	static_cast<MSNContact *>( myself() )->setInfo( "PHH", config->readEntry("PHH") );
@@ -231,7 +231,7 @@ void MSNAccount::createNotificationServer( const TQString &host, uint port )
 	TQObject::connect( m_notifySocket, TQT_SIGNAL( errorMessage(int, const TQString& ) ), 
 		TQT_SLOT( slotErrorMessageReceived(int, const TQString& ) ) );
 
-	m_notifySocket->setStatus( m_connectstatus );
+	m_notifySocket->settqStatus( m_connectstatus );
 	m_notifySocket->connect(host, port);
 }
 
@@ -288,7 +288,7 @@ void MSNAccount::setOnlineStatus( const Kopete::OnlineStatus &status , const TQS
 	kdDebug( 14140 ) << k_funcinfo << status.description() << endl;
 
 	// HACK: When changing song, do don't anything while connected
-	if( reason.contains("[Music]") && ( status == MSNProtocol::protocol()->UNK || status == MSNProtocol::protocol()->CNT ) )
+	if( reason.tqcontains("[Music]") && ( status == MSNProtocol::protocol()->UNK || status == MSNProtocol::protocol()->CNT ) )
 		return;
 
 	// Only send personal message when logged.
@@ -296,7 +296,7 @@ void MSNAccount::setOnlineStatus( const Kopete::OnlineStatus &status , const TQS
 	{
 		// Only update the personal/status message, don't change the online status
 		// since it's the same.
-		if( reason.contains("[Music]") )
+		if( reason.tqcontains("[Music]") )
 		{
 			TQString personalMessage = reason.section("[Music]", 1);
 			setPersonalMessage( MSNProtocol::PersonalMessageMusic, personalMessage );
@@ -314,7 +314,7 @@ void MSNAccount::setOnlineStatus( const Kopete::OnlineStatus &status , const TQS
 		disconnect();
 	else if ( m_notifySocket )
 	{
-		m_notifySocket->setStatus( status );
+		m_notifySocket->settqStatus( status );
 	}
 	else
 	{
@@ -330,7 +330,7 @@ void MSNAccount::slotStartChat()
 
 	bool ok;
 	TQString handle = KInputDialog::getText( i18n( "Start Chat - MSN Plugin" ),
-		i18n( "Please enter the email address of the person with whom you want to chat:" ), TQString::null, &ok ).lower();
+		i18n( "Please enter the email address of the person with whom you want to chat:" ), TQString(), &ok ).lower();
 	if ( ok )
 	{
 		if ( MSNProtocol::validContactId( handle ) )
@@ -359,7 +359,7 @@ void MSNAccount::slotDebugRawCommand()
 	if ( result == TQDialog::Accepted && m_notifySocket )
 	{
 		m_notifySocket->sendCommand( dlg->command(), dlg->params(),
-					dlg->addId(), dlg->msg().replace( "\n", "\r\n" ).utf8() );
+					dlg->addId(), dlg->msg().tqreplace( "\n", "\r\n" ).utf8() );
 	}
 	delete dlg;
 #endif
@@ -409,7 +409,7 @@ void MSNAccount::slotNotifySocketClosed()
 	m_notifySocket->deleteLater();
 	m_notifySocket = 0l;
 	myself()->setOnlineStatus( MSNProtocol::protocol()->FLN );
-	setAllContactsStatus( MSNProtocol::protocol()->FLN );
+	setAllContactstqStatus( MSNProtocol::protocol()->FLN );
 	disconnected(reason);
 
 	
@@ -484,7 +484,7 @@ void MSNAccount::setPublicName( const TQString &publicName )
 {
 	if ( m_notifySocket )
 	{
-		m_notifySocket->changePublicName( publicName, TQString::null );
+		m_notifySocket->changePublicName( publicName, TQString() );
 	}
 }
 
@@ -503,7 +503,7 @@ void MSNAccount::setPersonalMessage( MSNProtocol::PersonalMessageType type, cons
 
 void MSNAccount::slotGroupAdded( const TQString& groupName, const TQString &groupGuid )
 {
-	if ( m_groupList.contains( groupGuid ) )
+	if ( m_groupList.tqcontains( groupGuid ) )
 	{
 		// Group can already be in the list since the idle timer does a 'List Groups'
 		// command. Simply return, don't issue a warning.
@@ -587,7 +587,7 @@ void MSNAccount::slotGroupAdded( const TQString& groupName, const TQString &grou
 	m_groupList.insert( groupGuid, fallBack );
 
 	// We have pending groups that we need add a contact to
-	if ( tmp_addToNewGroup.contains(groupName) )
+	if ( tmp_addToNewGroup.tqcontains(groupName) )
 	{
 		TQStringList list=tmp_addToNewGroup[groupName];
 		for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
@@ -596,12 +596,12 @@ void MSNAccount::slotGroupAdded( const TQString& groupName, const TQString &grou
 			kdDebug( 14140 ) << k_funcinfo << "Adding to new group: " << contactId <<  endl;
 			MSNContact *c = static_cast<MSNContact *>(contacts()[contactId]);
 			if(c && c->hasProperty(MSNProtocol::protocol()->propGuid.key()) )
-				notifySocket()->addContact( contactId, MSNProtocol::FL, TQString::null, c->guid(), groupGuid );
+				notifySocket()->addContact( contactId, MSNProtocol::FL, TQString(), c->guid(), groupGuid );
 			else
 			{
 				// If we get to here, we're currently adding a new contact, add the groupGUID to the groupList
 				// to add when contact will be added to contactlist.
-				if( tmp_addNewContactToGroup.contains( contactId ) )
+				if( tmp_addNewContactToGroup.tqcontains( contactId ) )
 					tmp_addNewContactToGroup[contactId].append(groupGuid);
 				else
 					tmp_addNewContactToGroup.insert(contactId, TQStringList(groupGuid) );
@@ -613,7 +613,7 @@ void MSNAccount::slotGroupAdded( const TQString& groupName, const TQString &grou
 
 void MSNAccount::slotGroupRenamed( const TQString &groupGuid, const TQString& groupName )
 {
-	if ( m_groupList.contains( groupGuid ) )
+	if ( m_groupList.tqcontains( groupGuid ) )
 	{
 		m_groupList[ groupGuid ]->setPluginData( protocol(), accountId() + " id", groupGuid );
 		m_groupList[ groupGuid ]->setPluginData( protocol(), accountId() + " displayName", groupName );
@@ -627,7 +627,7 @@ void MSNAccount::slotGroupRenamed( const TQString &groupGuid, const TQString& gr
 
 void MSNAccount::slotGroupRemoved( const TQString& groupGuid )
 {
-	if ( m_groupList.contains( groupGuid ) )
+	if ( m_groupList.tqcontains( groupGuid ) )
 	{
 		m_groupList[ groupGuid ]->setPluginData( protocol(), TQMap<TQString,TQString>() );
 		m_groupList.remove( groupGuid );
@@ -638,7 +638,7 @@ void MSNAccount::addGroup( const TQString &groupName, const TQString& contactToA
 {
 	if ( !contactToAdd.isNull()  )
 	{
-		if( tmp_addToNewGroup.contains(groupName) )
+		if( tmp_addToNewGroup.tqcontains(groupName) )
 		{
 			tmp_addToNewGroup[groupName].append(contactToAdd);
 			//A group with the same name is about to be added,
@@ -664,7 +664,7 @@ void MSNAccount::slotKopeteGroupRenamed( Kopete::Group *g )
 	{
 		if ( !g->pluginData( protocol(), accountId() + " id" ).isEmpty() &&
 			g->displayName() != g->pluginData( protocol(), accountId() + " displayName" ) &&
-			m_groupList.contains( g->pluginData( protocol(), accountId() + " id" ) ) )
+			m_groupList.tqcontains( g->pluginData( protocol(), accountId() + " id" ) ) )
 		{
 			notifySocket()->renameGroup( g->displayName(), g->pluginData( protocol(), accountId() + " id" ) );
 		}
@@ -683,7 +683,7 @@ void MSNAccount::slotKopeteGroupRemoved( Kopete::Group *g )
 	if ( !g->pluginData( protocol(), accountId() + " id" ).isEmpty() )
 	{
 		TQString groupGuid = g->pluginData( protocol(), accountId() + " id" );
-		if ( !m_groupList.contains( groupGuid ) )
+		if ( !m_groupList.tqcontains( groupGuid ) )
 		{
 			// the group is maybe already removed in the server
 			slotGroupRemoved( groupGuid );
@@ -703,7 +703,7 @@ void MSNAccount::slotKopeteGroupRemoved( Kopete::Group *g )
 
 			Kopete::Group::topLevel()->setPluginData( protocol(), accountId() + " id", "" );
 			Kopete::Group::topLevel()->setPluginData( protocol(), accountId() + " displayName", g->pluginData( protocol(), accountId() + " displayName" ) );
-			g->setPluginData( protocol(), accountId() + " id", TQString::null ); // the group should be soon deleted, but make sure
+			g->setPluginData( protocol(), accountId() + " id", TQString() ); // the group should be soon deleted, but make sure
 
 			return;
 		}
@@ -716,7 +716,7 @@ void MSNAccount::slotKopeteGroupRemoved( Kopete::Group *g )
 			for ( ; it.current(); ++it )
 			{
 				MSNContact *c = static_cast<MSNContact *>( it.current() );
-				if ( c && c->serverGroups().contains( groupGuid )  )
+				if ( c && c->serverGroups().tqcontains( groupGuid )  )
 				{
 					/** don't do that becasue theses may already have been sent
 					m_notifySocket->removeContact( c->contactId(), groupNumber, MSNProtocol::FL );
@@ -737,7 +737,7 @@ void MSNAccount::slotNewContactList()
 		for(TQMap<TQString, Kopete::Group*>::Iterator it=m_oldGroupList.begin() ; it != m_oldGroupList.end() ; ++it )
 		{	//they are about to be changed
 			if(it.data())
-				it.data()->setPluginData( protocol(), accountId() + " id", TQString::null );
+				it.data()->setPluginData( protocol(), accountId() + " id", TQString() );
 		}
 
 		m_allowList.clear();
@@ -745,9 +745,9 @@ void MSNAccount::slotNewContactList()
 		m_reverseList.clear();
 		m_groupList.clear();
 		KConfigGroup *config=configGroup();
-		config->writeEntry( "blockList" , TQString::null ) ;
-		config->writeEntry( "allowList" , TQString::null );
-		config->writeEntry( "reverseList" , TQString::null );
+		config->writeEntry( "blockList" , TQString() ) ;
+		config->writeEntry( "allowList" , TQString() );
+		config->writeEntry( "reverseList" , TQString() );
 
 		// clear all date information which will be received.
 		// if the information is not anymore on the server, it will not be received
@@ -759,9 +759,9 @@ void MSNAccount::slotNewContactList()
 			c->setAllowed( false );
 			c->setReversed( false );
 			c->setDeleted( true );
-			c->setInfo( "PHH", TQString::null );
-			c->setInfo( "PHW", TQString::null );
-			c->setInfo( "PHM", TQString::null );
+			c->setInfo( "PHH", TQString() );
+			c->setInfo( "PHW", TQString() );
+			c->setInfo( "PHM", TQString() );
 			c->removeProperty( MSNProtocol::protocol()->propGuid );
 		}
 		m_newContactList=true;
@@ -804,11 +804,11 @@ void MSNAccount::slotContactListed( const TQString& handle, const TQString& publ
 			for ( TQStringList::ConstIterator it = contactGroups.begin(); it != contactGroups.end(); ++it )
 			{
 				TQString newServerGroupID =  *it;
-				if(m_groupList.contains(newServerGroupID))
+				if(m_groupList.tqcontains(newServerGroupID))
 				{
 					Kopete::Group *newServerGroup=m_groupList[ newServerGroupID ] ;
 					c->contactAddedToGroup( newServerGroupID, newServerGroup );
-					if( !c->metaContact()->groups().contains(newServerGroup) )
+					if( !c->metaContact()->groups().tqcontains(newServerGroup) )
 					{
 						// The contact has been added in a group by another client
 						c->metaContact()->addToGroup( newServerGroup );
@@ -822,7 +822,7 @@ void MSNAccount::slotContactListed( const TQString& handle, const TQString& publ
 				if(old_group)
 				{
 					TQString oldnewID=old_group->pluginData(protocol() , accountId() +" id");
-					if ( !oldnewID.isEmpty() && contactGroups.contains( oldnewID ) )
+					if ( !oldnewID.isEmpty() && contactGroups.tqcontains( oldnewID ) )
 						continue; //ok, it's correctn no need to do anything.
 
 					c->metaContact()->removeFromGroup( old_group );
@@ -851,7 +851,7 @@ void MSNAccount::slotContactListed( const TQString& handle, const TQString& publ
 				it != contactGroups.end(); ++it )
 			{
 				TQString groupGuid = *it;
-				if(m_groupList.contains(groupGuid))
+				if(m_groupList.tqcontains(groupGuid))
 				{
 					c->contactAddedToGroup( groupGuid, m_groupList[ groupGuid ] );
 					metaContact->addToGroup( m_groupList[ groupGuid ] );
@@ -874,21 +874,21 @@ void MSNAccount::slotContactListed( const TQString& handle, const TQString& publ
 		}
 	}
 	if ( lists & 2 )
-		slotContactAdded( handle, "AL", publicName, TQString::null, TQString::null );
+		slotContactAdded( handle, "AL", publicName, TQString(), TQString() );
 	else if(c)
 		c->setAllowed(false);
 	if ( lists & 4 )
-		slotContactAdded( handle, "BL", publicName, TQString::null, TQString::null );
+		slotContactAdded( handle, "BL", publicName, TQString(), TQString() );
 	else if(c)
 		c->setBlocked(false);
 	if ( lists & 8 )
-		slotContactAdded( handle, "RL", publicName, TQString::null, TQString::null );
+		slotContactAdded( handle, "RL", publicName, TQString(), TQString() );
 	else if(c)
 		c->setReversed(false);
 	if ( lists & 16 ) // This contact is on the pending list. Add to the reverse list and delete from the pending list
 	{
-		notifySocket()->addContact( handle, MSNProtocol::RL, TQString::null, TQString::null, TQString::null );
-		notifySocket()->removeContact( handle, MSNProtocol::PL, TQString::null, TQString::null );
+		notifySocket()->addContact( handle, MSNProtocol::RL, TQString(), TQString(), TQString() );
+		notifySocket()->removeContact( handle, MSNProtocol::PL, TQString(), TQString() );
 	}
 }
 
@@ -910,7 +910,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list,
 				c->removeProperty( Kopete::Global::Properties::self()->nickName() );
 			c->setProperty( MSNProtocol::protocol()->propGuid, contactGuid );
 			// Add the new contact to the group he belongs.
-			if ( tmp_addNewContactToGroup.contains(handle) )
+			if ( tmp_addNewContactToGroup.tqcontains(handle) )
 			{
 				TQStringList list = tmp_addNewContactToGroup[handle];
 				for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
@@ -919,10 +919,10 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list,
 					
 					// If the group didn't exist yet (yay for async operations), don't add the contact to the group
 					// Let slotGroupAdded do it.
-					if( m_groupList.contains(groupGuid) )
+					if( m_groupList.tqcontains(groupGuid) )
 					{
 						kdDebug( 14140 ) << k_funcinfo << "Adding " << handle << " to group: " << groupGuid <<  endl;
-						notifySocket()->addContact( handle, MSNProtocol::FL, TQString::null, contactGuid, groupGuid );
+						notifySocket()->addContact( handle, MSNProtocol::FL, TQString(), contactGuid, groupGuid );
 						
 						c->contactAddedToGroup( groupGuid, m_groupList[ groupGuid ] );
 						
@@ -951,14 +951,14 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list,
 				if( !c->hasProperty(MSNProtocol::protocol()->propGuid.key()) )
 					c->setProperty( MSNProtocol::protocol()->propGuid, contactGuid );
 
-				if ( c->onlineStatus() == MSNProtocol::protocol()->UNK )
+				if ( c->onlinetqStatus() == MSNProtocol::protocol()->UNK )
 					c->setOnlineStatus( MSNProtocol::protocol()->FLN );
 	
 				if ( c->metaContact() && c->metaContact()->isTemporary() )
-					c->metaContact()->setTemporary( false,  m_groupList.contains( groupGuid ) ?  m_groupList[ groupGuid ] : 0L );
+					c->metaContact()->setTemporary( false,  m_groupList.tqcontains( groupGuid ) ?  m_groupList[ groupGuid ] : 0L );
 				else
 				{
-					if(m_groupList.contains(groupGuid))
+					if(m_groupList.tqcontains(groupGuid))
 					{
 						if( c->metaContact() )
 							c->metaContact()->addToGroup( m_groupList[groupGuid] );
@@ -968,17 +968,17 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list,
 			}
 		}
 
-		if ( !handle.isEmpty() && !m_allowList.contains( handle ) && !m_blockList.contains( handle ) )
+		if ( !handle.isEmpty() && !m_allowList.tqcontains( handle ) && !m_blockList.tqcontains( handle ) )
 		{
 			kdDebug(14140) << k_funcinfo << "Trying to add contact to AL. " << endl;
-			notifySocket()->addContact(handle, MSNProtocol::AL, TQString::null, TQString::null, TQString::null );
+			notifySocket()->addContact(handle, MSNProtocol::AL, TQString(), TQString(), TQString() );
 		}
 	}
 	else if ( list == "BL" )
 	{
 		if ( contacts()[ handle ] )
 			static_cast<MSNContact *>( contacts()[ handle ] )->setBlocked( true );
-		if ( !m_blockList.contains( handle ) )
+		if ( !m_blockList.tqcontains( handle ) )
 		{
 			m_blockList.append( handle );
 			configGroup()->writeEntry( "blockList" , m_blockList ) ;
@@ -988,7 +988,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list,
 	{
 		if ( contacts()[ handle ] )
 			static_cast<MSNContact *>( contacts()[ handle ] )->setAllowed( true );
-		if ( !m_allowList.contains( handle ) )
+		if ( !m_allowList.tqcontains( handle ) )
 		{
 			m_allowList.append( handle );
 			configGroup()->writeEntry( "allowList" , m_allowList ) ;
@@ -1004,7 +1004,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list,
 			// 'new user' dialog, which makes it impossible to add those here.
 			// Not necessarily bad, but the usability effects need more thought
 			// before I declare it good :- )
-			if ( !m_allowList.contains( handle ) && !m_blockList.contains( handle ) )
+			if ( !m_allowList.tqcontains( handle ) && !m_blockList.tqcontains( handle ) )
 			{
 				TQString nick;			//in most case, the public name is not know
 				if(publicName!=handle)  // so we don't whos it if it is not know
@@ -1034,8 +1034,8 @@ void MSNAccount::slotContactRemoved( const TQString& handle, const TQString& lis
 	{
 		m_blockList.remove( handle );
 		configGroup()->writeEntry( "blockList" , m_blockList ) ;
-		if ( !m_allowList.contains( handle ) )
-			notifySocket()->addContact( handle, MSNProtocol::AL, TQString::null, TQString::null, TQString::null );
+		if ( !m_allowList.tqcontains( handle ) )
+			notifySocket()->addContact( handle, MSNProtocol::AL, TQString(), TQString(), TQString() );
 
 		if(c)
 			c->setBlocked( false );
@@ -1044,8 +1044,8 @@ void MSNAccount::slotContactRemoved( const TQString& handle, const TQString& lis
 	{
 		m_allowList.remove( handle );
 		configGroup()->writeEntry( "allowList" , m_allowList ) ;
-		if ( !m_blockList.contains( handle ) )
-			notifySocket()->addContact( handle, MSNProtocol::BL, TQString::null, TQString::null, TQString::null );
+		if ( !m_blockList.tqcontains( handle ) )
+			notifySocket()->addContact( handle, MSNProtocol::BL, TQString(), TQString(), TQString() );
 
 		if(c)
 			c->setAllowed( false );
@@ -1118,7 +1118,7 @@ void MSNAccount::slotContactRemoved( const TQString& handle, const TQString& lis
 					for ( ; it.current(); ++it )
 					{
 						MSNContact *c2 = static_cast<MSNContact *>( it.current() );
-						if ( c2->serverGroups().contains( *stringIt ) )
+						if ( c2->serverGroups().tqcontains( *stringIt ) )
 						{
 							still_have_contact=true;
 							break;
@@ -1189,7 +1189,7 @@ void MSNAccount::slotCreateChat( const TQString& ID, const TQString& address, co
 		if ( !ID.isEmpty() && notifyNewChat )
 		{
 			// this temporary message should open the window if they not exist
-			TQString body = i18n( "%1 has started a chat with you" ).arg( c->metaContact()->displayName() );
+			TQString body = i18n( "%1 has started a chat with you" ).tqarg( c->metaContact()->displayName() );
 			Kopete::Message tmpMsg = Kopete::Message( c, manager->members(), body, Kopete::Message::Internal, Kopete::Message::PlainText );
 			manager->appendMessage( tmpMsg );
 		}
@@ -1241,17 +1241,17 @@ void MSNAccount::slotContactAddedNotifyDialogClosed(const TQString& handle)
 
 	if ( !dialog->authorized() )
 	{
-		if ( m_allowList.contains( handle ) )
-			m_notifySocket->removeContact( handle, MSNProtocol::AL, TQString::null, TQString::null );
-		else if ( !m_blockList.contains( handle ) )
-			m_notifySocket->addContact( handle, MSNProtocol::BL, TQString::null, TQString::null, TQString::null );
+		if ( m_allowList.tqcontains( handle ) )
+			m_notifySocket->removeContact( handle, MSNProtocol::AL, TQString(), TQString() );
+		else if ( !m_blockList.tqcontains( handle ) )
+			m_notifySocket->addContact( handle, MSNProtocol::BL, TQString(), TQString(), TQString() );
 	}
 	else
 	{
-		if ( m_blockList.contains( handle ) )
-			m_notifySocket->removeContact( handle, MSNProtocol::BL, TQString::null, TQString::null );
-		else if ( !m_allowList.contains( handle ) )
-			m_notifySocket->addContact( handle, MSNProtocol::AL, TQString::null, TQString::null, TQString::null );
+		if ( m_blockList.tqcontains( handle ) )
+			m_notifySocket->removeContact( handle, MSNProtocol::BL, TQString(), TQString() );
+		else if ( !m_allowList.tqcontains( handle ) )
+			m_notifySocket->addContact( handle, MSNProtocol::AL, TQString(), TQString(), TQString() );
 	}
 
 	
@@ -1351,11 +1351,11 @@ void MSNAccount::addContactServerside(const TQString &contactId, TQPtrList<Kopet
 		if( !groupId.isEmpty() )
 		{
 			// Something got corrupted on contactlist.xml
-			if( !m_groupList.contains(groupId) )
+			if( !m_groupList.tqcontains(groupId) )
 			{
 				// Clear the group plugin data.
-				group->setPluginData( protocol() , accountId() + " id" , TQString::null);
-				group->setPluginData( protocol() , accountId() + " displayName" , TQString::null);
+				group->setPluginData( protocol() , accountId() + " id" , TQString());
+				group->setPluginData( protocol() , accountId() + " displayName" , TQString());
 				kdDebug( 14140 ) << k_funcinfo << " Group " << group->displayName() << " marked with id #" << groupId << " does not seems to be anymore on the server" << endl;
 
 				// Add the group on MSN server, will fix the corruption.
@@ -1365,7 +1365,7 @@ void MSNAccount::addContactServerside(const TQString &contactId, TQPtrList<Kopet
 			else
 			{
 				// Add the group that the contact belong to add it when we will receive the contact GUID.
-				if( tmp_addNewContactToGroup.contains( contactId ) )
+				if( tmp_addNewContactToGroup.tqcontains( contactId ) )
 					tmp_addNewContactToGroup[contactId].append(groupId);
 				else
 					tmp_addNewContactToGroup.insert(contactId, TQStringList(groupId) );
@@ -1383,7 +1383,7 @@ void MSNAccount::addContactServerside(const TQString &contactId, TQPtrList<Kopet
 
 	// After add the contact to the top-level, it will be moved to required groups later.
 	kdDebug( 14140 ) << k_funcinfo << "Add the contact on the server " << endl;
-	m_notifySocket->addContact( contactId, MSNProtocol::FL, contactId, TQString::null, TQString::null );
+	m_notifySocket->addContact( contactId, MSNProtocol::FL, contactId, TQString(), TQString() );
 }
 
 MSNContact *MSNAccount::findContactByGuid(const TQString &contactGuid)
@@ -1488,7 +1488,7 @@ void MSNAccount::resetPictureObject(bool silent, bool force)
 	if(old!=m_pictureObj && isConnected() && m_notifySocket && !silent)
 	{
 		//update the msn pict
-		m_notifySocket->setStatus( myself()->onlineStatus() );
+		m_notifySocket->settqStatus( myself()->onlinetqStatus() );
 	}
 }
 
diff --git a/kopete/protocols/msn/msnaccount.h b/kopete/protocols/msn/msnaccount.h
index 5f7352e3..d62998cf 100644
--- a/kopete/protocols/msn/msnaccount.h
+++ b/kopete/protocols/msn/msnaccount.h
@@ -40,9 +40,10 @@ class MSNContact;
 class MSNAccount : public Kopete::PasswordedAccount
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	MSNAccount( MSNProtocol *parent, const TQString &accountID, const char *name = 0L );
+	MSNAccount( MSNProtocol *tqparent, const TQString &accountID, const char *name = 0L );
 
 	/*
 	 * return the menu for this account
@@ -112,7 +113,7 @@ public:
 public slots:
 	virtual void connectWithPassword( const TQString &password ) ;
 	virtual void disconnect() ;
-	virtual void setOnlineStatus( const Kopete::OnlineStatus &status , const TQString &reason = TQString::null);
+	virtual void setOnlineStatus( const Kopete::OnlineStatus &status , const TQString &reason = TQString());
 
 	/**
 	 * Ask to the account to create a new chat session
@@ -125,7 +126,7 @@ public slots:
 	void slotErrorMessageReceived( int type, const TQString &msg );
 
 protected:
-	virtual bool createContact( const TQString &contactId, Kopete::MetaContact *parentContact );
+	virtual bool createContact( const TQString &contactId, Kopete::MetaContact *tqparentContact );
 
 
 private slots:
@@ -134,7 +135,7 @@ private slots:
 	void slotOpenInbox();
 	void slotChangePublicName();
 
-//#if !defined NDEBUG //(Stupid moc which don't see when he don't need to slot this slot)
+//#if !defined NDEBUG //(Stupid tqmoc which don't see when he don't need to slot this slot)
 	/**
 	 * Show simple debugging aid
 	 */
@@ -227,7 +228,7 @@ private:
 public: //FIXME: should be private
 	TQMap<TQString, Kopete::Group*> m_groupList;
 
-	void addGroup( const TQString &groupName, const TQString &contactToAdd = TQString::null );
+	void addGroup( const TQString &groupName, const TQString &contactToAdd = TQString() );
 
 	/**
 	 * Find and retrive a MSNContact by its contactGuid. (Helper function)
diff --git a/kopete/protocols/msn/msnaddcontactpage.cpp b/kopete/protocols/msn/msnaddcontactpage.cpp
index 8bdf77a1..2442d627 100644
--- a/kopete/protocols/msn/msnaddcontactpage.cpp
+++ b/kopete/protocols/msn/msnaddcontactpage.cpp
@@ -25,8 +25,8 @@
 #include "kopeteaccount.h"
 #include "kopeteuiglobal.h"
 
-MSNAddContactPage::MSNAddContactPage(bool connected, TQWidget *parent, const char *name )
-				  : AddContactPage(parent,name)
+MSNAddContactPage::MSNAddContactPage(bool connected, TQWidget *tqparent, const char *name )
+				  : AddContactPage(tqparent,name)
 {
 	(new TQVBoxLayout(this))->setAutoAdd(true);
 /*	if ( connected )
diff --git a/kopete/protocols/msn/msnaddcontactpage.h b/kopete/protocols/msn/msnaddcontactpage.h
index 4b51a15e..5d1fa2f0 100644
--- a/kopete/protocols/msn/msnaddcontactpage.h
+++ b/kopete/protocols/msn/msnaddcontactpage.h
@@ -15,8 +15,9 @@ class MSNProtocol;
 class MSNAddContactPage : public AddContactPage
 {
    Q_OBJECT
+  TQ_OBJECT
 public:
-	MSNAddContactPage(bool connected, TQWidget *parent=0, const char *name=0);
+	MSNAddContactPage(bool connected, TQWidget *tqparent=0, const char *name=0);
 	~MSNAddContactPage();
 	msnAddUI *msndata;
 	TQLabel *noaddMsg1;
diff --git a/kopete/protocols/msn/msnchallengehandler.cpp b/kopete/protocols/msn/msnchallengehandler.cpp
index 46d4b8a0..5492b9e7 100644
--- a/kopete/protocols/msn/msnchallengehandler.cpp
+++ b/kopete/protocols/msn/msnchallengehandler.cpp
@@ -46,8 +46,8 @@ TQString MSNChallengeHandler::computeHash(const TQString& challengeString)
 
  	kdDebug(14140) << k_funcinfo << "md5: " << digest << endl;
 
- 	TQValueVector<Q_INT32> md5Integers(4);
- 	for(Q_UINT32 i=0; i < md5Integers.count(); i++)
+ 	TQValueVector<TQ_INT32> md5Integers(4);
+ 	for(TQ_UINT32 i=0; i < md5Integers.count(); i++)
  	{
  		md5Integers[i] = hexSwap(digest.mid(i*8, 8)).toUInt(0, 16) & 0x7FFFFFFF;
  		kdDebug(14140) << k_funcinfo << ("0x" + hexSwap(digest.mid(i*8, 8))) << " " << md5Integers[i] << endl;
@@ -61,8 +61,8 @@ TQString MSNChallengeHandler::computeHash(const TQString& challengeString)
 
 	kdDebug(14140) << k_funcinfo << "challenge key: " << challengeKey << endl;
 
-	TQValueVector<Q_INT32> challengeIntegers(challengeKey.length() / 4);
-	for(Q_UINT32 i=0; i < challengeIntegers.count(); i++)
+	TQValueVector<TQ_INT32> challengeIntegers(challengeKey.length() / 4);
+	for(TQ_UINT32 i=0; i < challengeIntegers.count(); i++)
 	{
 		TQString sNum = challengeKey.mid(i*4, 4), sNumHex;
 
@@ -82,7 +82,7 @@ TQString MSNChallengeHandler::computeHash(const TQString& challengeString)
 	// Step Three: Create the 64-bit hash key.
 
 	// Get the hash key using the specified arrays.
-	Q_INT64 key = createHashKey(md5Integers, challengeIntegers);
+	TQ_INT64 key = createHashKey(md5Integers, challengeIntegers);
 	kdDebug(14140) << k_funcinfo << "key: " << key << endl;
 
 	// Step Four: Create the final hash key.
@@ -98,16 +98,16 @@ TQString MSNChallengeHandler::computeHash(const TQString& challengeString)
 	return (upper + lower);
 }
 
-Q_INT64 MSNChallengeHandler::createHashKey(const TQValueVector<Q_INT32>& md5Integers,
-	const TQValueVector<Q_INT32>& challengeIntegers)
+TQ_INT64 MSNChallengeHandler::createHashKey(const TQValueVector<TQ_INT32>& md5Integers,
+	const TQValueVector<TQ_INT32>& challengeIntegers)
 {
 	kdDebug(14140) << k_funcinfo << "Creating 64-bit key." << endl;
 
-	Q_INT64 magicNumber = 0x0E79A9C1L, high = 0L, low = 0L;
+	TQ_INT64 magicNumber = 0x0E79A9C1L, high = 0L, low = 0L;
 		
 	for(uint i=0; i < challengeIntegers.count(); i += 2)
 	{
-		Q_INT64 temp = ((challengeIntegers[i] * magicNumber) % 0x7FFFFFFF) + high;
+		TQ_INT64 temp = ((challengeIntegers[i] * magicNumber) % 0x7FFFFFFF) + high;
 		temp = ((temp * md5Integers[0]) + md5Integers[1]) % 0x7FFFFFFF;
 
 		high = (challengeIntegers[i + 1] + temp) % 0x7FFFFFFF;
@@ -121,12 +121,12 @@ Q_INT64 MSNChallengeHandler::createHashKey(const TQValueVector<Q_INT32>& md5Inte
 
 	TQDataStream buffer(TQByteArray(8), IO_ReadWrite);
 	buffer.setByteOrder(TQDataStream::LittleEndian);
-	buffer << (Q_INT32)high;
-	buffer << (Q_INT32)low;
+	buffer << (TQ_INT32)high;
+	buffer << (TQ_INT32)low;
 
 	buffer.device()->reset();
 	buffer.setByteOrder(TQDataStream::BigEndian);
-	Q_INT64 key;
+	TQ_INT64 key;
 	buffer >> key;
 	
 	return key;
diff --git a/kopete/protocols/msn/msnchallengehandler.h b/kopete/protocols/msn/msnchallengehandler.h
index 8ae8c3aa..e2413fb5 100644
--- a/kopete/protocols/msn/msnchallengehandler.h
+++ b/kopete/protocols/msn/msnchallengehandler.h
@@ -28,9 +28,10 @@
  *
  * @author Gregg Edghill
  */
-class MSNChallengeHandler : public QObject
+class MSNChallengeHandler : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	MSNChallengeHandler(const TQString& productKey, const TQString& productId);
     ~MSNChallengeHandler();
@@ -50,7 +51,7 @@ private:
 	/**
 	 * Creates a 64-bit hash key.
 	 */
-	 Q_INT64 createHashKey(const TQValueVector<Q_INT32>& md5Integers, const TQValueVector<Q_INT32>& challengeIntegers);
+	 TQ_INT64 createHashKey(const TQValueVector<TQ_INT32>& md5Integers, const TQValueVector<TQ_INT32>& challengeIntegers);
 	 
 	/**
 	 * Swaps the bytes in a hex string.
diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp
index f799edc1..6e0bc03e 100644
--- a/kopete/protocols/msn/msnchatsession.cpp
+++ b/kopete/protocols/msn/msnchatsession.cpp
@@ -128,7 +128,7 @@ MSNChatSession::~MSNChatSession()
 {
 	delete m_image;
 	//force to disconnect the switchboard
-	//not needed since the m_chatService has us as parent
+	//not needed since the m_chatService has us as tqparent
 	//	if(m_chatService)
 	//		delete m_chatService;
 
@@ -202,7 +202,7 @@ void MSNChatSession::slotUserJoined( const TQString &handle, const TQString &pub
 	m_timeoutTimer=0L;
 	
 	if( !account()->contacts()[ handle ] )
-		account()->addContact( handle, TQString::null, 0L, Kopete::Account::Temporary);
+		account()->addContact( handle, TQString(), 0L, Kopete::Account::Temporary);
 
 	MSNContact *c = static_cast<MSNContact*>( account()->contacts()[ handle ] );
 
@@ -316,7 +316,7 @@ void MSNChatSession::slotActionInviteAboutToShow()
 	TQDictIterator<Kopete::Contact> it( account()->contacts() );
 	for( ; it.current(); ++it )
 	{
-		if( !members().contains( it.current() ) && it.current()->isOnline() && it.current() != myself() )
+		if( !members().tqcontains( it.current() ) && it.current()->isOnline() && it.current() != myself() )
 		{
 			KAction *a=new KopeteContactAction( it.current(), this,
 				TQT_SLOT( slotInviteContact( Kopete::Contact * ) ), m_actionInvite );
@@ -355,11 +355,11 @@ void MSNChatSession::slotInviteOtherContact()
 	bool ok;
 	TQString handle = KInputDialog::getText(i18n( "MSN Plugin" ),
 			i18n( "Please enter the email address of the person you want to invite:" ),
-			TQString::null, &ok );
+			TQString(), &ok );
 	if( !ok )
 		return;
 
-	if( handle.contains('@') != 1 || handle.contains('.') <1)
+	if( handle.tqcontains('@') != 1 || handle.tqcontains('.') <1)
 	{
 			KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry,
 					i18n("<qt>You must enter a valid email address.</qt>"), i18n("MSN Plugin"));
@@ -399,7 +399,7 @@ void MSNChatSession::sendMessageQueue()
 
 void MSNChatSession::slotAcknowledgement(unsigned int id, bool ack)
 {
-	if ( !m_messagesSent.contains( id ) )
+	if ( !m_messagesSent.tqcontains( id ) )
 	{
 		// This is maybe a ACK/NAK for a non-messaging message
 		return;
@@ -408,7 +408,7 @@ void MSNChatSession::slotAcknowledgement(unsigned int id, bool ack)
 	if ( !ack )
 	{
 		Kopete::Message m = m_messagesSent[ id ];
-		TQString body = i18n( "The following message has not been sent correctly:\n%1" ).arg( m.plainBody() );
+		TQString body = i18n( "The following message has not been sent correctly:\n%1" ).tqarg( m.plainBody() );
 		Kopete::Message msg = Kopete::Message( m.to().first(), members(), body, Kopete::Message::Internal, Kopete::Message::PlainText );
 		appendMessage( msg );
 		//stop the stupid animation
@@ -433,14 +433,14 @@ void MSNChatSession::slotInvitation(const TQString &handle, const TQString &msg)
 	rx.search(msg);
 	long unsigned int cookie=rx.cap(1).toUInt();
 
-	if(m_invitations.contains(cookie))
+	if(m_invitations.tqcontains(cookie))
 	{
 		MSNInvitation *msnI=m_invitations[cookie];
 		msnI->parseInvitation(msg);
 	}
-	else if( msg.contains("Invitation-Command: INVITE") )
+	else if( msg.tqcontains("Invitation-Command: INVITE") )
 	{
-		if( msg.contains(MSNFileTransferSocket::applicationID()) )
+		if( msg.tqcontains(MSNFileTransferSocket::applicationID()) )
 		{
 			MSNFileTransferSocket *MFTS=new MSNFileTransferSocket(myself()->account()->accountId(),c,true,this);
 			connect(MFTS, TQT_SIGNAL( done(MSNInvitation*) ) , this , TQT_SLOT( invitationDone(MSNInvitation*) ));
@@ -467,7 +467,7 @@ void MSNChatSession::slotInvitation(const TQString &handle, const TQString &msg)
 				TQString body = i18n(
 					"%1 has sent an unimplemented invitation, the invitation was rejected.\n"
 					"The invitation was: %2" )
-						.arg( c->property( Kopete::Global::Properties::self()->nickName()).value().toString(), inviteName );
+						.tqarg( c->property( Kopete::Global::Properties::self()->nickName()).value().toString(), inviteName );
 				Kopete::Message tmpMsg = Kopete::Message( c , members() , body , Kopete::Message::Internal, Kopete::Message::PlainText);
 				appendMessage(tmpMsg);
 
@@ -493,7 +493,7 @@ void MSNChatSession::sendFile(const TQString &fileLocation, const TQString &/*fi
 	// TODO create a switchboard to send the file is one is not available.
 	if(m_chatService && members().getFirst())
 	{
-		m_chatService->PeerDispatcher()->sendFile(fileLocation, (Q_INT64)fileSize, members().getFirst()->contactId());
+		m_chatService->PeerDispatcher()->sendFile(fileLocation, (TQ_INT64)fileSize, members().getFirst()->contactId());
 	}
 }
 
@@ -527,7 +527,7 @@ void MSNChatSession::slotRequestPicture()
 			if( !c->object().isEmpty() )
 				m_chatService->requestDisplayPicture();
 		}
-		else if(myself()->onlineStatus().isDefinitelyOnline()  && myself()->onlineStatus().status() != Kopete::OnlineStatus::Invisible )
+		else if(myself()->onlinetqStatus().isDefinitelyOnline()  && myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Invisible )
 			startChatSession();
 	}
 	else
@@ -548,7 +548,7 @@ void MSNChatSession::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()->topLevelWidget() ) : 0L;
+			KMainWindow *w= view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : 0L;
 			if(w)
 			{
 				//We connected that in the constructor.  we don't need to keep this slot active.
@@ -603,7 +603,7 @@ void MSNChatSession::slotDebugRawCommand()
 	if( result == TQDialog::Accepted && m_chatService )
 	{
 		m_chatService->sendCommand( dlg->command(), dlg->params(),
-					dlg->addId(), dlg->msg().replace("\n","\r\n").utf8() );
+					dlg->addId(), dlg->msg().tqreplace("\n","\r\n").utf8() );
 	}
 	delete dlg;
 #endif
@@ -621,7 +621,7 @@ void MSNChatSession::receivedTypingMsg( const TQString &contactId, bool b )
 		if (  notifyNewChat  )
 		{
 			// this internal message should open the window if they not exist
-			TQString body = i18n( "%1 has started a chat with you" ).arg( c->metaContact()->displayName() );
+			TQString body = i18n( "%1 has started a chat with you" ).tqarg( c->metaContact()->displayName() );
 			Kopete::Message tmpMsg = Kopete::Message( c, members(), body, Kopete::Message::Internal, Kopete::Message::PlainText );
 			appendMessage( tmpMsg );
 		}
@@ -715,14 +715,14 @@ void MSNChatSession::cleanMessageQueue( const TQString & reason )
 		else
 			m=m_messagesSent.begin().data();
 		
-		TQString body=i18n("The following message has not been sent correctly  (%1): \n%2").arg(reason, m.plainBody());
+		TQString body=i18n("The following message has not been sent correctly  (%1): \n%2").tqarg(reason, m.plainBody());
 		Kopete::Message msg = Kopete::Message(m.to().first() , members() , body , Kopete::Message::Internal, Kopete::Message::PlainText);
 		appendMessage(msg);
 	}
 	else
 	{
 		Kopete::Message m;
-		TQString body=i18n("These messages have not been sent correctly (%1): <br /><ul>").arg(reason);
+		TQString body=i18n("These messages have not been sent correctly (%1): <br /><ul>").tqarg(reason);
 		for ( TQMap<unsigned int , Kopete::Message>::iterator it = m_messagesSent.begin(); it!=m_messagesSent.end(); it = m_messagesSent.begin() )
 		{
 			m=it.data();
diff --git a/kopete/protocols/msn/msnchatsession.h b/kopete/protocols/msn/msnchatsession.h
index df63f337..dde77246 100644
--- a/kopete/protocols/msn/msnchatsession.h
+++ b/kopete/protocols/msn/msnchatsession.h
@@ -34,12 +34,13 @@ class TQLabel;
 class KOPETE_EXPORT MSNChatSession : public Kopete::ChatSession
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	MSNChatSession( Kopete::Protocol *protocol, const Kopete::Contact *user, Kopete::ContactPtrList others, const char *name = 0 );
 	~MSNChatSession();
 
-	void createChat( const TQString &handle, const TQString &address, const TQString &auth, const TQString &ID = TQString::null );
+	void createChat( const TQString &handle, const TQString &address, const TQString &auth, const TQString &ID = TQString() );
 
 	MSNSwitchBoardSocket *service() { return m_chatService; };
 
diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp
index c6ef14f8..8e7742f0 100644
--- a/kopete/protocols/msn/msncontact.cpp
+++ b/kopete/protocols/msn/msncontact.cpp
@@ -50,8 +50,8 @@
 #include "msnnotifysocket.h"
 #include "msnaccount.h"
 
-MSNContact::MSNContact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *parent )
-: Kopete::Contact( account, id, parent )
+MSNContact::MSNContact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *tqparent )
+: Kopete::Contact( account, id, tqparent )
 {
 	m_deleted = false;
 	m_allowed = false;
@@ -75,7 +75,7 @@ MSNContact::MSNContact( Kopete::Account *account, const TQString &id, Kopete::Me
 	// wizard, and it can be because we are creating a temporary contact.
 	// if it's added by the wizard, the status will be set immediately after.
 	// if it's a temporary contact, better to set the unknown status.
-	setOnlineStatus( ( parent && parent->isTemporary() ) ? MSNProtocol::protocol()->UNK : MSNProtocol::protocol()->FLN );
+	setOnlineStatus( ( tqparent && tqparent->isTemporary() ) ? MSNProtocol::protocol()->UNK : MSNProtocol::protocol()->FLN );
 
 	actionBlock = 0L;
 
@@ -89,7 +89,7 @@ MSNContact::~MSNContact()
 
 bool MSNContact::isReachable()
 {
-	if ( account()->isConnected() && isOnline() && account()->myself()->onlineStatus() != MSNProtocol::protocol()->HDN )
+	if ( account()->isConnected() && isOnline() && account()->myself()->onlinetqStatus() != MSNProtocol::protocol()->HDN )
 		return true;
 
 	MSNChatSession *kmm=dynamic_cast<MSNChatSession*>(manager(Kopete::Contact::CannotCreate));
@@ -98,13 +98,13 @@ bool MSNContact::isReachable()
 
 	// When we are invisible we can't start a chat with others, make isReachable return false
 	// (This is an MSN limitation, not a problem in Kopete)
-	if ( !account()->isConnected() || account()->myself()->onlineStatus() == MSNProtocol::protocol()->HDN )
+	if ( !account()->isConnected() || account()->myself()->onlinetqStatus() == MSNProtocol::protocol()->HDN )
 		return false;
 		
 	//if the contact is offline, it is impossible to send it a message.  but it is impossible
 	//to be sure the contact is realy offline. For example, if the contact is not on the contactlist for
 	//some reason.
-	if( onlineStatus() == MSNProtocol::protocol()->FLN && ( isAllowed() || isBlocked() ) && !serverGroups().isEmpty() )
+	if( onlinetqStatus() == MSNProtocol::protocol()->FLN && ( isAllowed() || isBlocked() ) && !serverGroups().isEmpty() )
 		return false;
 		
 	return true;
@@ -178,20 +178,20 @@ void MSNContact::slotBlockUser()
 
 	if( m_blocked )
 	{
-		notify->removeContact( contactId(), MSNProtocol::BL, TQString::null, TQString::null );
+		notify->removeContact( contactId(), MSNProtocol::BL, TQString(), TQString() );
 	}
 	else
 	{
 		if(m_allowed)
-			notify->removeContact( contactId(), MSNProtocol::AL, TQString::null, TQString::null );
+			notify->removeContact( contactId(), MSNProtocol::AL, TQString(), TQString() );
 		else
-			notify->addContact( contactId(), MSNProtocol::BL, TQString::null, TQString::null, TQString::null );
+			notify->addContact( contactId(), MSNProtocol::BL, TQString(), TQString(), TQString() );
 	}
 }
 
 void MSNContact::slotUserInfo()
 {
-	KDialogBase *infoDialog=new KDialogBase( 0l, "infoDialog", /*modal = */false, TQString::null, KDialogBase::Close , KDialogBase::Close, false );
+	KDialogBase *infoDialog=new KDialogBase( 0l, "infoDialog", /*modal = */false, TQString(), KDialogBase::Close , KDialogBase::Close, false );
 	TQString nick=property( Kopete::Global::Properties::self()->nickName()).value().toString();
 	TQString personalMessage=property( MSNProtocol::protocol()->propPersonalMessage).value().toString();
 	MSNInfo *info=new MSNInfo ( infoDialog,"info");
@@ -237,7 +237,7 @@ void MSNContact::deleteContact()
 			// Then trully remove it from server contact list, 
 			// because only removing the contact from his groups isn't sufficent from MSNP11.
 			kdDebug( 14140 ) << k_funcinfo << "Removing contact from top-level." << endl;
-			notify->removeContact( contactId(), MSNProtocol::FL, guid(), TQString::null);
+			notify->removeContact( contactId(), MSNProtocol::FL, guid(), TQString());
 		}
 		else
 		{
@@ -264,8 +264,8 @@ void MSNContact::setBlocked( bool blocked )
 	{
 		m_blocked = blocked;
 		//update the status
-		setOnlineStatus(m_currentStatus);
-		//m_currentStatus is used here.  previously it was  onlineStatus()  but this may cause problem when
+		setOnlineStatus(m_currenttqStatus);
+		//m_currenttqStatus is used here.  previously it was  onlinetqStatus()  but this may cause problem when
 		// the account is offline because of the  Kopete::Contact::OnlineStatus()  account offline hack.
 	}
 }
@@ -317,7 +317,7 @@ void MSNContact::setClientFlags( uint flags )
 				setProperty(  MSNProtocol::protocol()->propClient , i18n("Windows Mobile") );
 			else if( flags & MSNProtocol::MSNMobileDevice)
 				setProperty(  MSNProtocol::protocol()->propClient , i18n("MSN Mobile") );
-			else if( m_obj.contains("kopete")  )
+			else if( m_obj.tqcontains("kopete")  )
 				setProperty(  MSNProtocol::protocol()->propClient , i18n("Kopete") );
 		}
 
@@ -427,7 +427,7 @@ void MSNContact::sync( unsigned int changed )
 		// and then, the same command can be sent twice.
 		// FIXME: if this method is called a seconds times, that mean change can be
 		//        done in the contactlist. we should found a way to recall this
-		//        method later. (a QTimer?)
+		//        method later. (a TQTimer?)
 		kdDebug( 14140 ) << k_funcinfo << " This contact is already moving. Abort sync    id: " << contactId() << endl;
 		return;
 	}
@@ -458,14 +458,14 @@ void MSNContact::sync( unsigned int changed )
 		if( !group->pluginData( protocol() , account()->accountId() + " id" ).isEmpty() )
 		{
 			TQString Gid=group->pluginData( protocol(), account()->accountId() + " id" );
-			if( !static_cast<MSNAccount*>( account() )->m_groupList.contains(Gid) ) 
+			if( !static_cast<MSNAccount*>( account() )->m_groupList.tqcontains(Gid) ) 
 			{ // ohoh!   something is corrupted on the contactlist.xml
 			  // anyway, we never should add a contact to an unexisting group on the server.
 			  //     This shouln't be possible anymore  2004-06-10 -Olivier
 
 				//repair the problem
-				group->setPluginData( protocol() , account()->accountId() + " id" , TQString::null);
-				group->setPluginData( protocol() , account()->accountId() + " displayName" , TQString::null);
+				group->setPluginData( protocol() , account()->accountId() + " id" , TQString());
+				group->setPluginData( protocol() , account()->accountId() + " displayName" , TQString());
 				kdWarning( 14140 ) << k_funcinfo << " Group " << group->displayName() << " marked with id #" <<Gid << " does not seems to be anymore on the server" << endl;
 
 				if(!group->displayName().isEmpty() && group->type() == Kopete::Group::Normal) //not the top-level
@@ -476,10 +476,10 @@ void MSNContact::sync( unsigned int changed )
 					m_moving=true;
 				}
 			}
-			else if( !m_serverGroups.contains(Gid) )
+			else if( !m_serverGroups.tqcontains(Gid) )
 			{
 				//Add the contact to the group on the server
-				notify->addContact( contactId(), MSNProtocol::FL, TQString::null, guid(), Gid );
+				notify->addContact( contactId(), MSNProtocol::FL, TQString(), guid(), Gid );
 				count++;
 				m_moving=true;
 			}
@@ -506,7 +506,7 @@ void MSNContact::sync( unsigned int changed )
 	
 	for( TQMap<TQString, Kopete::Group*>::Iterator it = m_serverGroups.begin();(count > 1 && it != m_serverGroups.end()); ++it )
 	{
-		if( !static_cast<MSNAccount*>( account() )->m_groupList.contains(it.key()) )
+		if( !static_cast<MSNAccount*>( account() )->m_groupList.tqcontains(it.key()) )
 		{ // ohoh!   something is corrupted on the contactlist.xml
 		  // anyway, we never should add a contact to an unexisting group on the server.
 
@@ -523,7 +523,7 @@ void MSNContact::sync( unsigned int changed )
 		Kopete::Group *group=it.data();
 		if(!group) //we can't trust the data of it()   see in MSNProtocol::deserializeContact why
 			group=static_cast<MSNAccount*>( account() )->m_groupList[it.key()];
-		if( !metaContact()->groups().contains(group) )
+		if( !metaContact()->groups().tqcontains(group) )
 		{
 			m_moving=true;
 			notify->removeContact( contactId(), MSNProtocol::FL, guid(), it.key() );
@@ -539,7 +539,7 @@ void MSNContact::sync( unsigned int changed )
 	//   we add the contact to the group #0 (the default one)
 	/*if(count==0)
 	{
-//		notify->addContact( contactId(), MSNProtocol::FL, TQString::null, guid(), "0");
+//		notify->addContact( contactId(), MSNProtocol::FL, TQString(), guid(), "0");
 	}*/
 }
 
@@ -577,7 +577,7 @@ void MSNContact::rename( const TQString &newName )
 
 void MSNContact::slotShowProfile()
 {
-	KRun::runURL( KURL( TQString::fromLatin1("http://members.msn.com/?pgmarket=it-it&mem=") + contactId())  , "text/html" );
+	KRun::runURL( KURL( TQString::tqfromLatin1("http://members.msn.com/?pgmarket=it-it&mem=") + contactId())  , "text/html" );
 }
 
 
@@ -590,7 +590,7 @@ void MSNContact::sendFile( const KURL &sourceURL, const TQString &altFileName, u
 
 	//If the file location is null, then get it from a file open dialog
 	if( !sourceURL.isValid() )
-		filePath = KFileDialog::getOpenFileName( TQString::null ,"*", 0l  , i18n( "Kopete File Transfer" ));
+		filePath = KFileDialog::getOpenFileName( TQString() ,"*", 0l  , i18n( "Kopete File Transfer" ));
 	else
 		filePath = sourceURL.path(-1);
 
@@ -598,7 +598,7 @@ void MSNContact::sendFile( const KURL &sourceURL, const TQString &altFileName, u
 
 	if ( !filePath.isEmpty() )
 	{
-		Q_UINT32 fileSize = TQFileInfo(filePath).size();
+		TQ_UINT32 fileSize = TQFileInfo(filePath).size();
 		//Send the file
 		static_cast<MSNChatSession*>( manager(Kopete::Contact::CanCreate) )->sendFile( filePath, altFileName, fileSize );
 
@@ -615,7 +615,7 @@ void MSNContact::setOnlineStatus(const Kopete::OnlineStatus& status)
 				protocol() ,
 				status.internalStatus()+15 ,
 				status.overlayIcons() + TQStringList("msn_blocked") ,
-				i18n("%1|Blocked").arg( status.description() ) ) );
+				i18n("%1|Blocked").tqarg( status.description() ) ) );
 	}
 	else if(!isBlocked() && status.internalStatus() >= 15)
 	{	//the user is not blocked, but the status is blocked
@@ -655,7 +655,7 @@ void MSNContact::setOnlineStatus(const Kopete::OnlineStatus& status)
 	}
 	else
 		Kopete::Contact::setOnlineStatus(status);
-	m_currentStatus=status;
+	m_currenttqStatus=status;
 }
 
 void MSNContact::slotSendMail()
@@ -672,7 +672,7 @@ void MSNContact::setDisplayPicture(KTempFile *f)
 	//copy the temp file somewere else.
 	// in a better world, the file could be dirrectly wrote at the correct location.
 	// but the custom emoticon code is to deeply merged in the display picture code while it could be separated.
-	TQString newlocation=locateLocal( "appdata", "msnpictures/"+ contactId().lower().replace(TQRegExp("[./~]"),"-")  +".png"  ) ;
+	TQString newlocation=locateLocal( "appdata", "msnpictures/"+ contactId().lower().tqreplace(TQRegExp("[./~]"),"-")  +".png"  ) ;
 
 	KIO::Job *j=KIO::file_move( KURL::fromPathOrURL( f->name() ) , KURL::fromPathOrURL( newlocation ) , -1, true /*overwrite*/ , false /*resume*/ , false /*showProgressInfo*/ );
 	
@@ -685,7 +685,7 @@ void MSNContact::setDisplayPicture(KTempFile *f)
 
 void MSNContact::slotEmitDisplayPictureChanged()
 {
-	TQString newlocation=locateLocal( "appdata", "msnpictures/"+ contactId().lower().replace(TQRegExp("[./~]"),"-")  +".png"  ) ;
+	TQString newlocation=locateLocal( "appdata", "msnpictures/"+ contactId().lower().tqreplace(TQRegExp("[./~]"),"-")  +".png"  ) ;
 	setProperty( Kopete::Global::Properties::self()->photo() , newlocation );
 	emit displayPictureChanged();
 }
@@ -703,7 +703,7 @@ void MSNContact::setObject(const TQString &obj)
 	KConfig *config = KGlobal::config();
 	config->setGroup( "MSN" );
 	if ( config->readNumEntry( "DownloadPicture", 2 ) >= 2 && !obj.isEmpty() 
-			 && account()->myself()->onlineStatus().status() != Kopete::OnlineStatus::Invisible )
+			 && account()->myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Invisible )
 		manager(Kopete::Contact::CanCreate); //create the manager which will download the photo automatically.
 }
 
diff --git a/kopete/protocols/msn/msncontact.h b/kopete/protocols/msn/msncontact.h
index 8326b499..7ab36fc0 100644
--- a/kopete/protocols/msn/msncontact.h
+++ b/kopete/protocols/msn/msncontact.h
@@ -44,9 +44,10 @@ namespace Kopete { class OnlineStatus; }
 class MSNContact : public Kopete::Contact
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	MSNContact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *parent );
+	MSNContact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *tqparent );
 	~MSNContact();
 
 	/**
@@ -134,7 +135,7 @@ public slots:
 	virtual void slotUserInfo();
 	virtual void deleteContact();
 	virtual void sendFile( const KURL &sourceURL = KURL(),
-						   const TQString &fileName = TQString::null, uint fileSize = 0L );
+						   const TQString &fileName = TQString(), uint fileSize = 0L );
 
 	/**
 	 * Every time the kopete's contactlist is modified, we sync the serverlist with it
@@ -184,10 +185,10 @@ private:
 	TQString m_obj; //the MSNObject
 
 	/**
-	 * keep the current status here.  (it's normally already in Kopete::Contact::d->onlineStatus)
+	 * keep the current status here.  (it's normally already in Kopete::Contact::d->onlinetqStatus)
 	 * This is a workaround to prevent problems with the account offline status.
 	 */
-	Kopete::OnlineStatus m_currentStatus;
+	Kopete::OnlineStatus m_currenttqStatus;
 
 	//MSNProtocol::deserializeContact need to acess some contact insternals
 	friend class MSNProtocol;
diff --git a/kopete/protocols/msn/msndebugrawcmddlg.cpp b/kopete/protocols/msn/msndebugrawcmddlg.cpp
index 48c4050e..a6790062 100644
--- a/kopete/protocols/msn/msndebugrawcmddlg.cpp
+++ b/kopete/protocols/msn/msndebugrawcmddlg.cpp
@@ -27,8 +27,8 @@
 
 #include <klocale.h>
 
-MSNDebugRawCmdDlg::MSNDebugRawCmdDlg( TQWidget *parent )
-: KDialogBase( parent, 0L, true,
+MSNDebugRawCmdDlg::MSNDebugRawCmdDlg( TQWidget *tqparent )
+: KDialogBase( tqparent, 0L, true,
 	i18n( "DEBUG: Send Raw Command - MSN Plugin" ), Ok | Cancel,
 	Ok, true )
 {
diff --git a/kopete/protocols/msn/msndebugrawcmddlg.h b/kopete/protocols/msn/msndebugrawcmddlg.h
index 7f9741e8..ee69f6c6 100644
--- a/kopete/protocols/msn/msndebugrawcmddlg.h
+++ b/kopete/protocols/msn/msndebugrawcmddlg.h
@@ -32,9 +32,10 @@ class MSNDebugRawCommand_base;
 class MSNDebugRawCmdDlg : public KDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	MSNDebugRawCmdDlg( TQWidget *parent );
+	MSNDebugRawCmdDlg( TQWidget *tqparent );
 	~MSNDebugRawCmdDlg();
 
 	TQString command();
diff --git a/kopete/protocols/msn/msnfiletransfersocket.cpp b/kopete/protocols/msn/msnfiletransfersocket.cpp
index c07fad06..c08bd3eb 100644
--- a/kopete/protocols/msn/msnfiletransfersocket.cpp
+++ b/kopete/protocols/msn/msnfiletransfersocket.cpp
@@ -40,8 +40,8 @@
 
 using namespace KNetwork;
 
-MSNFileTransferSocket::MSNFileTransferSocket(const TQString &handle, Kopete::Contact *c,bool incoming, TQObject* parent)
-	: MSNSocket(parent) , MSNInvitation(incoming, MSNFileTransferSocket::applicationID() , i18n("File Transfer - MSN Plugin"))
+MSNFileTransferSocket::MSNFileTransferSocket(const TQString &handle, Kopete::Contact *c,bool incoming, TQObject* tqparent)
+	: MSNSocket(tqparent) , MSNInvitation(incoming, MSNFileTransferSocket::applicationID() , i18n("File Transfer - MSN Plugin"))
 {
 	m_handle=handle;
 	m_kopeteTransfer=0l;
@@ -217,7 +217,7 @@ void MSNFileTransferSocket::slotAcceptConnection()
 
 void MSNFileTransferSocket::slotTimer()
 {
-	if(onlineStatus() != Disconnected)
+	if(onlinetqStatus() != Disconnected)
 		return;
 	kdDebug(14140) << "MSNFileTransferSocket::slotTimer: timeout "<<  endl;
 	if( m_kopeteTransfer)
@@ -331,7 +331,7 @@ TQString MSNFileTransferSocket::invitationHead()
 	TQTimer::singleShot( 10 * 60000, this, TQT_SLOT(slotTimer()) );  //the user has 10 mins to accept or refuse or initiate the transfer
 
 	return TQString( MSNInvitation::invitationHead()+
-					"Application-File: "+ m_fileName.right( m_fileName.length() - m_fileName.findRev( '/' ) - 1 ) +"\r\n"
+					"Application-File: "+ m_fileName.right( m_fileName.length() - m_fileName.tqfindRev( '/' ) - 1 ) +"\r\n"
 					"Application-FileSize: "+ TQString::number(size()) +"\r\n\r\n").utf8();
 }
 
@@ -340,7 +340,7 @@ void MSNFileTransferSocket::parseInvitation(const TQString& msg)
 	TQRegExp rx("Invitation-Command: ([A-Z]*)");
 	rx.search(msg);
 	TQString command=rx.cap(1);
-	if( msg.contains("Invitation-Command: INVITE") )
+	if( msg.tqcontains("Invitation-Command: INVITE") )
 	{
 		rx=TQRegExp("Application-File: ([^\\r\\n]*)");
 		rx.search(msg);
@@ -351,13 +351,13 @@ void MSNFileTransferSocket::parseInvitation(const TQString& msg)
 
 		MSNInvitation::parseInvitation(msg); //for the cookie
 
-		Kopete::TransferManager::transferManager()->askIncomingTransfer( m_contact , filename, filesize, TQString::null, TQString::number( cookie() ) );
+		Kopete::TransferManager::transferManager()->askIncomingTransfer( m_contact , filename, filesize, TQString(), TQString::number( cookie() ) );
 
 		TQObject::connect( Kopete::TransferManager::transferManager(), TQT_SIGNAL( accepted( Kopete::Transfer *, const TQString& ) ),this, TQT_SLOT( slotFileTransferAccepted( Kopete::Transfer *, const TQString& ) ) );
 		TQObject::connect( Kopete::TransferManager::transferManager(), TQT_SIGNAL( refused( const Kopete::FileTransferInfo & ) ), this, TQT_SLOT( slotFileTransferRefused( const Kopete::FileTransferInfo & ) ) );
 
 	}
-	else if( msg.contains("Invitation-Command: ACCEPT") )
+	else if( msg.tqcontains("Invitation-Command: ACCEPT") )
 	{
 		if(incoming())
 		{
diff --git a/kopete/protocols/msn/msnfiletransfersocket.h b/kopete/protocols/msn/msnfiletransfersocket.h
index 2d9a6c57..a5a21f49 100644
--- a/kopete/protocols/msn/msnfiletransfersocket.h
+++ b/kopete/protocols/msn/msnfiletransfersocket.h
@@ -40,9 +40,10 @@ namespace Kopete { class Contact; }
 class MSNFileTransferSocket : public MSNSocket , public MSNInvitation
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	MSNFileTransferSocket(const TQString &myID,Kopete::Contact* c, bool incoming, TQObject* parent = 0L );
+	MSNFileTransferSocket(const TQString &myID,Kopete::Contact* c, bool incoming, TQObject* tqparent = 0L );
 	~MSNFileTransferSocket();
 
 	static TQString applicationID() { return "5D3E02AB-6190-11d3-BBBB-00C04F795683"; }
diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp
index 3b3fc531..7db79dd1 100644
--- a/kopete/protocols/msn/msnnotifysocket.cpp
+++ b/kopete/protocols/msn/msnnotifysocket.cpp
@@ -90,14 +90,14 @@ void MSNNotifySocket::disconnect()
 	m_isLogged = false;
 	if(	m_disconnectReason==Kopete::Account::Unknown )
 		m_disconnectReason=Kopete::Account::Manual;
-	if( onlineStatus() == Connected )
-		sendCommand( "OUT", TQString::null, false );
+	if( onlinetqStatus() == Connected )
+		sendCommand( "OUT", TQString(), false );
 
 	if( m_keepaliveTimer )
 		m_keepaliveTimer->stop();
 
 	// the socket is not connected yet, so I should force the signals
-	if ( onlineStatus() == Disconnected || onlineStatus() == Connecting )
+	if ( onlinetqStatus() == Disconnected || onlinetqStatus() == Connecting )
 		emit socketClosed();
 	else
 		MSNSocket::disconnect();
@@ -108,7 +108,7 @@ void MSNNotifySocket::handleError( uint code, uint id )
 	kdDebug(14140) << k_funcinfo << endl;
 
 	TQString handle;
-	if(m_tmpHandles.contains(id))
+	if(m_tmpHandles.tqcontains(id))
 		handle=m_tmpHandles[id];
 
 	TQString msg;
@@ -122,7 +122,7 @@ void MSNNotifySocket::handleError( uint code, uint id )
 		case 205:
 		case 208:
 		{
-			msg = i18n( "<qt>The MSN user '%1' does not exist.<br>Please check the MSN ID.</qt>" ).arg( handle );
+			msg = i18n( "<qt>The MSN user '%1' does not exist.<br>Please check the MSN ID.</qt>" ).tqarg( handle );
 			type = MSNSocket::ErrorServerError;
 			break;
 		}
@@ -134,7 +134,7 @@ void MSNNotifySocket::handleError( uint code, uint id )
 						"MSN Error: %1<br>"
 						"please send us a detailed bug report "
 						"at kopete-devel@kde.org containing the raw debug output on the "
-						"console (in gzipped format, as it is probably a lot of output.)" ).arg(code);
+						"console (in gzipped format, as it is probably a lot of output.)" ).tqarg(code);
 			type = MSNSocket::ErrorServerError;
 			break;
 		}
@@ -166,7 +166,7 @@ void MSNNotifySocket::handleError( uint code, uint id )
 			msg = i18n( "<qt>The user '%1' already exists in this group on the MSN server;<br>"
 				"if Kopete does not show the user, please send us a detailed bug report "
 				"at kopete-devel@kde.org containing the raw debug output on the "
-				"console (in gzipped format, as it is probably a lot of output.)</qt>" ).arg(handle);
+				"console (in gzipped format, as it is probably a lot of output.)</qt>" ).tqarg(handle);
 			type = MSNSocket::ErrorInformation;
 			break;
 		}
@@ -180,7 +180,7 @@ void MSNNotifySocket::handleError( uint code, uint id )
 		}	
 		case 219:
 		{
-			msg = i18n( "The user '%1' seems to already be blocked or allowed on the server." ).arg(handle);
+			msg = i18n( "The user '%1' seems to already be blocked or allowed on the server." ).tqarg(handle);
 			type = MSNSocket::ErrorServerError;
 			break;
 		}
@@ -465,12 +465,12 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString
 		if( list  == "FL" )
 		{
 			// Removing a contact
-		 	if( data.contains( ' ' ) < 2 )
+		 	if( data.tqcontains( ' ' ) < 2 )
 			{
 				contactGuid = data.section( ' ', 1, 1 );
 			}
 			// Removing a contact from a group
-			else if( data.contains( ' ' ) < 3 )
+			else if( data.tqcontains( ' ' ) < 3 )
 			{
 				contactGuid = data.section( ' ', 1, 1 );
 				groupGuid = data.section( ' ', 2, 2 );
@@ -541,7 +541,7 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString
 		m_challengeHandler = new MSNChallengeHandler("CFHUR$52U_{VIX5T", "PROD0101{0RM?UBW");
 		// Compute the challenge response hash, and send the response.
 		TQString chlResponse = m_challengeHandler->computeHash(data.section(' ', 0, 0));
-		sendCommand("QRY", m_challengeHandler->productId(), true, chlResponse.utf8());
+		sendCommand("TQRY", m_challengeHandler->productId(), true, chlResponse.utf8());
 		// Dispose of the challenge handler.
 		m_challengeHandler->deleteLater();
 		m_challengeHandler = 0L;
@@ -563,7 +563,7 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString
 			kdDebug(14140) << k_funcinfo << "Contact list up-to-date." << endl;
 
 		// set the status
-		setStatus( m_newstatus );
+		settqStatus( m_newstatus );
 	}
 	else if( cmd == "BPR" )
 	{
@@ -592,11 +592,11 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString
 		else //FROM SYN
 			m_account->configGroup()->writeEntry( "BLP" , data.section( ' ', 0, 0 ) );
 	}
-	else if( cmd == "QRY" )
+	else if( cmd == "TQRY" )
 	{
 		// Do nothing
 	}
-	else if( cmd == "QNG" )
+	else if( cmd == "TQNG" )
 	{
 		//this is a reply from a ping
 		m_ping=false;
@@ -633,7 +633,7 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString
 			"<body onload=\"document.pform.submit(); \">\n"
 				"<form name=\"pform\" action=\"" + from_action_url  + "\" method=\"POST\">\n"
 					"<input type=\"hidden\" name=\"mode\" value=\"ttl\">\n"
-					"<input type=\"hidden\" name=\"login\" value=\"" + UserID.left( UserID.find('@') ) + "\">\n"
+					"<input type=\"hidden\" name=\"login\" value=\"" + UserID.left( UserID.tqfind('@') ) + "\">\n"
 					"<input type=\"hidden\" name=\"username\" value=\"" + UserID + "\">\n"
 					"<input type=\"hidden\" name=\"sid\" value=\"" + m_sid + "\">\n"
 					"<input type=\"hidden\" name=\"kv\" value=\"" + m_kv + "\">\n"
@@ -641,7 +641,7 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString
 					"<input type=\"hidden\" name=\"sl\" value=\"" + sl +"\">\n"
 					"<input type=\"hidden\" name=\"rru\" value=\"" + rru + "\">\n"
 					"<input type=\"hidden\" name=\"auth\" value=\"" + m_MSPAuth + "\">\n"
-					"<input type=\"hidden\" name=\"creds\" value=\"" + TQString::fromLatin1( md5.hexDigest() ) + "\">\n"
+					"<input type=\"hidden\" name=\"creds\" value=\"" + TQString::tqfromLatin1( md5.hexDigest() ) + "\">\n"
 					"<input type=\"hidden\" name=\"svc\" value=\"mail\">\n"
 					"<input type=\"hidden\" name=\"js\" value=\"yes\">\n"
 				"</form></body>\n</html>\n";
@@ -735,9 +735,9 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes )
 {
 	TQString msg = TQString::fromUtf8(bytes, bytes.size());
 
-	if(msg.contains("text/x-msmsgsinitialmdatanotification"))
+	if(msg.tqcontains("text/x-msmsgsinitialmdatanotification"))
 	{
-		//Mail-Data: <MD><E><I>301</I><IU>1</IU><O>4</O><OU>2</OU></E><Q><QTM>409600</QTM><QNM>204800</QNM></Q></MD>
+		//Mail-Data: <MD><E><I>301</I><IU>1</IU><O>4</O><OU>2</OU></E><Q><TQTM>409600</TQTM><TQNM>204800</TQNM></Q></MD>
 		// MD - Mail Data
 		// E  - email
 		// I  - initial mail
@@ -758,14 +758,14 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes )
 				TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) );
 		}
 	}
-	else if(msg.contains("text/x-msmsgsactivemailnotification"))
+	else if(msg.tqcontains("text/x-msmsgsactivemailnotification"))
 	{
 		 //this sends the server if mails are deleted
-		 TQString m = msg.right(msg.length() - msg.find("Message-Delta:") );
-		 m = m.left(msg.find("\r\n"));
-		 mailCount = mailCount - m.right(m.length() -m.find(" ")-1).toUInt();
+		 TQString m = msg.right(msg.length() - msg.tqfind("Message-Delta:") );
+		 m = m.left(msg.tqfind("\r\n"));
+		 mailCount = mailCount - m.right(m.length() -m.tqfind(" ")-1).toUInt();
 	}
-	else if(msg.contains("text/x-msmsgsemailnotification"))
+	else if(msg.tqcontains("text/x-msmsgsemailnotification"))
 	{
 		 //this sends the server if a new mail has arrived
 		TQRegExp rx("From-Addr: ([A-Za-z0-9@._\\-]*)");
@@ -775,32 +775,32 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes )
 		mailCount++;
 
 		//TODO:  it is also possible to get the subject  (but warning about the encoding)
-		TQObject::connect(KNotification::event( "msn_mail",i18n( "You have one new email from %1 in your MSN inbox." ).arg(m),
+		TQObject::connect(KNotification::event( "msn_mail",i18n( "You have one new email from %1 in your MSN inbox." ).tqarg(m),
 										0 , 0 , i18n( "Open Inbox..." ) ),
 				TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) );
 	}
-	else if(msg.contains("text/x-msmsgsprofile"))
+	else if(msg.tqcontains("text/x-msmsgsprofile"))
 	{
 		//Hotmail profile
-		if(msg.contains("MSPAuth:"))
+		if(msg.tqcontains("MSPAuth:"))
 		{
 			TQRegExp rx("MSPAuth: ([A-Za-z0-9$!*]*)");
 			rx.search(msg);
 			m_MSPAuth=rx.cap(1);
 		}
-		if(msg.contains("sid:"))
+		if(msg.tqcontains("sid:"))
 		{
 			TQRegExp rx("sid: ([0-9]*)");
 			rx.search(msg);
 			m_sid=rx.cap(1);
 		}
-		if(msg.contains("kv:"))
+		if(msg.tqcontains("kv:"))
 		{
 			TQRegExp rx("kv: ([0-9]*)");
 			rx.search(msg);
 			m_kv=rx.cap(1);
 		}
-		if(msg.contains("LoginTime:"))
+		if(msg.tqcontains("LoginTime:"))
 		{
 			TQRegExp rx("LoginTime: ([0-9]*)");
 			rx.search(msg);
@@ -812,14 +812,14 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes )
 				time(&actualTime);
 				m_loginTime=TQString::number((unsigned long)actualTime);
 			}
-		if(msg.contains("EmailEnabled:"))
+		if(msg.tqcontains("EmailEnabled:"))
 		{
 			TQRegExp rx("EmailEnabled: ([0-9]*)");
 			rx.search(msg);
 			m_isHotmailAccount = (rx.cap(1).toUInt() == 1);
 			emit hotmailSeted(m_isHotmailAccount);
 		}
-		if(msg.contains("ClientIP:"))
+		if(msg.tqcontains("ClientIP:"))
 		{
 			TQRegExp rx("ClientIP: ([0-9.]*)");
 			rx.search(msg);
@@ -829,7 +829,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes )
 		// We are logged when we receive the initial profile from Hotmail.
 		m_isLogged = true;
 	}
-	else if (msg.contains("NOTIFICATION"))
+	else if (msg.tqcontains("NOTIFICATION"))
 	{
 		// MSN alert (i.e. NOTIFICATION) [for docs see http://www.hypothetic.org/docs/msn/client/notification.php]
 		// format of msg is as follows:
@@ -849,7 +849,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes )
 		TQString notificationDOMAsString(msg);
 
 		TQRegExp rx( "&(?!amp;)" );      // match ampersands but not &amp;
-		notificationDOMAsString.replace(rx, "&amp;");
+		notificationDOMAsString.tqreplace(rx, "&amp;");
 		TQDomDocument alertDOM;
 		alertDOM.setContent(notificationDOMAsString);
 
@@ -909,7 +909,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes )
 			m_msnAlertURLs.append(subscString);
 
 			// Don't do any MSN alerts notification for new blog updates
-			if( subscString != TQString::fromLatin1("s.htm") && actionString != TQString::fromLatin1("a.htm") )
+			if( subscString != TQString::tqfromLatin1("s.htm") && actionString != TQString::tqfromLatin1("a.htm") )
 			{
 				KNotification* notification = KNotification::event("msn_alert", textString, 0L, 0L, actions);
 				TQObject::connect(notification, TQT_SIGNAL(activated(unsigned int)), this, TQT_SLOT(slotMSNAlertLink(unsigned int)));
@@ -956,7 +956,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes )
 				contact->setProperty(MSNProtocol::protocol()->propPersonalMessage, currentMedia.isEmpty() ? personalMessage : currentMedia);
 			}
 		}
-		m_tmpLastHandle = TQString::null;
+		m_tmpLastHandle = TQString();
 	}
 }
 
@@ -1008,13 +1008,13 @@ TQString MSNNotifySocket::processCurrentMedia( const TQString &mediaXmlElement )
 	currentMedia = format;
 	for(uint i=0; i<formatterStrings.size(); i++)
 	{
-		currentMedia = currentMedia.replace(TQString("{%1}").arg(i), formatterStrings[i]);
+		currentMedia = currentMedia.tqreplace(TQString("{%1}").tqarg(i), formatterStrings[i]);
 	}
 
 	if( type == TQString::fromUtf8("Music") )
 	{
 		// the  "♫" is encoded in utf8 (and should be in utf8)
-		currentMedia = i18n("Now Listening: ♫ %1 ♫").arg(currentMedia);
+		currentMedia = i18n("Now Listening: ♫ %1 ♫").tqarg(currentMedia);
 	}
 
 	kdDebug(1414) << "Current Media received: " << currentMedia << endl;
@@ -1049,25 +1049,25 @@ void MSNNotifySocket::addContact( const TQString &handle, int list, const TQStri
 			// Adding the contact to a group
 			if( !contactGuid.isEmpty() )
 			{
-				args = TQString("FL C=%1 %2").arg( contactGuid ).arg( groupGuid );
+				args = TQString("FL C=%1 %2").tqarg( contactGuid ).tqarg( groupGuid );
 				kdDebug(14140) << k_funcinfo << "In adding contact to a group" << endl;
 			}
 			// Adding a new contact
 			else
 			{
-				args = TQString("FL N=%1 F=%2").arg( handle ).arg( escape( publicName ) );
+				args = TQString("FL N=%1 F=%2").tqarg( handle ).tqarg( escape( publicName ) );
 				kdDebug(14140) << k_funcinfo << "In adding contact to a new contact" << endl;
 			}
 			break;
 		}
 		case MSNProtocol::AL:
-			args = TQString("AL N=%1").arg( handle );
+			args = TQString("AL N=%1").tqarg( handle );
 			break;
 		case MSNProtocol::BL:
-			args = TQString("BL N=%1").arg( handle );
+			args = TQString("BL N=%1").tqarg( handle );
 			break;
 		case MSNProtocol::RL:
-			args = TQString("RL N=%1").arg( handle );
+			args = TQString("RL N=%1").tqarg( handle );
 			break;
 		default:
 			kdDebug(14140) << k_funcinfo <<"WARNING! Unknown list " << list << "!" << endl;
@@ -1105,11 +1105,11 @@ void MSNNotifySocket::removeContact( const TQString &handle, int list, const TQS
 	m_tmpHandles[id]=handle;
 }
 
-void MSNNotifySocket::setStatus( const Kopete::OnlineStatus &status )
+void MSNNotifySocket::settqStatus( const Kopete::OnlineStatus &status )
 {
 //	kdDebug( 14140 ) << k_funcinfo << statusToString( status ) << endl;
 
-	if( onlineStatus() == Disconnected )
+	if( onlinetqStatus() == Disconnected )
 		m_newstatus = status;
 	else
 		sendCommand( "CHG", statusToString( status ) + " " + m_account->myselfClientId() + " " + escape(m_account->pictureObject()) );
@@ -1185,17 +1185,17 @@ void MSNNotifySocket::changePersonalMessage( MSNProtocol::PersonalMessageType ty
 			if( !mediaList[0].isEmpty() ) // Current Track
 			{
 				xmlCurrentMedia += "{0}";
-				formatterArguments += TQString("%1\\0").arg(mediaList[0]);
+				formatterArguments += TQString("%1\\0").tqarg(mediaList[0]);
 			}
 			if( !mediaList[1].isEmpty() ) // Current Artist
 			{
 				xmlCurrentMedia += " - {1}";
-				formatterArguments += TQString("%1\\0").arg(mediaList[1]);
+				formatterArguments += TQString("%1\\0").tqarg(mediaList[1]);
 			}
 			if( !mediaList[2].isEmpty() ) // Current Album
 			{
 				xmlCurrentMedia += " ({2})";
-				formatterArguments += TQString("%1\\0").arg(mediaList[2]);
+				formatterArguments += TQString("%1\\0").tqarg(mediaList[2]);
 			}
 			xmlCurrentMedia += "\\0" + formatterArguments + "\\0";
 			break;
@@ -1256,7 +1256,7 @@ TQString MSNNotifySocket::statusToString( const Kopete::OnlineStatus &status ) c
 
 void MSNNotifySocket::slotSendKeepAlive()
 {
-	//we did not received the previous QNG
+	//we did not received the previous TQNG
 	if(m_ping)
 	{
 		m_disconnectReason=Kopete::Account::ConnectionReset;
@@ -1269,7 +1269,7 @@ void MSNNotifySocket::slotSendKeepAlive()
 	{
 		// Send a dummy command to fake activity. This makes sure MSN doesn't
 		// disconnect you when the notify socket is idle.
-		sendCommand( "PNG" , TQString::null , false );
+		sendCommand( "PNG" , TQString() , false );
 		m_ping=true;
 	}
 
diff --git a/kopete/protocols/msn/msnnotifysocket.h b/kopete/protocols/msn/msnnotifysocket.h
index e8c22158..805e427c 100644
--- a/kopete/protocols/msn/msnnotifysocket.h
+++ b/kopete/protocols/msn/msnnotifysocket.h
@@ -42,6 +42,7 @@ class MSNChallengeHandler;
 class MSNNotifySocket : public MSNSocket
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	MSNNotifySocket( MSNAccount* account, const TQString &msnId, const TQString &password );
@@ -49,7 +50,7 @@ public:
 
 	virtual void disconnect();
 
-	void setStatus( const Kopete::OnlineStatus &status );
+	void settqStatus( const Kopete::OnlineStatus &status );
 	void addContact( const TQString &handle, int list, const TQString& publicName, const TQString& contactGuid, const TQString& groupGuid );
 	void removeContact( const TQString &handle, int list, const TQString &contactGuid, const TQString &groupGuid );
 
@@ -57,7 +58,7 @@ public:
 	void removeGroup( const TQString& group );
 	void renameGroup( const TQString& groupName, const TQString& groupGuid );
 
-	void changePublicName( const TQString& publicName , const TQString &handle=TQString::null );
+	void changePublicName( const TQString& publicName , const TQString &handle=TQString() );
 	void changePersonalMessage( MSNProtocol::PersonalMessageType type , const TQString& personalMessage );
 
 	void changePhoneNumber( const TQString &key, const TQString &data );
@@ -85,7 +86,7 @@ public slots:
 signals:
 	void newContactList();
 	void contactList(const TQString& handle, const TQString& publicName, const TQString &contactGuid, uint lists, const TQString& groups);
-	void contactStatus(const TQString&, const TQString&, const TQString& );
+	void contacttqStatus(const TQString&, const TQString&, const TQString& );
 	void contactAdded(const TQString& handle, const TQString& list, const TQString& publicName, const TQString& contactGuid, const TQString& groupGuid);
 	//void contactRemoved(const TQString&, const TQString&, uint);
 	void contactRemoved(const TQString& handle, const TQString& list, const TQString& contactGuid, const TQString& groupGuid);
@@ -98,7 +99,7 @@ signals:
 	void invitedToChat(const TQString&, const TQString&, const TQString&, const TQString&, const TQString& );
 	void startChat( const TQString&, const TQString& );
 
-	void statusChanged( const Kopete::OnlineStatus &newStatus );
+	void statusChanged( const Kopete::OnlineStatus &newtqStatus );
 
 	void hotmailSeted(bool) ;
 
@@ -164,7 +165,7 @@ private:
 	Kopete::OnlineStatus m_newstatus;
 
 	/**
-	 * Convert an entry of the Status enum back to a string
+	 * Convert an entry of the tqStatus enum back to a string
 	 */
 	TQString statusToString( const Kopete::OnlineStatus &status ) const;
 
diff --git a/kopete/protocols/msn/msnprotocol.cpp b/kopete/protocols/msn/msnprotocol.cpp
index 9c0007fc..587826ad 100644
--- a/kopete/protocols/msn/msnprotocol.cpp
+++ b/kopete/protocols/msn/msnprotocol.cpp
@@ -47,18 +47,18 @@ K_EXPORT_COMPONENT_FACTORY( libkopete_msn_shared, MSNProtocolFactory( "kopete_ms
 
 MSNProtocol *MSNProtocol::s_protocol = 0L;
 
-MSNProtocol::MSNProtocol( TQObject *parent, const char *name, const TQStringList & /* args */ )
-: Kopete::Protocol( MSNProtocolFactory::instance(), parent, name ),
-	NLN( Kopete::OnlineStatus::Online,    25, this, 1, TQString::null,               i18n( "Online" ) ,           i18n( "O&nline" ),        Kopete::OnlineStatusManager::Online,Kopete::OnlineStatusManager::HasAwayMessage ),
+MSNProtocol::MSNProtocol( TQObject *tqparent, const char *name, const TQStringList & /* args */ )
+: Kopete::Protocol( MSNProtocolFactory::instance(), tqparent, name ),
+	NLN( Kopete::OnlineStatus::Online,    25, this, 1, TQString(),               i18n( "Online" ) ,           i18n( "O&nline" ),        Kopete::OnlineStatusManager::Online,Kopete::OnlineStatusManager::HasAwayMessage ),
 	BSY( Kopete::OnlineStatus::Away,      20, this, 2, "msn_busy",                  i18n( "Busy" ) ,             i18n( "&Busy" ),          Kopete::OnlineStatusManager::Busy,  Kopete::OnlineStatusManager::HasAwayMessage ),
 	BRB( Kopete::OnlineStatus::Away,      22, this, 3, "msn_brb",                   i18n( "Be Right Back" ),     i18n( "Be &Right Back" ) ,  0  ,                              Kopete::OnlineStatusManager::HasAwayMessage ),
 	AWY( Kopete::OnlineStatus::Away,      18, this, 4, "contact_away_overlay",      i18n( "Away From Computer" ),i18n( "&Away" ),          Kopete::OnlineStatusManager::Away,  Kopete::OnlineStatusManager::HasAwayMessage ),
 	PHN( Kopete::OnlineStatus::Away,      12, this, 5, "contact_phone_overlay",     i18n( "On the Phone" ) ,     i18n( "On The &Phone" )  ,  0  ,                              Kopete::OnlineStatusManager::HasAwayMessage ),
 	LUN( Kopete::OnlineStatus::Away,      15, this, 6, "contact_food_overlay",      i18n( "Out to Lunch" ) ,     i18n( "Out To &Lunch" )  ,  0  ,                              Kopete::OnlineStatusManager::HasAwayMessage ),
-	FLN( Kopete::OnlineStatus::Offline,    0, this, 7, TQString::null,               i18n( "Offline" ) ,          i18n( "&Offline" ),       Kopete::OnlineStatusManager::Offline,Kopete::OnlineStatusManager::DisabledIfOffline ),
+	FLN( Kopete::OnlineStatus::Offline,    0, this, 7, TQString(),               i18n( "Offline" ) ,          i18n( "&Offline" ),       Kopete::OnlineStatusManager::Offline,Kopete::OnlineStatusManager::DisabledIfOffline ),
 	HDN( Kopete::OnlineStatus::Invisible,  3, this, 8, "contact_invisible_overlay", i18n( "Invisible" ) ,        i18n( "&Invisible" ),     Kopete::OnlineStatusManager::Invisible ), 
 	IDL( Kopete::OnlineStatus::Away,      10, this, 9, "contact_away_overlay",      i18n( "Idle" ) ,             i18n( "&Idle" ),          Kopete::OnlineStatusManager::Idle , Kopete::OnlineStatusManager::HideFromMenu ),
-	UNK( Kopete::OnlineStatus::Unknown,   25, this, 0, "status_unknown",            i18n( "Status not available" ) ),
+	UNK( Kopete::OnlineStatus::Unknown,   25, this, 0, "status_unknown",            i18n( "tqStatus not available" ) ),
 	CNT( Kopete::OnlineStatus::Connecting, 2, this, 10,"msn_connecting",            i18n( "Connecting" ) ),
 	propEmail(Kopete::Global::Properties::self()->emailAddress()),
 	propPhoneHome(Kopete::Global::Properties::self()->privatePhone()),
@@ -74,7 +74,7 @@ MSNProtocol::MSNProtocol( TQObject *parent, const char *name, const TQStringList
 
 	setCapabilities( Kopete::Protocol::BaseFgColor | Kopete::Protocol::BaseFont | Kopete::Protocol::BaseFormatting );
 
-	// m_status = m_unknownStatus = UNK;
+	// m_status = m_unknowntqStatus = UNK;
 }
 
 Kopete::Contact *MSNProtocol::deserializeContact( Kopete::MetaContact *metaContact, const TQMap<TQString, TQString> &serializedData,
@@ -104,21 +104,21 @@ Kopete::Contact *MSNProtocol::deserializeContact( Kopete::MetaContact *metaConta
 	c->setInfo( "PHM" , serializedData[ "PHM" ] );
 	c->setProperty( propGuid, contactGuid );
 
-	c->setBlocked(  (bool)(lists.contains('B')) );
-	c->setAllowed(  (bool)(lists.contains('A')) );
-	c->setReversed( (bool)(lists.contains('R')) );
+	c->setBlocked(  (bool)(lists.tqcontains('B')) );
+	c->setAllowed(  (bool)(lists.tqcontains('A')) );
+	c->setReversed( (bool)(lists.tqcontains('R')) );
 
 	return c;
 }
 
-AddContactPage *MSNProtocol::createAddContactWidget(TQWidget *parent , Kopete::Account *i)
+AddContactPage *MSNProtocol::createAddContactWidget(TQWidget *tqparent , Kopete::Account *i)
 {
-	return (new MSNAddContactPage(i->isConnected(),parent));
+	return (new MSNAddContactPage(i->isConnected(),tqparent));
 }
 
-KopeteEditAccountWidget *MSNProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent)
+KopeteEditAccountWidget *MSNProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent)
 {
-	return new MSNEditAccountWidget(this,account,parent);
+	return new MSNEditAccountWidget(this,account,tqparent);
 }
 
 Kopete::Account *MSNProtocol::createNewAccount(const TQString &accountId)
@@ -154,13 +154,13 @@ MSNProtocol* MSNProtocol::protocol()
 
 bool MSNProtocol::validContactId(const TQString& userid)
 {
-	return ( userid.contains('@') ==1 && userid.contains('.') >=1 && userid.contains(' ') == 0);
+	return ( userid.tqcontains('@') ==1 && userid.tqcontains('.') >=1 && userid.tqcontains(' ') == 0);
 }
 
 TQImage MSNProtocol::scalePicture(const TQImage &picture)
 {
 	TQImage img(picture);
-	img = img.smoothScale( 96, 96, TQImage::ScaleMin );
+	img = img.smoothScale( 96, 96, TQ_ScaleMin );
 	// crop image if not square
 	if(img.width() < img.height())
 	{
diff --git a/kopete/protocols/msn/msnprotocol.h b/kopete/protocols/msn/msnprotocol.h
index 45a5c46d..405baa95 100644
--- a/kopete/protocols/msn/msnprotocol.h
+++ b/kopete/protocols/msn/msnprotocol.h
@@ -56,9 +56,10 @@ namespace Kopete { class Group; }
 class KOPETE_EXPORT MSNProtocol : public Kopete::Protocol
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	MSNProtocol( TQObject *parent, const char *name, const TQStringList &args );
+	MSNProtocol( TQObject *tqparent, const char *name, const TQStringList &args );
 
 	/**
 	 * SyncMode indicates whether settings differing between client and
@@ -152,8 +153,8 @@ public:
 	virtual Kopete::Contact *deserializeContact( Kopete::MetaContact *metaContact,
 		const TQMap<TQString, TQString> &serializedData, const TQMap<TQString, TQString> &addressBookData );
 
-	virtual AddContactPage *createAddContactWidget( TQWidget *parent , Kopete::Account *i);
-	virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *parent);
+	virtual AddContactPage *createAddContactWidget( TQWidget *tqparent , Kopete::Account *i);
+	virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent);
 	virtual Kopete::Account *createNewAccount(const TQString &accountId);
 
 	static MSNProtocol* protocol();
diff --git a/kopete/protocols/msn/msnsecureloginhandler.cpp b/kopete/protocols/msn/msnsecureloginhandler.cpp
index a795b43a..681ce8d4 100644
--- a/kopete/protocols/msn/msnsecureloginhandler.cpp
+++ b/kopete/protocols/msn/msnsecureloginhandler.cpp
@@ -16,7 +16,7 @@
 */
 #include "msnsecureloginhandler.h"
 
-// Qt includes
+// TQt includes
 #include <tqregexp.h>
 
 // KDE includes
@@ -55,7 +55,7 @@ void MSNSecureLoginHandler::slotLoginServerReceived(KIO::Job *loginJob)
 		// Retrive the HTTP header
 		TQString httpHeaders = loginJob->queryMetaData("HTTP-Headers");
 
-		// Get the login URL using QRegExp
+		// Get the login URL using TQRegExp
 		TQRegExp rx("PassportURLs: DARealm=(.*),DALogin=(.*),DAReg=");
 		rx.search(httpHeaders);
 
@@ -74,7 +74,7 @@ void MSNSecureLoginHandler::slotLoginServerReceived(KIO::Job *loginJob)
 								"OrgVerb=GET,"
 								"OrgURL=http%3A%2F%2Fmessenger%2Emsn%2Ecom,"
 								"sign-in=" + KURL::encode_string(m_accountId) +
-								",pwd=" + KURL::encode_string( m_password ).replace(',',"%2C") +
+								",pwd=" + KURL::encode_string( m_password ).tqreplace(',',"%2C") +
 								"," + m_authentification + "\r\n";
 
 //   warning, this debug contains the password
@@ -105,7 +105,7 @@ void MSNSecureLoginHandler::slotTweenerReceived(KIO::Job *authJob)
 // 		kdDebug(14140) << k_funcinfo << "HTTP headers: " << httpHeaders << endl;
 
 		// Check if we get "401 Unauthorized", thats means it's a bad password.
-		if(httpHeaders.contains(TQString::fromUtf8("401 Unauthorized")))
+		if(httpHeaders.tqcontains(TQString::fromUtf8("401 Unauthorized")))
 		{
 // 			kdDebug(14140) << k_funcinfo << "MSN Login Bad password." << endl;
 			emit loginBadPassword();
diff --git a/kopete/protocols/msn/msnsecureloginhandler.h b/kopete/protocols/msn/msnsecureloginhandler.h
index 8f913fc7..c25daf0d 100644
--- a/kopete/protocols/msn/msnsecureloginhandler.h
+++ b/kopete/protocols/msn/msnsecureloginhandler.h
@@ -31,9 +31,10 @@ namespace KIO
  *
  * @author Michaël Larouche <michael.larouche@kdemail.net>
 */
-class MSNSecureLoginHandler : public QObject
+class MSNSecureLoginHandler : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
     MSNSecureLoginHandler(const TQString &accountId, const TQString &password, const TQString &authParameters);
 
diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp
index 0aaad25c..3e5d84fd 100644
--- a/kopete/protocols/msn/msnsocket.cpp
+++ b/kopete/protocols/msn/msnsocket.cpp
@@ -54,9 +54,9 @@ class MimeMessage
 		TQString message;
 };
 
-MSNSocket::MSNSocket(TQObject* parent)  : TQObject (parent)
+MSNSocket::MSNSocket(TQObject* tqparent)  : TQObject (tqparent)
 {
-	m_onlineStatus = Disconnected;
+	m_onlinetqStatus = Disconnected;
 	m_socket = 0L;
 	m_useHttp = false;
 	m_timer  = 0L;
@@ -64,7 +64,7 @@ MSNSocket::MSNSocket(TQObject* parent)  : TQObject (parent)
 
 MSNSocket::~MSNSocket()
 {
-	//if ( m_onlineStatus != Disconnected )
+	//if ( m_onlinetqStatus != Disconnected )
 	//	disconnect();
 	delete m_timer;
 	m_timer = 0L;
@@ -75,13 +75,13 @@ MSNSocket::~MSNSocket()
 
 void MSNSocket::connect( const TQString &server, uint port )
 {
-	if ( m_onlineStatus == Connected || m_onlineStatus == Connecting )
+	if ( m_onlinetqStatus == Connected || m_onlinetqStatus == Connecting )
 	{
 		kdWarning( 14140 ) << k_funcinfo << "Already connected or connecting! Not connecting again." << endl;
 		return;
 	}
 
-	if( m_onlineStatus == Disconnecting )
+	if( m_onlinetqStatus == Disconnecting )
 	{
 		// Cleanup first.
 		// FIXME: More generic!!!
@@ -166,16 +166,16 @@ void MSNSocket::doneDisconnect()
 
 void MSNSocket::setOnlineStatus( MSNSocket::OnlineStatus status )
 {
-	if ( m_onlineStatus == status )
+	if ( m_onlinetqStatus == status )
 		return;
 
-	m_onlineStatus = status;
+	m_onlinetqStatus = status;
 	emit onlineStatusChanged( status );
 }
 
 void MSNSocket::slotSocketError( int error )
 {
-	kdWarning( 14140 ) << k_funcinfo << "Error: " << error << " (" << m_socket->errorString() << ")" << endl;
+	kdWarning( 14140 ) << k_funcinfo << "Error: " << error << " (" << m_socket->KSocketBase::errorString() << ")" << endl;
 
 	if(!KSocketBase::isFatalError(error))
 		return;
@@ -183,9 +183,9 @@ void MSNSocket::slotSocketError( int error )
 
 	TQString errormsg = i18n( "There was an error while connecting to the MSN server.\nError message:\n" );
 	if ( error == KSocketBase::LookupFailure )
-		errormsg += i18n( "Unable to lookup %1" ).arg( m_socket->peerResolver().nodeName() );
+		errormsg += i18n( "Unable to lookup %1" ).tqarg( m_socket->peerResolver().nodeName() );
 	else
-		errormsg +=  m_socket->errorString() ;
+		errormsg +=  m_socket->KSocketBase::errorString() ;
 
 	//delete m_socket;
 	m_socket->deleteLater();
@@ -249,12 +249,12 @@ void MSNSocket::slotDataReceived()
 
 			// Check if all data has arrived.
 			rawData = TQString(TQCString(buffer, avail + 1));
-			bool headers = (rawData.find(TQRegExp("HTTP/\\d\\.\\d (\\d+) ([^\r\n]+)")) != -1);
+			bool headers = (rawData.tqfind(TQRegExp("HTTP/\\d\\.\\d (\\d+) ([^\r\n]+)")) != -1);
 
 			if(headers)
 			{
 				// The http header packet arrived.
-				int endOfHeaders = rawData.find("\r\n\r\n");
+				int endOfHeaders = rawData.tqfind("\r\n\r\n");
 				if((endOfHeaders + 4) == avail)
 				{
 					// Only the response headers data is included.
@@ -314,17 +314,17 @@ void MSNSocket::slotDataReceived()
 				// Retrieve the X-MSN-Messenger header.
 				TQString header = response.getHeaders()->getValue("X-MSN-Messenger");
 
-				TQStringList parts = TQStringList::split(";", header.replace(" ", ""));
+				TQStringList parts = TQStringList::split(";", header.tqreplace(" ", ""));
 				if(!header.isNull() && (parts.count() >= 2))
 				{
-					if(parts[0].find("SessionID", 0) != -1)
+					if(parts[0].tqfind("SessionID", 0) != -1)
 					{
 						// Assign the session id.
 						m_sessionId = parts[0].section("=", 1, 1);
 					}else
 						error = true;
 
-					if(parts[1].find("GW-IP", 0) != -1)
+					if(parts[1].tqfind("GW-IP", 0) != -1)
 					{
 						// Assign the gateway IP address.
 						m_gwip = parts[1].section("=", 1, 1);
@@ -333,7 +333,7 @@ void MSNSocket::slotDataReceived()
 
 
 					if(parts.count() > 2)
-						if((parts[2].find("Session", 0) != -1) && (parts[2].section("=", 1, 1) == "close"))
+						if((parts[2].tqfind("Session", 0) != -1) && (parts[2].section("=", 1, 1) == "close"))
 						{
 							// The http session has been closed by the server, disconnect.
 							kdDebug(14140) << k_funcinfo << "Session closed." << endl;
@@ -390,7 +390,7 @@ void MSNSocket::slotDataReceived()
 		// all MSN commands start with one or more uppercase characters.
 		// For now just check the first three chars, let's see how accurate it is.
 		// Additionally, if we receive an MSN-P2P packet, strip off anything after the P2P header.
-		rawData = TQString( TQCString( buffer, ((!m_useHttp)? avail : ret) + 1 ) ).stripWhiteSpace().replace(
+		rawData = TQString( TQCString( buffer, ((!m_useHttp)? avail : ret) + 1 ) ).stripWhiteSpace().tqreplace(
 			TQRegExp( "(P2P-Dest:.[a-zA-Z@.]*).*" ), "\\1\n\n(Stripped binary data)" );
 
 		bool isBinary = false;
@@ -446,7 +446,7 @@ void MSNSocket::slotReadLine()
 		if ( index != -1 )
 		{
 			TQString command = TQString::fromUtf8( m_buffer.take( index + 2 ), index );
-			command.replace( "\r\n", "" );
+			command.tqreplace( "\r\n", "" );
 			//kdDebug( 14141 ) << k_funcinfo << command << endl;
 
 			// Don't block the GUI while parsing data, only do a single line!
@@ -502,7 +502,7 @@ bool MSNSocket::pollReadBlock()
 void MSNSocket::parseLine( const TQString &str )
 {
 	TQString cmd  = str.section( ' ', 0, 0 );
-	TQString data = str.section( ' ', 2 ).replace( "\r\n" , "" );
+	TQString data = str.section( ' ', 2 ).tqreplace( "\r\n" , "" );
 
 	bool isNum;
 	uint id = str.section( ' ', 1, 1 ).toUInt( &isNum );
@@ -517,7 +517,7 @@ void MSNSocket::parseLine( const TQString &str )
 
 	//kdDebug( 14140 ) << k_funcinfo << "Parsing command " << cmd << " (ID " << id << "): '" << data << "'" << endl;
 
-	data.replace( "\r\n", "" );
+	data.tqreplace( "\r\n", "" );
 	bool isError;
 	uint errorCode = cmd.toUInt( &isError );
 	if ( isError )
@@ -594,7 +594,7 @@ void MSNSocket::handleError( uint code, uint /* id */ )
 	default:
 		// FIXME: if the error causes a disconnect, it will crash, but we can't disconnect every time
 		msg = i18n( "Unhandled MSN error code %1 \n"
-			"Please fill a bug report with a detailed description and if possible the last console debug output." ).arg( code );
+			"Please fill a bug report with a detailed description and if possible the last console debug output." ).tqarg( code );
 			// "See http://www.hypothetic.org/docs/msn/basics.php for a description of all error codes."
 		break;
 	}
@@ -725,7 +725,7 @@ void MSNSocket::slotReadyWrite()
 
 			// Simple check to avoid dumping the binary data from the icons and emoticons to kdDebug:
 			// When sending an MSN-P2P packet, strip off anything after the P2P header.
-			TQString debugData = TQString( *it ).stripWhiteSpace().replace(
+			TQString debugData = TQString( *it ).stripWhiteSpace().tqreplace(
 				TQRegExp( "(P2P-Dest:.[a-zA-Z@.]*).*" ), "\\1\n\n(Stripped binary data)" );
 			kdDebug( 14141 ) << k_funcinfo << "Sending command: " << debugData << endl;
 
@@ -757,12 +757,12 @@ TQString MSNSocket::escape( const TQString &str )
 	//If we encode more, the size can be longer than excepted.
 
 	int old_length= str.length();
-	TQChar *new_segment = new QChar[ old_length * 3 + 1 ];
+	TQChar *new_segment = new TQChar[ old_length * 3 + 1 ];
 	int new_length = 0;
 
 	for	( int i = 0; i < old_length; i++ )
 	{
-		unsigned short character = str[i].unicode();
+		unsigned short character = str[i].tqunicode();
 
 		if( character <= 32 || character == '%' )
 		{
@@ -790,10 +790,10 @@ TQString MSNSocket::unescape( const TQString &str )
 {
 	TQString str2 = KURL::decode_string( str, 106 );
 	//remove msn+ colors code
-	str2 = str2.replace( TQRegExp("[\\x1-\\x8]"), "" ); // old msn+ colors
+	str2 = str2.tqreplace( TQRegExp("[\\x1-\\x8]"), "" ); // old msn+ colors
 	// added by kaoul <erwin.kwolek at gmail.com>
-	str2 = str2.replace( TQRegExp("\\xB7[&@\'#0]"),""); // dot ...
-	str2 = str2.replace( TQRegExp("\\xB7\\$,?\\d{1,2}"),""); // dot dollar (comma)? 0-99
+	str2 = str2.tqreplace( TQRegExp("\\xB7[&@\'#0]"),""); // dot ...
+	str2 = str2.tqreplace( TQRegExp("\\xB7\\$,?\\d{1,2}"),""); // dot dollar (comma)? 0-99
 
 	return str2;
 }
@@ -823,7 +823,7 @@ void MSNSocket::slotSocketClosed()
 {
     kdDebug( 14140 ) << k_funcinfo << "Socket closed. " << endl;
 
-	if ( !m_socket ||  m_onlineStatus == Disconnected )
+	if ( !m_socket ||  m_onlinetqStatus == Disconnected )
 	{
 		kdDebug( 14140 ) << k_funcinfo << "Socket already deleted or already disconnected" << endl;
 		return;
@@ -885,7 +885,7 @@ bool MSNSocket::setUseHttpMethod( bool useHttp )
 		else if( s == "msnswitchboardsocket" )
 			m_type = "SB";
 		else
-			m_type = TQString::null;
+			m_type = TQString();
 
 		if( m_type.isNull() )
 			return false;
@@ -897,7 +897,7 @@ bool MSNSocket::setUseHttpMethod( bool useHttp )
 		m_gateway = "gateway.messenger.hotmail.com";
 	}
 
-	if ( m_onlineStatus != Disconnected )
+	if ( m_onlinetqStatus != Disconnected )
 		disconnect();
 
 	m_useHttp = useHttp;
@@ -950,7 +950,7 @@ bool MSNSocket::accept( KServerSocket *server )
 TQString MSNSocket::getLocalIP()
 {
 	if ( !m_socket )
-		return TQString::null;
+		return TQString();
 
 	const KSocketAddress address = m_socket->localAddress();
 
@@ -1031,7 +1031,7 @@ MSNSocket::WebResponse::WebResponse(const TQByteArray& bytes)
 
 	// Parse the HTTP status header
 	TQRegExp re("HTTP/\\d\\.\\d (\\d+) ([^\r\n]+)");
-	headerEnd  = data.find("\r\n");
+	headerEnd  = data.tqfind("\r\n");
 	header     = data.left( (headerEnd == -1) ? 20 : headerEnd );
 
 	re.search(header);
@@ -1039,7 +1039,7 @@ MSNSocket::WebResponse::WebResponse(const TQByteArray& bytes)
 	m_statusDescription = re.cap(2);
 
 	// Remove the web response status header.
-	data = data.mid(headerEnd + 2, (data.find("\r\n\r\n") + 2) - (headerEnd + 2));
+	data = data.mid(headerEnd + 2, (data.tqfind("\r\n\r\n") + 2) - (headerEnd + 2));
 	// Create a MimeMessage, removing the HTTP status header
 	m_headers = new MimeMessage(data);
 
diff --git a/kopete/protocols/msn/msnsocket.h b/kopete/protocols/msn/msnsocket.h
index 96bfd0cb..c6dff087 100644
--- a/kopete/protocols/msn/msnsocket.h
+++ b/kopete/protocols/msn/msnsocket.h
@@ -44,12 +44,13 @@ class MimeMessage;
  * Server, the Notification Server and the Switchboard Server. It is
  * inherited by the various specialized classes.
  */
-class KOPETE_EXPORT MSNSocket : public QObject
+class KOPETE_EXPORT MSNSocket : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	MSNSocket(TQObject* parent=0l);
+	MSNSocket(TQObject* tqparent=0l);
 	~MSNSocket();
 
 	/**
@@ -75,11 +76,11 @@ public:
 	 * handshake likely has to follow first.
 	 */
 	enum OnlineStatus { Connecting, Connected, Disconnecting, Disconnected };
-	enum LookupStatus { Processing, Success, Failed };
+	enum LookuptqStatus { Processing, Success, Failed };
 	enum Transport { TcpTransport, HttpTransport };
 	enum ErrorType { ErrorConnectionLost, ErrorConnectionError, ErrorCannotConnect, ErrorServerError, ErrorInformation};
 
-	OnlineStatus onlineStatus() { return m_onlineStatus; }
+	OnlineStatus onlinetqStatus() { return m_onlinetqStatus; }
 
 	/*
 	 * return the local ip.
@@ -113,7 +114,7 @@ public slots:
 	 *
 	 * return the id
 	 */
-	int sendCommand( const TQString &cmd, const TQString &args = TQString::null,
+	int sendCommand( const TQString &cmd, const TQString &args = TQString(),
 		bool addId = true, const TQByteArray &body = TQByteArray() , bool binary=false );
 
 signals:
@@ -278,7 +279,7 @@ private:
 	void parseLine( const TQString &str );
 
 	KNetwork::KBufferedSocket *m_socket;
-	OnlineStatus m_onlineStatus;
+	OnlineStatus m_onlinetqStatus;
 
 	TQString m_server;
 	uint m_port;
@@ -288,7 +289,7 @@ private:
 	 */
 	uint m_waitBlockSize;
 
-	class Buffer : public QByteArray
+	class Buffer : public TQByteArray
 	{
 	public:
 		Buffer( unsigned size = 0 );
diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp
index 7754c448..896de926 100644
--- a/kopete/protocols/msn/msnswitchboardsocket.cpp
+++ b/kopete/protocols/msn/msnswitchboardsocket.cpp
@@ -63,8 +63,8 @@
 #include "dispatcher.h"
 using P2P::Dispatcher;
 
-MSNSwitchBoardSocket::MSNSwitchBoardSocket( MSNAccount *account , TQObject *parent )
-: MSNSocket( parent )
+MSNSwitchBoardSocket::MSNSwitchBoardSocket( MSNAccount *account , TQObject *tqparent )
+: MSNSocket( tqparent )
 {
 	m_account = account;
 	m_recvIcons=0;
@@ -80,7 +80,7 @@ MSNSwitchBoardSocket::~MSNSwitchBoardSocket()
 {
 	kdDebug(14140) << k_funcinfo << endl;
 
-	TQMap<TQString , QPair<TQString , KTempFile*> >::Iterator it;
+	TQMap<TQString , TQPair<TQString , KTempFile*> >::Iterator it;
 	for ( it = m_emoticons.begin(); it != m_emoticons.end(); ++it )
 	{
 		delete it.data().second;
@@ -93,8 +93,8 @@ void MSNSwitchBoardSocket::connectToSwitchBoard(TQString ID, TQString address, T
 	m_ID = ID;
 	m_auth = auth;
 
-	TQString server = address.left( address.find( ":" ) );
-	uint port = address.right( address.length() - address.findRev( ":" ) - 1 ).toUInt();
+	TQString server = address.left( address.tqfind( ":" ) );
+	uint port = address.right( address.length() - address.tqfindRev( ":" ) - 1 ).toUInt();
 
 	TQObject::connect( this, TQT_SIGNAL( blockRead( const TQByteArray & ) ),
 		this, TQT_SLOT(slotReadMessage( const TQByteArray & ) ) );
@@ -128,7 +128,7 @@ void MSNSwitchBoardSocket::handleError( uint code, uint id )
 		}
 		case 215:
 		{
-			msg = i18n( "The user %1 is already in this chat." ).arg( m_msgHandle );
+			msg = i18n( "The user %1 is already in this chat." ).tqarg( m_msgHandle );
 			type = MSNSocket::ErrorServerError;
 
 			//userLeftChat(m_msgHandle , i18n("user was twice in this chat") ); //(the user shouln't join there
@@ -136,7 +136,7 @@ void MSNSwitchBoardSocket::handleError( uint code, uint id )
 		}
 		case 216:
 		{
-			msg = i18n( "The user %1 is online but has blocked you:\nyou can not talk to this user." ).arg( m_msgHandle );
+			msg = i18n( "The user %1 is online but has blocked you:\nyou can not talk to this user." ).tqarg( m_msgHandle );
 			type = MSNSocket::ErrorInformation;
 
 			userLeftChat(m_msgHandle, i18n("user blocked you"));
@@ -145,7 +145,7 @@ void MSNSwitchBoardSocket::handleError( uint code, uint id )
 		case 217:
 		{
 			// TODO: we need to know the nickname instead of the handle.
-			msg = i18n( "The user %1 is currently not signed in.\n" "Messages will not be delivered." ).arg( m_msgHandle );
+			msg = i18n( "The user %1 is currently not signed in.\n" "Messages will not be delivered." ).tqarg( m_msgHandle );
 			type = MSNSocket::ErrorServerError;
 
 			userLeftChat(m_msgHandle, i18n("user disconnected"));
@@ -153,7 +153,7 @@ void MSNSwitchBoardSocket::handleError( uint code, uint id )
 		}
 		case 713:
 		{
-			TQString msg = i18n( "You are trying to invite too many contacts to this chat at the same time" ).arg( m_msgHandle );
+			TQString msg = i18n( "You are trying to invite too many contacts to this chat at the same time" ).tqarg( m_msgHandle );
 			type = MSNSocket::ErrorInformation;
 
 			userLeftChat(m_msgHandle, i18n("user blocked you"));
@@ -191,7 +191,7 @@ void MSNSwitchBoardSocket::parseCommand( const TQString &cmd, uint  id ,
 		// new user joins the chat, update user in chat list
 		TQString handle = data.section( ' ', 0, 0 );
 		TQString screenname = unescape(data.section( ' ', 1, 1 ));
-		if( !m_chatMembers.contains( handle ) )
+		if( !m_chatMembers.tqcontains( handle ) )
 			m_chatMembers.append( handle );
 		emit userJoined( handle, screenname, false );
 	}
@@ -199,7 +199,7 @@ void MSNSwitchBoardSocket::parseCommand( const TQString &cmd, uint  id ,
 	{
 		// we have joined a multi chat session- this are the users in this chat
 		TQString handle = data.section( ' ', 2, 2 );
-		if( !m_chatMembers.contains( handle ) )
+		if( !m_chatMembers.tqcontains( handle ) )
 			m_chatMembers.append( handle );
 
 		TQString screenname = unescape(data.section( ' ', 3, 3));
@@ -214,8 +214,8 @@ void MSNSwitchBoardSocket::parseCommand( const TQString &cmd, uint  id ,
 		// some has disconnect from chat, update user in chat list
 		cleanQueue(); //in case some message are waiting their emoticons, never mind, send them
 
-		TQString handle = data.section( ' ', 0, 0 ).replace( "\r\n" , "" );
-		userLeftChat( handle,  (data.section( ' ', 1, 1 ) == "1" ) ? i18n("timeout") : TQString::null   );
+		TQString handle = data.section( ' ', 0, 0 ).tqreplace( "\r\n" , "" );
+		userLeftChat( handle,  (data.section( ' ', 1, 1 ) == "1" ) ? i18n("timeout") : TQString()   );
 	}
 	else if( cmd == "MSG" )
 	{
@@ -265,13 +265,13 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes )
 	else if( type== "text/x-msmsgscontrol" )
 	{
 		TQString message;
-		message = msg.right( msg.length() - msg.findRev( " " ) - 1 );
-		message = message.replace(  "\r\n" ,"" );
+		message = msg.right( msg.length() - msg.tqfindRev( " " ) - 1 );
+		message = message.tqreplace(  "\r\n" ,"" );
 		emit receivedTypingMsg( message.lower(), true );
 	}
 	else if(type == "text/x-msnmsgr-datacast")
 	{
-		if(msg.contains("ID:"))
+		if(msg.tqcontains("ID:"))
 		{
 			TQRegExp rx("ID: ([0-9]*)");
 			rx.search(msg);
@@ -293,7 +293,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes )
 		TQColor fontColor;
 		TQFont font;
 
-		if ( msg.contains( "X-MMS-IM-Format" ) )
+		if ( msg.tqcontains( "X-MMS-IM-Format" ) )
 		{
 			TQString fontName;
 			TQString fontInfo;
@@ -329,7 +329,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes )
 				}
 			}
 
-			fontName = parseFontAttr(fontInfo, "FN").replace(  "%20" , " " );
+			fontName = parseFontAttr(fontInfo, "FN").tqreplace(  "%20" , " " );
 
 			// Some clients like Trillian and Kopete itself send a font
 			// name of 'MS Serif' since MS changed the server to
@@ -343,10 +343,10 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes )
 
 				font = TQFont( fontName,
 					parseFontAttr( fontInfo, "PF" ).toInt(), // font size
-					ef.contains( 'B' ) ? TQFont::Bold : TQFont::Normal,
-					ef.contains( 'I' ) );
-				font.setUnderline(ef.contains( 'U' ));
-				font.setStrikeOut(ef.contains( 'S' ));
+					ef.tqcontains( 'B' ) ? TQFont::Bold : TQFont::Normal,
+					ef.tqcontains( 'I' ) );
+				font.setUnderline(ef.tqcontains( 'U' ));
+				font.setStrikeOut(ef.tqcontains( 'S' ));
 			}
 		}
 
@@ -359,17 +359,17 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes )
 				others.append( m_account->contacts()[ *it2 ] );
 		}
 
-		TQString message=msg.right( msg.length() - msg.find("\r\n\r\n") - 4 );
+		TQString message=msg.right( msg.length() - msg.tqfind("\r\n\r\n") - 4 );
 
 		//Stupid MSN PLUS colors code. message with incorrect charactere are not showed correctly in the chatwindow.
 		//TODO: parse theses one to show the color too in Kopete
-		message.replace("\3","").replace("\4","").replace("\2","").replace("\5","").replace("\6","").replace("\7","");
+		message.tqreplace("\3","").tqreplace("\4","").tqreplace("\2","").tqreplace("\5","").tqreplace("\6","").tqreplace("\7","");
 
 		if(!m_account->contacts()[m_msgHandle])
 		{
 			//this may happens if the contact has been deleted.
 			kdDebug(14140) << k_funcinfo <<"WARNING: contact is null, adding it" <<endl;
-			if( !m_chatMembers.contains( m_msgHandle ) )
+			if( !m_chatMembers.tqcontains( m_msgHandle ) )
 				m_chatMembers.append( m_msgHandle );
 			emit userJoined( m_msgHandle , m_msgHandle , false);
 		}
@@ -432,9 +432,9 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes )
 				TQString txt=rx.cap(1);
 				kdDebug(14140) << k_funcinfo << "emoticon: " <<  txt << "    msnobj: " << msnobj<<  endl;
 
-				if( !m_emoticons.contains(msnobj) || !m_emoticons[msnobj].second )
+				if( !m_emoticons.tqcontains(msnobj) || !m_emoticons[msnobj].second )
 				{
-					m_emoticons.insert(msnobj, qMakePair(txt,(KTempFile*)0L));
+					m_emoticons.insert(msnobj, tqMakePair(txt,(KTempFile*)0L));
 					MSNContact *c=static_cast<MSNContact*>(m_account->contacts()[m_msgHandle]);
 					if(!c)
 						return;
@@ -493,7 +493,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes )
 
 
 	}
-	else if(type == "image/gif" || msg.contains("Message-ID:"))
+	else if(type == "image/gif" || msg.tqcontains("Message-ID:"))
 	{
 		// Incoming inkformatgif.
 		TQRegExp regex("Message-ID: \\{([0-9A-F\\-]*)\\}");
@@ -510,7 +510,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes )
 		{
 			bool valid = true;
 			// Retrieve the nmber of data chunks.
-			Q_UINT32 numberOfChunks = chunks.toUInt(&valid);
+			TQ_UINT32 numberOfChunks = chunks.toUInt(&valid);
 			if(valid && (numberOfChunks > 1))
 			{
 				regex = TQRegExp("base64:([0-9a-zA-Z+/=]+)");
@@ -536,7 +536,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes )
 
 		if(!messageId.isNull())
 		{
-			if(m_inkMessageBuffer.contains(messageId))
+			if(m_inkMessageBuffer.tqcontains(messageId))
 			{
 				if(chunks.isNull())
 				{
@@ -577,7 +577,7 @@ void MSNSwitchBoardSocket::sendTypingMsg( bool isTyping )
 	if( !isTyping )
 		return;
 
-	if ( onlineStatus() != Connected || m_chatMembers.empty())
+	if ( onlinetqStatus() != Connected || m_chatMembers.empty())
 	{
 		//we are not yet in a chat.
 		//if we send that command now, we may get disconnected.
@@ -653,14 +653,14 @@ int MSNSwitchBoardSocket::sendCustomEmoticon(const TQString &name, const TQStrin
 // this sends a short message to the server
 int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg )
 {
-	if ( onlineStatus() != Connected || m_chatMembers.empty())
+	if ( onlinetqStatus() != Connected || m_chatMembers.empty())
 	{
 //		m_messagesQueue.append(msg);
 		return -1;
 	}
 
 #if 0   //this is to test webcam
-	if(msg.plainBody().contains("/webcam"))
+	if(msg.plainBody().tqcontains("/webcam"))
 	{
 		PeerDispatcher()->startWebcam( m_myHandle , m_msgHandle);
 		return -3;
@@ -678,7 +678,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg )
 		{
 			for ( TQStringList::const_iterator itr2 = itr.data().constBegin(); itr2 != itr.data().constEnd(); ++itr2 )
 			{
-				if ( msg.plainBody().contains( *itr2 ) )
+				if ( msg.plainBody().tqcontains( *itr2 ) )
 					sendCustomEmoticon( *itr2, itr.key() );
 			}
 		}
@@ -748,7 +748,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg )
 		head += "; RL=1";
 	head += "\r\n";
 
-	TQString message= msg.plainBody().replace(  "\n" , "\r\n" );
+	TQString message= msg.plainBody().tqreplace(  "\n" , "\r\n" );
 
 	//-- Check if the message isn't too big,  TODO: do that at the libkopete level.
 	int len_H=head.utf8().length();	// != head.length()  because i need the size in butes and
@@ -767,8 +767,8 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg )
 
 		int nb=(int)ceil((float)(len_M)/(float)(futurmessages_size));
 
-		if(KMessageBox::warningContinueCancel(0L /* FIXME: we should try to find a parent somewere*/ ,
-			i18n("The message you are trying to send is too long; it will be split into %1 messages.").arg(nb) ,
+		if(KMessageBox::warningContinueCancel(0L /* FIXME: we should try to find a tqparent somewere*/ ,
+			i18n("The message you are trying to send is too long; it will be split into %1 messages.").tqarg(nb) ,
 			i18n("Message too big - MSN Plugin" ), KStdGuiItem::cont() , "SendLongMessages" )
 				== KMessageBox::Continue )
 		{
@@ -850,7 +850,7 @@ void MSNSwitchBoardSocket::slotSocketClosed( )
 
 void MSNSwitchBoardSocket::slotCloseSession()
 {
-	sendCommand( "OUT", TQString::null, false );
+	sendCommand( "OUT", TQString(), false );
 	disconnect();
 }
 
@@ -888,7 +888,7 @@ void MSNSwitchBoardSocket::userLeftChat(const TQString& handle , const TQString
 {
 	emit userLeft( handle,  reason );
 
-	if( m_chatMembers.contains( handle ) )
+	if( m_chatMembers.tqcontains( handle ) )
 		m_chatMembers.remove( handle );
 
 	if(m_chatMembers.isEmpty())
@@ -907,7 +907,7 @@ void  MSNSwitchBoardSocket::slotEmoticonReceived( KTempFile *file, const TQStrin
 {
 	kdDebug(14141) << k_funcinfo << msnObj << endl;
 
-	if(m_emoticons.contains(msnObj))
+	if(m_emoticons.tqcontains(msnObj))
 	{ //it's an emoticon
 		m_emoticons[msnObj].second=file;
 
@@ -920,7 +920,7 @@ void  MSNSwitchBoardSocket::slotEmoticonReceived( KTempFile *file, const TQStrin
 	}
 	else if(msnObj == "inkformatgif")
 	{
-		TQString msg=i18n("<img src=\"%1\" alt=\"Typewrited message\" />" ).arg( file->name() );
+		TQString msg=i18n("<img src=\"%1\" alt=\"Typewrited message\" />" ).tqarg( file->name() );
 
 		kdDebug(14140) << k_funcinfo << file->name()  <<endl;
 
@@ -941,7 +941,7 @@ void  MSNSwitchBoardSocket::slotEmoticonReceived( KTempFile *file, const TQStrin
 		{
 			//this may happens if the contact has been deleted.
 			kdDebug(14140) << k_funcinfo <<"WARNING: contact is null, adding it" <<endl;
-			if( !m_chatMembers.contains( m_msgHandle ) )
+			if( !m_chatMembers.tqcontains( m_msgHandle ) )
 				m_chatMembers.append( m_msgHandle );
 			emit userJoined( m_msgHandle , m_msgHandle , false);
 		}
@@ -961,7 +961,7 @@ void  MSNSwitchBoardSocket::slotEmoticonReceived( KTempFile *file, const TQStrin
 	}
 }
 
-void MSNSwitchBoardSocket::slotIncomingFileTransfer(const TQString& from, const TQString& /*fileName*/, Q_INT64 /*fileSize*/)
+void MSNSwitchBoardSocket::slotIncomingFileTransfer(const TQString& from, const TQString& /*fileName*/, TQ_INT64 /*fileSize*/)
 {
 	TQPtrList<Kopete::Contact> others;
 	others.append( m_account->myself() );
@@ -976,7 +976,7 @@ void MSNSwitchBoardSocket::slotIncomingFileTransfer(const TQString& from, const
 	{
 		//this may happens if the contact has been deleted.
 		kdDebug(14140) << k_funcinfo <<"WARNING: contact is null, adding it" <<endl;
-		if( !m_chatMembers.contains( m_msgHandle ) )
+		if( !m_chatMembers.tqcontains( m_msgHandle ) )
 			m_chatMembers.append( m_msgHandle );
 		emit userJoined( m_msgHandle , m_msgHandle , false);
 	}
@@ -1008,12 +1008,12 @@ void MSNSwitchBoardSocket::cleanQueue()
 Kopete::Message &MSNSwitchBoardSocket::parseCustomEmoticons(Kopete::Message &kmsg)
 {
 	TQString message=kmsg.escapedBody();
-	TQMap<TQString , QPair<TQString , KTempFile*> >::Iterator it;
+	TQMap<TQString , TQPair<TQString , KTempFile*> >::Iterator it;
 	for ( it = m_emoticons.begin(); it != m_emoticons.end(); ++it )
 	{
 		TQString es=TQStyleSheet::escape(it.data().first);
 		KTempFile *f=it.data().second;
-		if(message.contains(es) && f)
+		if(message.tqcontains(es) && f)
 		{
 			TQString imgPath = f->name();
 			TQImage iconImage(imgPath);
@@ -1021,19 +1021,19 @@ Kopete::Message &MSNSwitchBoardSocket::parseCustomEmoticons(Kopete::Message &kms
 		     * emoticons like that. So, in that case, we show like the MSN client */
 			#if 0
 			TQString em = TQRegExp::escape( es );
-			message.replace( TQRegExp(TQString::fromLatin1( "(^|[\\W\\s]|%1)(%2)(?!\\w)" ).arg(em).arg(em)),
-								TQString::fromLatin1("\\1<img align=\"center\" width=\"") +
+			message.tqreplace( TQRegExp(TQString::tqfromLatin1( "(^|[\\W\\s]|%1)(%2)(?!\\w)" ).tqarg(em).tqarg(em)),
+								TQString::tqfromLatin1("\\1<img align=\"center\" width=\"") +
 			#endif
 			//match any occurence which is not in a html tag.
-			message.replace( TQRegExp(TQString::fromLatin1("%1(?![^><]*>)").arg(TQRegExp::escape(es))),
-						TQString::fromLatin1("<img align=\"center\" width=\"") +
+			message.tqreplace( TQRegExp(TQString::tqfromLatin1("%1(?![^><]*>)").tqarg(TQRegExp::escape(es))),
+						TQString::tqfromLatin1("<img align=\"center\" width=\"") +
 						TQString::number(iconImage.width()) +
-						TQString::fromLatin1("\" height=\"") +
+						TQString::tqfromLatin1("\" height=\"") +
 						TQString::number(iconImage.height()) +
-						TQString::fromLatin1("\" src=\"") + imgPath +
-						TQString::fromLatin1("\" title=\"") + es +
-						TQString::fromLatin1("\" alt=\"") + es +
-						TQString::fromLatin1( "\"/>" ) );
+						TQString::tqfromLatin1("\" src=\"") + imgPath +
+						TQString::tqfromLatin1("\" title=\"") + es +
+						TQString::tqfromLatin1("\" alt=\"") + es +
+						TQString::tqfromLatin1( "\"/>" ) );
 			kmsg.setBody(message, Kopete::Message::RichText);
 		}
 	}
@@ -1060,12 +1060,12 @@ TQString MSNSwitchBoardSocket::parseFontAttr(TQString str, TQString attr)
 	TQString tmp;
 	int pos1=0, pos2=0;
 
-	pos1 = str.find(attr + "=");
+	pos1 = str.tqfind(attr + "=");
 
 	if (pos1 == -1)
 		return "";
 
-	pos2 = str.find(";", pos1+3);
+	pos2 = str.tqfind(";", pos1+3);
 
 	if (pos2 == -1)
 		tmp = str.mid(pos1+3, str.length() - pos1 - 3);
@@ -1092,7 +1092,7 @@ Dispatcher* MSNSwitchBoardSocket::PeerDispatcher()
 
 // 		TQObject::connect(this, TQT_SIGNAL(blockRead(const TQByteArray&)), m_dispatcher, TQT_SLOT(slotReadMessage(const TQByteArray&)));
 // 		TQObject::connect(m_dispatcher, TQT_SIGNAL(sendCommand(const TQString&, const TQString&, bool, const TQByteArray&, bool)), this, TQT_SLOT(sendCommand(const TQString&, const TQString&, bool, const TQByteArray&, bool)));
-		TQObject::connect(m_dispatcher, TQT_SIGNAL(incomingTransfer(const TQString&, const TQString&, Q_INT64)), this, TQT_SLOT(slotIncomingFileTransfer(const TQString&, const TQString&, Q_INT64)));
+		TQObject::connect(m_dispatcher, TQT_SIGNAL(incomingTransfer(const TQString&, const TQString&, TQ_INT64)), this, TQT_SLOT(slotIncomingFileTransfer(const TQString&, const TQString&, TQ_INT64)));
 		TQObject::connect(m_dispatcher, TQT_SIGNAL(displayIconReceived(KTempFile *, const TQString&)), this, TQT_SLOT(slotEmoticonReceived( KTempFile *, const TQString&)));
 		TQObject::connect(this, TQT_SIGNAL(msgAcknowledgement(unsigned int, bool)), m_dispatcher, TQT_SLOT(messageAcknowledged(unsigned int, bool)));
 		m_dispatcher->m_pictureUrl = m_account->pictureUrl();
@@ -1104,7 +1104,7 @@ void MSNSwitchBoardSocket::slotKeepAliveTimer( )
 {
 	/*
 	This is a workaround against the bug 113425
-	The problem:  the P2P::Webcam class is parent of us, and when we get deleted, it get deleted.
+	The problem:  the P2P::Webcam class is tqparent of us, and when we get deleted, it get deleted.
 			the correct solution would be to change that.
 	The second problem: after one minute of inactivity, the official client close the chat socket.
 	the workaround: we simulate the activity by sending small packet each 50 seconds
@@ -1112,7 +1112,7 @@ void MSNSwitchBoardSocket::slotKeepAliveTimer( )
 	the bad side effect:  some switchboard connection may be maintained for really long time!
 	 */
 	
-	if ( onlineStatus() != Connected || m_chatMembers.empty())
+	if ( onlinetqStatus() != Connected || m_chatMembers.empty())
 	{
 		//we are not yet in a chat.
 		//if we send that command now, we may get disconnected.
diff --git a/kopete/protocols/msn/msnswitchboardsocket.h b/kopete/protocols/msn/msnswitchboardsocket.h
index 178143e4..df76eab0 100644
--- a/kopete/protocols/msn/msnswitchboardsocket.h
+++ b/kopete/protocols/msn/msnswitchboardsocket.h
@@ -43,12 +43,13 @@ namespace P2P { class Dispatcher; }
 class KOPETE_EXPORT MSNSwitchBoardSocket : public MSNSocket
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	/**
 	 * Contructor: id is the KopeteMessageMangager's id
 	 */
-	MSNSwitchBoardSocket( MSNAccount * account , TQObject *parent);
+	MSNSwitchBoardSocket( MSNAccount * account , TQObject *tqparent);
 	~MSNSwitchBoardSocket();
 
 private:
@@ -69,13 +70,13 @@ private:
 	//used for emoticons
 	TQValueList<const Kopete::Message> m_msgQueue;
 	unsigned  m_recvIcons;
-	TQMap<TQString , QPair<TQString , KTempFile*> >  m_emoticons;
+	TQMap<TQString , TQPair<TQString , KTempFile*> >  m_emoticons;
 	Kopete::Message &parseCustomEmoticons(Kopete::Message &msg);
 	TQTimer *m_emoticonTimer;
 	TQPtrList<KTempFile> m_typewrited;
 
 	struct InkMessage{
-		Q_UINT32 chunks;
+		TQ_UINT32 chunks;
 		TQString data;
 	};
 	TQMap<TQString, InkMessage> m_inkMessageBuffer;
@@ -141,7 +142,7 @@ private slots:
 	void slotSocketClosed(  );
 	void slotReadMessage( const TQByteArray &bytes );
 	void slotEmoticonReceived( KTempFile *, const TQString& );
-	void slotIncomingFileTransfer(const TQString& from, const TQString& fileName, Q_INT64 fileSize);
+	void slotIncomingFileTransfer(const TQString& from, const TQString& fileName, TQ_INT64 fileSize);
 	void cleanQueue();
 	
 	/** workaround Bug 113425 . see comment inside the function **/
diff --git a/kopete/protocols/msn/outgoingtransfer.cpp b/kopete/protocols/msn/outgoingtransfer.cpp
index f6b71c12..39d3c5d0 100644
--- a/kopete/protocols/msn/outgoingtransfer.cpp
+++ b/kopete/protocols/msn/outgoingtransfer.cpp
@@ -25,7 +25,7 @@
 #include <kmdcodec.h>
 using namespace KNetwork;
 
-// Qt includes
+// TQt includes
 #include <tqfile.h>
 #include <tqregexp.h>
 #include <tqtimer.h>
@@ -39,7 +39,7 @@ using P2P::Dispatcher;
 using P2P::OutgoingTransfer;
 using P2P::Message;
 
-OutgoingTransfer::OutgoingTransfer(const TQString& to, P2P::Dispatcher *dispatcher, Q_UINT32 sessionId)
+OutgoingTransfer::OutgoingTransfer(const TQString& to, P2P::Dispatcher *dispatcher, TQ_UINT32 sessionId)
 : TransferContext(to,dispatcher,sessionId)
 {
 	m_direction = Outgoing;
@@ -83,7 +83,7 @@ void OutgoingTransfer::sendImage(const TQByteArray& image)
 
 void OutgoingTransfer::slotSendData()
 {
-	Q_INT32 bytesRead = 0;
+	TQ_INT32 bytesRead = 0;
 	TQByteArray buffer(1202);
 	if(!m_file)
 		return;
@@ -101,7 +101,7 @@ void OutgoingTransfer::slotSendData()
 			buffer.resize(bytesRead);
 		}
 
-		kdDebug(14140) << k_funcinfo << TQString("Sending, %1 bytes").arg(bytesRead) << endl;
+		kdDebug(14140) << k_funcinfo << TQString("Sending, %1 bytes").tqarg(bytesRead) << endl;
 
 		if((m_offset + bytesRead) < m_file->size())
 		{
@@ -254,11 +254,11 @@ void OutgoingTransfer::processMessage(const Message& message)
 
 			// Send the direct connection invitation message.
 			TQString content = "Bridges: TRUDPv1 TCPv1\r\n" +
-				TQString("NetID: %1\r\n").arg("-123657987") +
-				TQString("Conn-Type: %1\r\n").arg("Restrict-NAT") +
+				TQString("NetID: %1\r\n").tqarg("-123657987") +
+				TQString("Conn-Type: %1\r\n").tqarg("Restrict-NAT") +
 				"UPnPNat: false\r\n"
 				"ICF: false\r\n" +
-				TQString("Hashed-Nonce: {%1}\r\n").arg(P2P::Uid::createUid()) +
+				TQString("Hashed-Nonce: {%1}\r\n").tqarg(P2P::Uid::createUid()) +
 				"\r\n";
 			sendMessage(INVITE, content);
 		}
@@ -357,7 +357,7 @@ void OutgoingTransfer::slotConnected()
 {
 	kdDebug(14140) << k_funcinfo << endl;
 	// Check if connection is ok.
-	Q_UINT32 bytesWritten = m_socket->writeBlock(TQCString("foo").data(), 4);
+	TQ_UINT32 bytesWritten = m_socket->writeBlock(TQCString("foo").data(), 4);
 	if(bytesWritten != 4)
 	{
 		// Not all data was written, close the socket.
@@ -381,10 +381,10 @@ void OutgoingTransfer::slotConnected()
 	handshake.header.ackSessionIdentifier = nonce.mid(0, 8).toUInt(0, 16);
 	handshake.header.ackUniqueIdentifier  =
 		nonce.mid(8, 4).toUInt(0, 16) | (nonce.mid(12, 4).toUInt(0, 16) << 16);
-	const Q_UINT32 lo = nonce.mid(16, 8).toUInt(0, 16);
-	const Q_UINT32 hi = nonce.mid(24, 8).toUInt(0, 16);
+	const TQ_UINT32 lo = nonce.mid(16, 8).toUInt(0, 16);
+	const TQ_UINT32 hi = nonce.mid(24, 8).toUInt(0, 16);
 	handshake.header.ackDataSize =
-		((Q_INT64)htonl(lo)) | (((Q_INT64)htonl(hi)) << 32);
+		((TQ_INT64)htonl(lo)) | (((TQ_INT64)htonl(hi)) << 32);
 
 	TQByteArray stream;
 	// Write the message to the memory stream.
@@ -395,13 +395,13 @@ void OutgoingTransfer::slotConnected()
 
 void OutgoingTransfer::slotRead()
 {
-	Q_INT32 bytesAvailable = m_socket->bytesAvailable();
+	TQ_INT32 bytesAvailable = m_socket->bytesAvailable();
 	kdDebug(14140) << k_funcinfo << bytesAvailable << ", bytes available." << endl;
 }
 
 void OutgoingTransfer::slotSocketError(int)
 {
-	kdDebug(14140) << k_funcinfo << m_socket->errorString() << endl;
+	kdDebug(14140) << k_funcinfo << m_socket->KSocketBase::errorString() << endl;
 	// If an error has occurred, try to connect
 	// to another available peer endpoint.
 	// If there are no more available endpoints,
diff --git a/kopete/protocols/msn/outgoingtransfer.h b/kopete/protocols/msn/outgoingtransfer.h
index ee55593f..90542151 100644
--- a/kopete/protocols/msn/outgoingtransfer.h
+++ b/kopete/protocols/msn/outgoingtransfer.h
@@ -27,8 +27,9 @@
 namespace P2P{
 	class OutgoingTransfer : public TransferContext
 	{	Q_OBJECT
+  TQ_OBJECT
 		public:
-			OutgoingTransfer(const TQString& to, P2P::Dispatcher *dispatcher, Q_UINT32 sessionId);
+			OutgoingTransfer(const TQString& to, P2P::Dispatcher *dispatcher, TQ_UINT32 sessionId);
 			virtual ~OutgoingTransfer();
 
 			void sendImage(const TQByteArray& image);
diff --git a/kopete/protocols/msn/p2p.cpp b/kopete/protocols/msn/p2p.cpp
index 1aa3ddae..7de59a20 100644
--- a/kopete/protocols/msn/p2p.cpp
+++ b/kopete/protocols/msn/p2p.cpp
@@ -26,7 +26,7 @@ using P2P::TransferType;
 // Kde includes
 #include <kbufferedsocket.h>
 #include <kdebug.h>
-// Qt includes
+// TQt includes
 #include <tqfile.h>
 
 // Kopete includes
@@ -44,7 +44,7 @@ TQString P2P::Uid::createUid()
 			+ TQString::number((unsigned long int)rand()%0xAAFF+0x1111, 16)).upper();
 }
 
-TransferContext::TransferContext(const TQString &contact, P2P::Dispatcher *dispatcher, Q_UINT32 sessionId)
+TransferContext::TransferContext(const TQString &contact, P2P::Dispatcher *dispatcher, TQ_UINT32 sessionId)
 	: TQObject(dispatcher) ,
 	   m_sessionId(sessionId) ,
 	   m_identifier(0) ,
@@ -206,7 +206,7 @@ void TransferContext::sendDataPreparation()
  	m_dispatcher->callbackChannel()->send(stream);
 }
 
-void TransferContext::sendMessage(MessageType type, const TQString& content, Q_INT32 flag, Q_INT32 appId)
+void TransferContext::sendMessage(MessageType type, const TQString& content, TQ_INT32 flag, TQ_INT32 appId)
 {
 	Message outbound;
 	if(appId != 0){
@@ -318,8 +318,8 @@ void TransferContext::sendMessage(MessageType type, const TQString& content, Q_I
 
 void TransferContext::sendMessage(Message& outbound, const TQByteArray& body)
 {
-	Q_INT64 offset = 0L, bytesLeft = outbound.header.totalDataSize;
-	Q_INT16 chunkLength = 1202;
+	TQ_INT64 offset = 0L, bytesLeft = outbound.header.totalDataSize;
+	TQ_INT16 chunkLength = 1202;
 
 	// Split the outbound message if necessary.
 	while(bytesLeft > 0L)
diff --git a/kopete/protocols/msn/p2p.h b/kopete/protocols/msn/p2p.h
index e3bdd6ff..363fb3ff 100644
--- a/kopete/protocols/msn/p2p.h
+++ b/kopete/protocols/msn/p2p.h
@@ -17,7 +17,7 @@
 #ifndef P2P_H
 #define P2P_H
 
-// Qt includes
+// TQt includes
 #include <tqobject.h>
 #include "messageformatter.h"
 
@@ -64,15 +64,15 @@ namespace P2P{
 
 	struct TransportHeader
 	{
-		Q_UINT32 sessionId;
-		Q_UINT32 identifier;
-		Q_INT64  dataOffset;
-		Q_INT64  totalDataSize;
-		Q_UINT32 dataSize;
-		Q_UINT32 flag;
-		Q_UINT32 ackSessionIdentifier;
-		Q_UINT32 ackUniqueIdentifier;
-		Q_INT64  ackDataSize;
+		TQ_UINT32 sessionId;
+		TQ_UINT32 identifier;
+		TQ_INT64  dataOffset;
+		TQ_INT64  totalDataSize;
+		TQ_UINT32 dataSize;
+		TQ_UINT32 flag;
+		TQ_UINT32 ackSessionIdentifier;
+		TQ_UINT32 ackUniqueIdentifier;
+		TQ_INT64  ackDataSize;
 	};
 
 	struct Message
@@ -84,7 +84,7 @@ namespace P2P{
 			TQString source;
 			TransportHeader header;
 			TQByteArray body;
-			Q_INT32 applicationIdentifier;
+			TQ_INT32 applicationIdentifier;
 			bool attachApplicationIdentifier;
 	};
 
@@ -93,8 +93,9 @@ namespace P2P{
 		public: static TQString createUid();
 	};
 
-	class KOPETE_EXPORT TransferContext : public QObject
+	class KOPETE_EXPORT TransferContext : public TQObject
 	{	Q_OBJECT
+  TQ_OBJECT
 		public:
 			virtual ~TransferContext();
 
@@ -103,16 +104,16 @@ namespace P2P{
 			void error();
 			virtual void processMessage(const P2P::Message& message) = 0;
 			void sendDataPreparation();
-			void sendMessage(MessageType type, const TQString& content=TQString::null, Q_INT32 flag=0, Q_INT32 appId=0);
+			void sendMessage(MessageType type, const TQString& content=TQString(), TQ_INT32 flag=0, TQ_INT32 appId=0);
 			void setType(TransferType type);
 
 		public:
-			Q_UINT32 m_sessionId;
-			Q_UINT32 m_identifier;
+			TQ_UINT32 m_sessionId;
+			TQ_UINT32 m_identifier;
 			TQFile   *m_file;
-			Q_UINT32 m_transactionId;
-			Q_UINT32 m_ackSessionIdentifier;
-			Q_UINT32 m_ackUniqueIdentifier;
+			TQ_UINT32 m_transactionId;
+			TQ_UINT32 m_ackSessionIdentifier;
+			TQ_UINT32 m_ackUniqueIdentifier;
 			Kopete::Transfer *m_transfer;
 			TQString  m_branch;
 			TQString  m_callId;
@@ -124,17 +125,17 @@ namespace P2P{
 			void readyWrite();
 
 		protected:
-			TransferContext(const TQString& contact, P2P::Dispatcher *dispatcher,Q_UINT32 sessionId);
+			TransferContext(const TQString& contact, P2P::Dispatcher *dispatcher,TQ_UINT32 sessionId);
 			void sendData(const TQByteArray& bytes);
 			void sendMessage(P2P::Message& outbound, const TQByteArray& body);
 			virtual void readyToSend();
 
-			Q_UINT32 m_baseIdentifier;
+			TQ_UINT32 m_baseIdentifier;
 			TransferDirection m_direction;
 			P2P::Dispatcher *m_dispatcher;
 			bool m_isComplete;
-			Q_INT64 m_offset;
-			Q_INT64 m_totalDataSize;
+			TQ_INT64 m_offset;
+			TQ_INT64 m_totalDataSize;
 			P2P::MessageFormatter m_messageFormatter;
 			TQString m_recipient;
 			TQString m_sender;
diff --git a/kopete/protocols/msn/sha1.cpp b/kopete/protocols/msn/sha1.cpp
index 0774cede..d7c6549b 100644
--- a/kopete/protocols/msn/sha1.cpp
+++ b/kopete/protocols/msn/sha1.cpp
@@ -42,7 +42,7 @@ SHA1::SHA1()
 	qSysInfo(&wordSize, &bigEndian);
 }
 
-unsigned long SHA1::blk0(Q_UINT32 i)
+unsigned long SHA1::blk0(TQ_UINT32 i)
 {
 	if(bigEndian)
 		return block->l[i];
@@ -51,9 +51,9 @@ unsigned long SHA1::blk0(Q_UINT32 i)
 }
 
 // Hash a single 512-bit block. This is the core of the algorithm.
-void SHA1::transform(Q_UINT32 state[5], unsigned char buffer[64])
+void SHA1::transform(TQ_UINT32 state[5], unsigned char buffer[64])
 {
-	Q_UINT32 a, b, c, d, e;
+	TQ_UINT32 a, b, c, d, e;
 
 	block = (CHAR64LONG16*)buffer;
 
@@ -110,9 +110,9 @@ void SHA1::init(SHA1_CONTEXT* context)
 }
 
 // Run your data through this
-void SHA1::update(SHA1_CONTEXT* context, unsigned char* data, Q_UINT32 len)
+void SHA1::update(SHA1_CONTEXT* context, unsigned char* data, TQ_UINT32 len)
 {
-	Q_UINT32 i, j;
+	TQ_UINT32 i, j;
 
 	j = (context->count[0] >> 3) & 63;
 	if((context->count[0] += len << 3) < (len << 3))
@@ -135,7 +135,7 @@ void SHA1::update(SHA1_CONTEXT* context, unsigned char* data, Q_UINT32 len)
 // Add padding and return the message digest
 void SHA1::final(unsigned char digest[20], SHA1_CONTEXT* context)
 {
-	Q_UINT32 i, j;
+	TQ_UINT32 i, j;
 	unsigned char finalcount[8];
 
 	for (i = 0; i < 8; i++) {
diff --git a/kopete/protocols/msn/sha1.h b/kopete/protocols/msn/sha1.h
index 2038b9e7..eee84abc 100644
--- a/kopete/protocols/msn/sha1.h
+++ b/kopete/protocols/msn/sha1.h
@@ -35,22 +35,22 @@ private:
 
 	struct SHA1_CONTEXT
 	{
-		Q_UINT32 state[5];
-		Q_UINT32 count[2];
+		TQ_UINT32 state[5];
+		TQ_UINT32 count[2];
 		unsigned char buffer[64];
 	};
 
 	typedef union {
 		unsigned char c[64];
-		Q_UINT32 l[16];
+		TQ_UINT32 l[16];
 	} CHAR64LONG16;
 
-	void transform(Q_UINT32 state[5], unsigned char buffer[64]);
+	void transform(TQ_UINT32 state[5], unsigned char buffer[64]);
 	void init(SHA1_CONTEXT* context);
-	void update(SHA1_CONTEXT* context, unsigned char* data, Q_UINT32 len);
+	void update(SHA1_CONTEXT* context, unsigned char* data, TQ_UINT32 len);
 	void final(unsigned char digest[20], SHA1_CONTEXT* context);
 
-	unsigned long blk0(Q_UINT32 i);
+	unsigned long blk0(TQ_UINT32 i);
 	bool bigEndian;
 
 	CHAR64LONG16* block;
diff --git a/kopete/protocols/msn/transport.cpp b/kopete/protocols/msn/transport.cpp
index 904e9411..6b913816 100644
--- a/kopete/protocols/msn/transport.cpp
+++ b/kopete/protocols/msn/transport.cpp
@@ -34,8 +34,8 @@ using namespace KNetwork;
 
 namespace PeerToPeer {
 
-Transport::Transport(TQObject* parent, const char* name)
- : TQObject(parent, name)
+Transport::Transport(TQObject* tqparent, const char* name)
+ : TQObject(tqparent, name)
 {
 	mFormatter = new PeerToPeer::MessageFormatter(this);
 }
@@ -47,11 +47,11 @@ Transport::~Transport()
 
 //BEGIN Public Methods
 
-TransportBridge* Transport::getBridge (const TQString& to, Q_UINT16 port, TransportBridgeType type, const TQString& identifier)
+TransportBridge* Transport::getBridge (const TQString& to, TQ_UINT16 port, TransportBridgeType type, const TQString& identifier)
 {
 	TransportBridge *bridge = 0l;
 	KInetSocketAddress address;
-	if (mAddresses.contains(to))
+	if (mAddresses.tqcontains(to))
 	{
 		address = mAddresses[to];
 	}
@@ -103,15 +103,15 @@ void Transport::slotOnReceive(const TQString& contact, const TQByteArray& bytes)
 
 
 
-TransportBridge::TransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* parent, const char* name)
-: TQObject(parent, name)
+TransportBridge::TransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* tqparent, const char* name)
+: TQObject(tqparent, name)
 {
 	mAddress = to;
 	mFormatter = formatter;
 }
 
-TransportBridge::TransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* parent, const char* name)
-: TQObject(parent, name)
+TransportBridge::TransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* tqparent, const char* name)
+: TQObject(tqparent, name)
 {
 	mSocket = socket;
 	mAddress = mSocket->peerAddress();
@@ -166,8 +166,8 @@ void TransportBridge::slotOnSocketReceive()
 
 
 
-TcpTransportBridge::TcpTransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* parent, const char* name)
-: TransportBridge(to, formatter, parent, name)
+TcpTransportBridge::TcpTransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* tqparent, const char* name)
+: TransportBridge(to, formatter, tqparent, name)
 {	
 	mSocket = new KStreamSocket(mAddress.ipAddress().toString(), TQString::number(mAddress.port()), this);
 	mSocket->setBlocking(false);
@@ -176,8 +176,8 @@ TcpTransportBridge::TcpTransportBridge(const KNetwork::KInetSocketAddress& to, M
 	mConnected = false;
 }
 
-TcpTransportBridge::TcpTransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* parent, const char* name)
-: TransportBridge(socket, formatter, parent, name)
+TcpTransportBridge::TcpTransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* tqparent, const char* name)
+: TransportBridge(socket, formatter, tqparent, name)
 {
 	mConnected = (mSocket->state() == KStreamSocket::Open) ? true : false;
 	mSocket->setBlocking(false);
@@ -213,7 +213,7 @@ void TcpTransportBridge::slotOnDisconnect()
 void TcpTransportBridge::slotOnError(int errorCode)
 {
 	kdDebug(14140) << k_funcinfo << "Bridge (" << name() << ") ERROR occurred on {" << mSocket->localAddress().toString() << " <-> " << mSocket->peerAddress().toString() << "} - " << mSocket->errorString() << endl;
-	emit bridgeError(TQString("Bridge ERROR %1: %2").arg(errorCode).arg(mSocket->errorString()));
+	emit bridgeError(TQString("Bridge ERROR %1: %2").tqarg(errorCode).tqarg(mSocket->errorString()));
 	if (mConnected){
 		mSocket->disconnect();
 		mConnected = false;
@@ -245,7 +245,7 @@ void TcpTransportBridge::slotOnSocketConnect()
 	mVerified = true;
 	TQString foo = "foo\0";
 	mSocket->writeBlock(foo.ascii(), foo.length());
-	foo = TQString::null;
+	foo = TQString();
 
 	emit bridgeConnect();
 }
@@ -311,7 +311,7 @@ void TcpTransportBridge::slotOnSocketConnectTimeout()
 
 
 
-TcpTransportBridge::Buffer::Buffer(Q_UINT32 length)
+TcpTransportBridge::Buffer::Buffer(TQ_UINT32 length)
 : TQByteArray(length)
 {
 }
@@ -330,7 +330,7 @@ void TcpTransportBridge::Buffer::write(const TQByteArray& bytes)
 	}
 }
 
-TQByteArray TcpTransportBridge::Buffer::read(Q_UINT32 length)
+TQByteArray TcpTransportBridge::Buffer::read(TQ_UINT32 length)
 {
 	if (length >= size()) return TQByteArray();
 
diff --git a/kopete/protocols/msn/transport.h b/kopete/protocols/msn/transport.h
index eb190325..a606714b 100644
--- a/kopete/protocols/msn/transport.h
+++ b/kopete/protocols/msn/transport.h
@@ -47,15 +47,16 @@ enum TransportBridgeType
 /**
  @author Gregg Edghill <gregg.edghill@gmail.com> */
 /** @brief Represents the protocol used to send and receive message between peers. */
-class Transport : public QObject
+class Transport : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	/** @brief Creates a new instance of the class Transport. */
-    Transport(TQObject* parent, const char* name = 0l);
+    Transport(TQObject* tqparent, const char* name = 0l);
     ~Transport();
 	/** @brief Get a transport bridge with the specified address, port, type and identifier. */
-    TransportBridge* getBridge(const TQString& address, Q_UINT16 port, TransportBridgeType type, const TQString& identifier);
+    TransportBridge* getBridge(const TQString& address, TQ_UINT16 port, TransportBridgeType type, const TQString& identifier);
     /** @brief Sets the default transport bridge. */
 	void setDefaultBridge(MSNSwitchBoardSocket* mss);
 	
@@ -77,17 +78,18 @@ private:
 };
 
 /** @brief Represents the channel connecting two peers. */
-class TransportBridge : public QObject
+class TransportBridge : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	virtual ~TransportBridge();
 
 protected:
 	/** @brief Creates a new instance of the class TransportBridge with the specified address and formatter. */
-	TransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* parent, const char* name = 0l);
+	TransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* tqparent, const char* name = 0l);
 	/** @brief Creates a new instance of the class TransportBridge with the specified socket and formatter. */
-	TransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* parent, const char* name = 0l);
+	TransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* tqparent, const char* name = 0l);
 
 public:
 	/** @brief Creates a connection between two peers. */
@@ -114,7 +116,7 @@ protected:
 	KNetwork::KInetSocketAddress mAddress;
 	bool mConnected;
 	MessageFormatter *mFormatter;
-	Q_UINT32 mLength;
+	TQ_UINT32 mLength;
 	KNetwork::KClientSocketBase *mSocket;
 	bool mVerified;
 };
@@ -122,14 +124,15 @@ protected:
 class TcpTransportBridge : public TransportBridge
 {
 	Q_OBJECT
+  TQ_OBJECT
 	friend class Transport;
 	
 public:
 	virtual ~TcpTransportBridge();
 
 private:
-	TcpTransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* parent, const char* name = 0l);
-	TcpTransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* parent, const char* name = 0l);
+	TcpTransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* tqparent, const char* name = 0l);
+	TcpTransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* tqparent, const char* name = 0l);
 	
 protected slots:
 	virtual void slotOnConnect();
@@ -146,19 +149,19 @@ signals:
 	void bridgeConnectTimeout();
 	
 private:
-	class Buffer : public QByteArray
+	class Buffer : public TQByteArray
 	{
 	public:
-		Buffer(Q_UINT32 length = 0);
+		Buffer(TQ_UINT32 length = 0);
 		~Buffer();
 		
 	public:
 		void write(const TQByteArray& bytes);
-		TQByteArray read(Q_UINT32 length);
+		TQByteArray read(TQ_UINT32 length);
 	};
 	
 	Buffer mBuffer;
-	Q_UINT32 mLength;
+	TQ_UINT32 mLength;
 };
 
 
diff --git a/kopete/protocols/msn/ui/msnadd.ui b/kopete/protocols/msn/ui/msnadd.ui
index ff99bb92..6373ccf3 100644
--- a/kopete/protocols/msn/ui/msnadd.ui
+++ b/kopete/protocols/msn/ui/msnadd.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>msnAddUI</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>msnAddUI</cstring>
     </property>
@@ -22,22 +22,22 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout21</cstring>
+                <cstring>tqlayout21</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
                     <property name="text">
                         <string>&amp;MSN Passport ID:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignTop</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -50,7 +50,7 @@
                         <string>The user ID of the MSN contact you would like to add.  This should be in the form of a valid E-mail address.</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit">
+                <widget class="TQLineEdit">
                     <property name="name">
                         <cstring>addID</cstring>
                     </property>
@@ -63,14 +63,14 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel2</cstring>
             </property>
             <property name="text">
                 <string>&lt;i&gt;(for example: joe@hotmail.com)&lt;/i&gt;</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
@@ -84,7 +84,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>160</height>
@@ -93,5 +93,5 @@
         </spacer>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/msn/ui/msndebugrawcommand_base.ui b/kopete/protocols/msn/ui/msndebugrawcommand_base.ui
index 3b98ce0d..27c1050f 100644
--- a/kopete/protocols/msn/ui/msndebugrawcommand_base.ui
+++ b/kopete/protocols/msn/ui/msndebugrawcommand_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>MSNDebugRawCommand_base</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>MSNDebugRawCommand_base</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>TextLabel2</cstring>
             </property>
@@ -33,12 +33,12 @@
                 <cstring>m_params</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="0" column="1">
+        <widget class="TQLineEdit" row="0" column="1">
             <property name="name">
                 <cstring>m_command</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -49,12 +49,12 @@
                 <cstring>m_command</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="1" column="1">
+        <widget class="TQLineEdit" row="1" column="1">
             <property name="name">
                 <cstring>m_params</cstring>
             </property>
         </widget>
-        <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>m_addId</cstring>
             </property>
@@ -65,7 +65,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>m_addNewline</cstring>
             </property>
@@ -84,7 +84,7 @@
                 <enum>PlainText</enum>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>TextLabel3</cstring>
             </property>
@@ -100,7 +100,7 @@
     <tabstop>m_addId</tabstop>
     <tabstop>m_addNewline</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>ktextedit.h</includehint>
 </includehints>
diff --git a/kopete/protocols/msn/ui/msneditaccountui.ui b/kopete/protocols/msn/ui/msneditaccountui.ui
index 5a3b8294..b4bfe186 100644
--- a/kopete/protocols/msn/ui/msneditaccountui.ui
+++ b/kopete/protocols/msn/ui/msneditaccountui.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>MSNEditAccountUI</class>
 <author>Olivier Goffart</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -26,14 +26,14 @@
         <property name="spacing">
             <number>0</number>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>tabWidget3</cstring>
             </property>
             <property name="tabShape">
                 <enum>Rounded</enum>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab_connection</cstring>
                 </property>
@@ -54,14 +54,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>146</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QGroupBox" row="1" column="0">
+                    <widget class="TQGroupBox" row="1" column="0">
                         <property name="name">
                             <cstring>groupBox5</cstring>
                         </property>
@@ -80,7 +80,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>textLabel6</cstring>
                                 </property>
@@ -92,7 +92,7 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="minimumSize">
+                                <property name="tqminimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
@@ -101,11 +101,11 @@
                                 <property name="text">
                                     <string>To connect to the Microsoft network, you will need a Microsoft Passport.&lt;br&gt;&lt;br&gt;If you do not currently have a Passport, please click the button to create one.</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>WordBreak|AlignVCenter</set>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>buttonRegister</cstring>
                                 </property>
@@ -115,7 +115,7 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QGroupBox" row="0" column="0">
+                    <widget class="TQGroupBox" row="0" column="0">
                         <property name="name">
                             <cstring>m_accountInfo</cstring>
                         </property>
@@ -126,15 +126,15 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLayoutWidget" row="0" column="0">
+                            <widget class="TQLayoutWidget" row="0" column="0">
                                 <property name="name">
-                                    <cstring>layout14</cstring>
+                                    <cstring>tqlayout14</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>TextLabel1_3</cstring>
                                         </property>
@@ -159,7 +159,7 @@
                                             <string>The user ID of the MSN contact you would like to use.  This should be in the form of a valid E-mail address.</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLineEdit">
+                                    <widget class="TQLineEdit">
                                         <property name="name">
                                             <cstring>m_login</cstring>
                                         </property>
@@ -180,7 +180,7 @@
                                     <cstring>m_password</cstring>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="2" column="0">
+                            <widget class="TQCheckBox" row="2" column="0">
                                 <property name="name">
                                     <cstring>m_autologin</cstring>
                                 </property>
@@ -194,7 +194,7 @@
                                     <string>If you check this checkbox, the account will not be connected when you press the "Connect All" button, or at startup when automatic connection at startup is enabled.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="3" column="0">
+                            <widget class="TQCheckBox" row="3" column="0">
                                 <property name="name">
                                     <cstring>m_globalIdentity</cstring>
                                 </property>
@@ -206,7 +206,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>TabPage</cstring>
                 </property>
@@ -217,7 +217,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel">
+                    <widget class="TQLabel">
                         <property name="name">
                             <cstring>textLabel1_3</cstring>
                         </property>
@@ -229,11 +229,11 @@
                         <property name="text">
                             <string>&lt;qt&gt;&lt;b&gt;Note:&lt;/b&gt; These settings are applicable to all MSN accounts</string>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>WordBreak|AlignCenter</set>
                         </property>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>global_settings_page</cstring>
                         </property>
@@ -244,7 +244,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>NotifyNewChat</cstring>
                                 </property>
@@ -263,15 +263,15 @@
                                     <string>This option will notify you when a contact starts typing their message, before the message is sent or finished.</string>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout13_2</cstring>
+                                    <cstring>tqlayout13_2</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>textLabel1_4</cstring>
                                         </property>
@@ -285,7 +285,7 @@
 &lt;dt&gt;Automatically&lt;/dt&gt;&lt;dd&gt;Always try to download the picture if the contact has one.  &lt;b&gt;Note:&lt;/b&gt; this will open a socket, and let the user know you are downloading their picture.&lt;/dd&gt;&lt;/dl&gt;</string>
                                         </property>
                                     </widget>
-                                    <widget class="QComboBox">
+                                    <widget class="TQComboBox">
                                         <item>
                                             <property name="text">
                                                 <string>Only Manually</string>
@@ -324,7 +324,7 @@
                                     </widget>
                                 </hbox>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>useCustomEmoticons</cstring>
                                 </property>
@@ -338,7 +338,7 @@
                                     <string>MSN Messenger allows users to download and use custom emoticons. If this option is enabled, Kopete will download these emoticons and show them.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>exportEmoticons</cstring>
                                 </property>
@@ -355,7 +355,7 @@ Only works for emoticons in the PNG format.</string>
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>privacy_page</cstring>
                         </property>
@@ -366,7 +366,7 @@ Only works for emoticons in the PNG format.</string>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>SendClientInfo</cstring>
                                 </property>
@@ -389,7 +389,7 @@ Only works for emoticons in the PNG format.</string>
                                     <string>Third party MSN clients, such as Kopete, give users the ability to let other third party clients guess which client they are using. We recommend leaving this checkbox checked.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>SendTypingNotification</cstring>
                                 </property>
@@ -406,15 +406,15 @@ Only works for emoticons in the PNG format.</string>
                                     <string>&lt;qt&gt;Check this box to send &lt;b&gt;Typing notifications&lt;/b&gt; to your contacts. When you are composing a message, you might want your contact to know that you are typing so that he knows you are answering.&lt;/qt&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout28</cstring>
+                                    <cstring>tqlayout28</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>SendJabber</cstring>
                                         </property>
@@ -449,7 +449,7 @@ Only works for emoticons in the PNG format.</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>61</width>
                                                 <height>21</height>
@@ -468,21 +468,21 @@ Only works for emoticons in the PNG format.</string>
                                 <property name="sizeType">
                                     <enum>Minimum</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>21</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>textLabel1_5</cstring>
                                 </property>
                                 <property name="text">
                                     <string>There are also privacy options in the "Contacts" tab</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>WordBreak|AlignCenter</set>
                                 </property>
                             </widget>
@@ -498,7 +498,7 @@ Only works for emoticons in the PNG format.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>31</width>
                                 <height>40</height>
@@ -507,7 +507,7 @@ Only works for emoticons in the PNG format.</string>
                     </spacer>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab_info</cstring>
                 </property>
@@ -518,7 +518,7 @@ Only works for emoticons in the PNG format.</string>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
                             <cstring>Layout22_2</cstring>
                         </property>
@@ -532,7 +532,7 @@ Only works for emoticons in the PNG format.</string>
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>TextLabel2_2_2</cstring>
                                 </property>
@@ -554,7 +554,7 @@ Only works for emoticons in the PNG format.</string>
                                     <string>The alias you would like to use on MSN.  You may change this at any time you wish.</string>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit">
+                            <widget class="TQLineEdit">
                                 <property name="name">
                                     <cstring>m_displayName</cstring>
                                 </property>
@@ -567,7 +567,7 @@ Only works for emoticons in the PNG format.</string>
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>m_phones</cstring>
                         </property>
@@ -578,7 +578,7 @@ Only works for emoticons in the PNG format.</string>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>TextLabel5</cstring>
                                 </property>
@@ -589,7 +589,7 @@ Only works for emoticons in the PNG format.</string>
                                     <cstring>m_phh</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>TextLabel6</cstring>
                                 </property>
@@ -600,17 +600,17 @@ Only works for emoticons in the PNG format.</string>
                                     <cstring>m_phw</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="0" column="1">
+                            <widget class="TQLineEdit" row="0" column="1">
                                 <property name="name">
                                     <cstring>m_phw</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="1" column="1">
+                            <widget class="TQLineEdit" row="1" column="1">
                                 <property name="name">
                                     <cstring>m_phh</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="2" column="0">
+                            <widget class="TQLabel" row="2" column="0">
                                 <property name="name">
                                     <cstring>TextLabel7</cstring>
                                 </property>
@@ -621,14 +621,14 @@ Only works for emoticons in the PNG format.</string>
                                     <cstring>m_phm</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="2" column="1">
+                            <widget class="TQLineEdit" row="2" column="1">
                                 <property name="name">
                                     <cstring>m_phm</cstring>
                                 </property>
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>groupBox2</cstring>
                         </property>
@@ -639,15 +639,15 @@ Only works for emoticons in the PNG format.</string>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout17</cstring>
+                                    <cstring>tqlayout17</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>m_useDisplayPicture</cstring>
                                         </property>
@@ -655,7 +655,7 @@ Only works for emoticons in the PNG format.</string>
                                             <string>E&amp;xport a display picture</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>textLabel1_2</cstring>
                                         </property>
@@ -673,19 +673,19 @@ Only works for emoticons in the PNG format.</string>
                                         <property name="text">
                                             <string>Please select a square image. The image will be scaled to 96x96.</string>
                                         </property>
-                                        <property name="alignment">
+                                        <property name="tqalignment">
                                             <set>WordBreak|AlignVCenter</set>
                                         </property>
                                     </widget>
-                                    <widget class="QLayoutWidget">
+                                    <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout13</cstring>
+                                            <cstring>tqlayout13</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
                                                 <cstring>unnamed</cstring>
                                             </property>
-                                            <widget class="QPushButton">
+                                            <widget class="TQPushButton">
                                                 <property name="name">
                                                     <cstring>m_selectImage</cstring>
                                                 </property>
@@ -706,7 +706,7 @@ Only works for emoticons in the PNG format.</string>
                                                 <property name="sizeType">
                                                     <enum>Expanding</enum>
                                                 </property>
-                                                <property name="sizeHint">
+                                                <property name="tqsizeHint">
                                                     <size>
                                                         <width>61</width>
                                                         <height>21</height>
@@ -725,7 +725,7 @@ Only works for emoticons in the PNG format.</string>
                                         <property name="sizeType">
                                             <enum>Minimum</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>1</height>
@@ -734,9 +734,9 @@ Only works for emoticons in the PNG format.</string>
                                     </spacer>
                                 </vbox>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout16</cstring>
+                                    <cstring>tqlayout16</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -745,7 +745,7 @@ Only works for emoticons in the PNG format.</string>
                                     <property name="spacing">
                                         <number>0</number>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>m_displayPicture</cstring>
                                         </property>
@@ -760,13 +760,13 @@ Only works for emoticons in the PNG format.</string>
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="minimumSize">
+                                        <property name="tqminimumSize">
                                             <size>
                                                 <width>96</width>
                                                 <height>96</height>
                                             </size>
                                         </property>
-                                        <property name="maximumSize">
+                                        <property name="tqmaximumSize">
                                             <size>
                                                 <width>96</width>
                                                 <height>96</height>
@@ -789,7 +789,7 @@ Only works for emoticons in the PNG format.</string>
                                         <property name="sizeType">
                                             <enum>Minimum</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>1</height>
@@ -810,14 +810,14 @@ Only works for emoticons in the PNG format.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>21</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QLabel">
+                    <widget class="TQLabel">
                         <property name="name">
                             <cstring>m_warning_1</cstring>
                         </property>
@@ -836,13 +836,13 @@ Only works for emoticons in the PNG format.</string>
                         <property name="text">
                             <string>WARNING: You need to be connected to modify this page.</string>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>WordBreak|AlignVCenter</set>
                         </property>
                     </widget>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab_contacts</cstring>
                 </property>
@@ -853,7 +853,7 @@ Only works for emoticons in the PNG format.</string>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel">
+                    <widget class="TQLabel">
                         <property name="name">
                             <cstring>label_font</cstring>
                         </property>
@@ -863,15 +863,15 @@ Only works for emoticons in the PNG format.</string>
 &lt;b&gt;Bold&lt;/b&gt; contacts are in your contact list but you are not in their contact list.</string>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout6</cstring>
+                            <cstring>tqlayout6</cstring>
                         </property>
                         <grid>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel" row="0" column="2">
+                            <widget class="TQLabel" row="0" column="2">
                                 <property name="name">
                                     <cstring>textLabel2</cstring>
                                 </property>
@@ -882,20 +882,20 @@ Only works for emoticons in the PNG format.</string>
                                     <cstring>m_BL</cstring>
                                 </property>
                             </widget>
-                            <widget class="QListBox" row="1" column="0">
+                            <widget class="TQListBox" row="1" column="0">
                                 <property name="name">
                                     <cstring>m_AL</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget" row="1" column="1">
+                            <widget class="TQLayoutWidget" row="1" column="1">
                                 <property name="name">
-                                    <cstring>layout4</cstring>
+                                    <cstring>tqlayout4</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QPushButton">
+                                    <widget class="TQPushButton">
                                         <property name="name">
                                             <cstring>m_blockButton</cstring>
                                         </property>
@@ -903,7 +903,7 @@ Only works for emoticons in the PNG format.</string>
                                             <string>&amp;&gt;</string>
                                         </property>
                                     </widget>
-                                    <widget class="QPushButton">
+                                    <widget class="TQPushButton">
                                         <property name="name">
                                             <cstring>m_allowButton</cstring>
                                         </property>
@@ -921,7 +921,7 @@ Only works for emoticons in the PNG format.</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -930,7 +930,7 @@ Only works for emoticons in the PNG format.</string>
                                     </spacer>
                                 </vbox>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>textLabel1</cstring>
                                 </property>
@@ -941,16 +941,16 @@ Only works for emoticons in the PNG format.</string>
                                     <cstring>m_AL</cstring>
                                 </property>
                             </widget>
-                            <widget class="QListBox" row="1" column="2">
+                            <widget class="TQListBox" row="1" column="2">
                                 <property name="name">
                                     <cstring>m_BL</cstring>
                                 </property>
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout58</cstring>
+                            <cstring>tqlayout58</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -966,14 +966,14 @@ Only works for emoticons in the PNG format.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>41</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>m_blp</cstring>
                                 </property>
@@ -994,7 +994,7 @@ Only works for emoticons in the PNG format.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>41</width>
                                         <height>20</height>
@@ -1003,9 +1003,9 @@ Only works for emoticons in the PNG format.</string>
                             </spacer>
                         </hbox>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout59</cstring>
+                            <cstring>tqlayout59</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1021,18 +1021,18 @@ Only works for emoticons in the PNG format.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>81</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>m_RLButton</cstring>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>200</width>
                                         <height>32767</height>
@@ -1058,7 +1058,7 @@ Only works for emoticons in the PNG format.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>111</width>
                                         <height>20</height>
@@ -1067,7 +1067,7 @@ Only works for emoticons in the PNG format.</string>
                             </spacer>
                         </hbox>
                     </widget>
-                    <widget class="QLabel">
+                    <widget class="TQLabel">
                         <property name="name">
                             <cstring>m_warning_2</cstring>
                         </property>
@@ -1086,13 +1086,13 @@ Only works for emoticons in the PNG format.</string>
                         <property name="text">
                             <string>WARNING: You need to be connected to modify this page</string>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>WordBreak|AlignVCenter</set>
                         </property>
                     </widget>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>TabPage</cstring>
                 </property>
@@ -1103,7 +1103,7 @@ Only works for emoticons in the PNG format.</string>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>groupBox66</cstring>
                         </property>
@@ -1114,7 +1114,7 @@ Only works for emoticons in the PNG format.</string>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>optionOverrideServer</cstring>
                                 </property>
@@ -1122,17 +1122,17 @@ Only works for emoticons in the PNG format.</string>
                                     <string>&amp;Override default server information</string>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout20</cstring>
+                                    <cstring>tqlayout20</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLayoutWidget">
+                                    <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout19</cstring>
+                                            <cstring>tqlayout19</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -1141,7 +1141,7 @@ Only works for emoticons in the PNG format.</string>
                                             <property name="spacing">
                                                 <number>3</number>
                                             </property>
-                                            <widget class="QLabel">
+                                            <widget class="TQLabel">
                                                 <property name="name">
                                                     <cstring>labelServer</cstring>
                                                 </property>
@@ -1155,7 +1155,7 @@ Only works for emoticons in the PNG format.</string>
                                                     <cstring>m_serverName</cstring>
                                                 </property>
                                             </widget>
-                                            <widget class="QLabel">
+                                            <widget class="TQLabel">
                                                 <property name="name">
                                                     <cstring>labelPort</cstring>
                                                 </property>
@@ -1171,7 +1171,7 @@ Only works for emoticons in the PNG format.</string>
                                             </widget>
                                         </hbox>
                                     </widget>
-                                    <widget class="QLineEdit">
+                                    <widget class="TQLineEdit">
                                         <property name="name">
                                             <cstring>m_serverName</cstring>
                                         </property>
@@ -1196,7 +1196,7 @@ Only works for emoticons in the PNG format.</string>
                                             <string>Only modify these values if you want to use a special IM proxy server, like SIMP</string>
                                         </property>
                                     </widget>
-                                    <widget class="QSpinBox">
+                                    <widget class="TQSpinBox">
                                         <property name="name">
                                             <cstring>m_serverPort</cstring>
                                         </property>
@@ -1221,7 +1221,7 @@ Only works for emoticons in the PNG format.</string>
                                     </widget>
                                 </hbox>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>optionUseHttpMethod</cstring>
                                 </property>
@@ -1234,15 +1234,15 @@ This may be used to connect on a network with a restrictive firewall.
 Only check this option if the normal connection doesn't work.</string>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout22</cstring>
+                                    <cstring>tqlayout22</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>m_useWebcamPort</cstring>
                                         </property>
@@ -1253,7 +1253,7 @@ Only check this option if the normal connection doesn't work.</string>
                                             <string>If you are behind a firewall, you may specify a base port to use for the incoming connection, and configure your firewall to accept connections on a range of 10 ports, starting at this one. Incoming connections are used for the webcam. If you don't specify a port yourself, the operating system will choose an available port for you. It is recommended to leave the checkbox unchecked.</string>
                                         </property>
                                     </widget>
-                                    <widget class="QSpinBox">
+                                    <widget class="TQSpinBox">
                                         <property name="name">
                                             <cstring>m_webcamPort</cstring>
                                         </property>
@@ -1287,7 +1287,7 @@ Only check this option if the normal connection doesn't work.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>21</width>
                                 <height>70</height>
@@ -1297,14 +1297,14 @@ Only check this option if the normal connection doesn't work.</string>
                 </vbox>
             </widget>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>labelStatusMessage</cstring>
             </property>
             <property name="text">
                 <string></string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -1412,7 +1412,7 @@ Only check this option if the normal connection doesn't work.</string>
     <tabstop>m_blp</tabstop>
     <tabstop>m_RLButton</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kopetepasswordwidget.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
index baa4fb60..b165c9f4 100644
--- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp
+++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
@@ -65,8 +65,8 @@ public:
 	TQImage pictureData;
 };
 
-MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account *account, TQWidget *parent, const char * /* name */ )
-: TQWidget( parent ), KopeteEditAccountWidget( account )
+MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account *account, TQWidget *tqparent, const char * /* name */ )
+: TQWidget( tqparent ), KopeteEditAccountWidget( account )
 {
 	d = new MSNEditAccountWidgetPrivate;
 
@@ -76,7 +76,7 @@ MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account
 
 	d->ui = new MSNEditAccountUI( this );
 
-	d->autoConfig = new KAutoConfig( d->ui );
+	d->autoConfig = new KAutoConfig( TQT_TQOBJECT(d->ui) );
 	d->autoConfig->addWidget( d->ui->global_settings_page, "MSN" );
 	d->autoConfig->addWidget( d->ui->privacy_page, "MSN" );
 	//the JabberAccount need to be saved as text, and can't be handled by kautoconfig
@@ -159,7 +159,7 @@ MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account
 		d->ui->m_blp->setChecked( config->readEntry( "BLP" ) == "BL" );
 
 		d->pictureUrl = locateLocal( "appdata", "msnpicture-" +
-			account->accountId().lower().replace( TQRegExp("[./~]" ), "-" ) + ".png" );
+			account->accountId().lower().tqreplace( TQRegExp("[./~]" ), "-" ) + ".png" );
 		d->ui->m_displayPicture->setPixmap( d->pictureUrl );
 
 		d->ui->m_useDisplayPicture->setChecked( config->readBoolEntry( "exportCustomPicture" ));
@@ -227,7 +227,7 @@ Kopete::Account * MSNEditAccountWidget::apply()
 	if( d->ui->m_useDisplayPicture->isChecked() && !d->pictureData.isNull() )
 	{
 		d->pictureUrl = locateLocal( "appdata", "msnpicture-" +
-				account()->accountId().lower().replace( TQRegExp("[./~]" ), "-" ) + ".png" );
+				account()->accountId().lower().tqreplace( TQRegExp("[./~]" ), "-" ) + ".png" );
 		if ( d->pictureData.save( d->pictureUrl, "PNG" ) )
 		{
 			static_cast<MSNAccount *>( account() )->setPictureUrl( d->pictureUrl );
@@ -291,7 +291,7 @@ void MSNEditAccountWidget::slotAllow()
 	MSNNotifySocket *notify = static_cast<MSNAccount *>( account() )->notifySocket();
 	if ( !notify )
 		return;
-	notify->removeContact( handle, MSNProtocol::BL, TQString::null, TQString::null );
+	notify->removeContact( handle, MSNProtocol::BL, TQString(), TQString() );
 
 	d->ui->m_BL->takeItem( item );
 	d->ui->m_AL->insertItem( item );
@@ -310,7 +310,7 @@ void MSNEditAccountWidget::slotBlock()
 	if ( !notify )
 		return;
 
-	notify->removeContact( handle, MSNProtocol::AL, TQString::null, TQString::null );
+	notify->removeContact( handle, MSNProtocol::AL, TQString(), TQString() );
 
 	d->ui->m_AL->takeItem( item );
 	d->ui->m_BL->insertItem( item );
@@ -327,7 +327,7 @@ void MSNEditAccountWidget::slotSelectImage()
 {
 	TQString path = 0;
 	bool remoteFile = false;
-	KURL filePath = KFileDialog::getImageOpenURL( TQString::null, this, i18n( "MSN Display Picture" ) );
+	KURL filePath = KFileDialog::getImageOpenURL( TQString(), this, i18n( "MSN Display Picture" ) );
 	if( filePath.isEmpty() )
 		return;
 
diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.h b/kopete/protocols/msn/ui/msneditaccountwidget.h
index 40900871..1d97b4f9 100644
--- a/kopete/protocols/msn/ui/msneditaccountwidget.h
+++ b/kopete/protocols/msn/ui/msneditaccountwidget.h
@@ -35,9 +35,10 @@ class MSNEditAccountWidgetPrivate;
 class MSNEditAccountWidget : public TQWidget, public KopeteEditAccountWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account *account, TQWidget *parent = 0, const char *name = 0 );
+	MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account *account, TQWidget *tqparent = 0, const char *name = 0 );
 	~MSNEditAccountWidget();
 	virtual bool validateData();
 	virtual Kopete::Account * apply();
diff --git a/kopete/protocols/msn/ui/msninfo.ui b/kopete/protocols/msn/ui/msninfo.ui
index 17f1eecd..f983af30 100644
--- a/kopete/protocols/msn/ui/msninfo.ui
+++ b/kopete/protocols/msn/ui/msninfo.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>MSNInfo</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>MSNInfo</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout22</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel2_2</cstring>
                     </property>
@@ -46,7 +46,7 @@
                         <string>Email address:</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit">
+                <widget class="TQLineEdit">
                     <property name="name">
                         <cstring>m_id</cstring>
                     </property>
@@ -56,7 +56,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout22_2</cstring>
             </property>
@@ -70,7 +70,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel2_2_2</cstring>
                     </property>
@@ -86,7 +86,7 @@
                         <string>Display name:</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit">
+                <widget class="TQLineEdit">
                     <property name="name">
                         <cstring>m_displayName</cstring>
                     </property>
@@ -96,15 +96,15 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -112,7 +112,7 @@
                         <string>Personal message:</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit">
+                <widget class="TQLineEdit">
                     <property name="name">
                         <cstring>m_personalMessage</cstring>
                     </property>
@@ -122,7 +122,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>GroupBox2</cstring>
             </property>
@@ -133,7 +133,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel5</cstring>
                     </property>
@@ -141,7 +141,7 @@
                         <string>Home:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>TextLabel6</cstring>
                     </property>
@@ -149,7 +149,7 @@
                         <string>Work:</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="0" column="1">
+                <widget class="TQLineEdit" row="0" column="1">
                     <property name="name">
                         <cstring>m_phw</cstring>
                     </property>
@@ -157,7 +157,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="1" column="1">
+                <widget class="TQLineEdit" row="1" column="1">
                     <property name="name">
                         <cstring>m_phh</cstring>
                     </property>
@@ -165,7 +165,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>TextLabel7</cstring>
                     </property>
@@ -173,7 +173,7 @@
                         <string>Mobile:</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="2" column="1">
+                <widget class="TQLineEdit" row="2" column="1">
                     <property name="name">
                         <cstring>m_phm</cstring>
                     </property>
@@ -183,7 +183,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>m_reversed</cstring>
             </property>
@@ -208,7 +208,7 @@ If not, the user has not added you to their list, or has removed you.</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
@@ -217,5 +217,5 @@ If not, the user has not added you to their list, or has removed you.</string>
         </spacer>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp
index 60ce0e82..2c2023c2 100644
--- a/kopete/protocols/msn/webcam.cpp
+++ b/kopete/protocols/msn/webcam.cpp
@@ -42,8 +42,8 @@ using namespace KNetwork;
 
 namespace P2P {
 
-Webcam::Webcam(Who who, const TQString& to, Dispatcher *parent, Q_UINT32 sessionId)
-	: TransferContext(to,parent,sessionId)  , m_who(who) , m_timerId(0)
+Webcam::Webcam(Who who, const TQString& to, Dispatcher *tqparent, TQ_UINT32 sessionId)
+	: TransferContext(to,tqparent,sessionId)  , m_who(who) , m_timerId(0)
 {
 	setType(P2P::WebcamType);
 	m_direction = Incoming;
@@ -87,12 +87,12 @@ void Webcam::askIncommingInvitation()
 	TQString message= (m_who==wProducer)  ?
 			i18n("<qt>The contact %1 wants to see <b>your</b> webcam, do you want them to see it?</qt>")  :
 			i18n("The contact %1 wants to show you his/her webcam, do you want to see it?")  ;
-	int result=KMessageBox::questionYesNo( 0L , message.arg(m_recipient),
+	int result=KMessageBox::questionYesNo( 0L , message.tqarg(m_recipient),
 										   i18n("Webcam invitation - Kopete MSN Plugin") , i18n("Accept") , i18n("Decline"));
 	if(!_this)
 		return;
 	
-	TQString content = TQString("SessionID: %1\r\n\r\n").arg(m_sessionId);
+	TQString content = TQString("SessionID: %1\r\n\r\n").tqarg(m_sessionId);
 	if(result==KMessageBox::Yes)
 	{
 		//Send two message, an OK, and an invite.
@@ -268,7 +268,7 @@ void Webcam::processMessage(const Message& message)
 		{
 			unsigned char X=dataMessage[q+f];
 			char C=((char)(( X<128 && X>31 ) ? X : '.'));
-			echoS+=TQString::fromLatin1(&C,1);
+			echoS+=TQString::tqfromLatin1(&C,1);
 		}
 		f+=16;
 	}
@@ -305,31 +305,31 @@ void Webcam::processMessage(const Message& message)
 		{
 			uint sess=rand()%1000+5000;
 			uint rid=rand()%100+50;
-			m_myAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").arg(rid).arg(sess);
+			m_myAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").tqarg(rid).tqarg(sess);
 			kdDebug(14140) << k_funcinfo << "m_myAuth= " << m_myAuth << endl;
 			TQString  producerxml=xml(sess , rid);
 			kdDebug(14140) << k_funcinfo << "producerxml= " << producerxml << endl; 
 			makeSIPMessage(producerxml);
 		}
 	}
-	else if(m_content.contains("<producer>")   ||  m_content.contains("<viewer>"))
+	else if(m_content.tqcontains("<producer>")   ||  m_content.tqcontains("<viewer>"))
 	{
 		TQRegExp rx("<rid>([0-9]*)</rid>.*<session>([0-9]*)</session>");
 		rx.search(m_content);	
 		TQString rid=rx.cap(1);
 		TQString sess=rx.cap(2);
-		if(m_content.contains("<producer>"))
+		if(m_content.tqcontains("<producer>"))
 		{
 			
 			TQString viewerxml=xml(sess.toUInt() , rid.toUInt());
 			kdDebug(14140) << k_funcinfo << "vewerxml= " << viewerxml << endl; 
 			makeSIPMessage(  viewerxml ,0x00,0x09,0x00 );
-			m_peerAuth=m_myAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").arg(rid,sess);
+			m_peerAuth=m_myAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").tqarg(rid,sess);
 			kdDebug(14140) << k_funcinfo << "m_auth= " << m_myAuth << endl;
 		}
 		else
 		{
-			m_peerAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").arg(rid,sess);
+			m_peerAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").tqarg(rid,sess);
 			
 			makeSIPMessage("receivedViewerData", 0xec , 0xda , 0x03);
 		}
@@ -346,33 +346,33 @@ void Webcam::processMessage(const Message& message)
 		TQObject::connect(m_listener, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotListenError(int)));
 				// Listen for incoming connections.
 		bool isListening = m_listener->listen();
-		kdDebug(14140) << k_funcinfo << (isListening ? TQString("listening %1").arg(m_listener->localAddress().toString()) : TQString("not listening")) << endl;		
+		kdDebug(14140) << k_funcinfo << (isListening ? TQString("listening %1").tqarg(m_listener->localAddress().toString()) : TQString("not listening")) << endl;		
 		
 		rx=TQRegExp("<tcpport>([^<]*)</tcpport>");
 		rx.search(m_content);
 		TQString port1=rx.cap(1);
 		if(port1=="0")
-			port1=TQString::null;
+			port1=TQString();
 		
 		rx=TQRegExp("<tcplocalport>([^<]*)</tcplocalport>");
 		rx.search(m_content);
 		TQString port2=rx.cap(1);
 		if(port2==port1 || port2=="0")
-			port2=TQString::null;
+			port2=TQString();
 		
 		rx=TQRegExp("<tcpexternalport>([^<]*)</tcpexternalport>");
 		rx.search(m_content);
 		TQString port3=rx.cap(1);
 		if(port3==port1 || port3==port2 || port3=="0")
-			port3=TQString::null;
+			port3=TQString();
 
 		int an=0;
 		while(true)
 		{
 			an++;
-			if(!m_content.contains( TQString("<tcpipaddress%1>").arg(an)  ))
+			if(!m_content.tqcontains( TQString("<tcpipaddress%1>").tqarg(an)  ))
 				break;
-			rx=TQRegExp(TQString("<tcpipaddress%1>([^<]*)</tcpipaddress%2>").arg(an).arg(an));
+			rx=TQRegExp(TQString("<tcpipaddress%1>([^<]*)</tcpipaddress%2>").tqarg(an).tqarg(an));
 			rx.search(m_content);
 			TQString ip=rx.cap(1);
 			if(ip.isNull())
@@ -416,28 +416,28 @@ void Webcam::processMessage(const Message& message)
 			kdDebug(14140) << k_funcinfo << "connect to "  << sock << " - "<< sock->peerAddress().toString() << " ; " << sock->localAddress().toString()  << endl;
 		}
 	}
-	else if(m_content.contains("receivedViewerData"))
+	else if(m_content.tqcontains("receivedViewerData"))
 	{
 		//I'm happy you received the xml i sent, really.
 	}
 	else
 		error();
-	m_content=TQString::null;
+	m_content=TQString();
 }
 
-void Webcam::makeSIPMessage(const TQString &message, Q_UINT8 XX, Q_UINT8 YY , Q_UINT8 ZZ)
+void Webcam::makeSIPMessage(const TQString &message, TQ_UINT8 XX, TQ_UINT8 YY , TQ_UINT8 ZZ)
 {
 	TQByteArray dataMessage; //(12+message.length()*2);
 	TQDataStream writer(dataMessage, IO_WriteOnly);
 	writer.setByteOrder(TQDataStream::LittleEndian);
-	writer << (Q_UINT8)0x80;
-	writer << (Q_UINT8)XX;
-	writer << (Q_UINT8)YY;
-	writer << (Q_UINT8)ZZ;
-	writer << (Q_UINT8)0x08;
-	writer << (Q_UINT8)0x00;
+	writer << (TQ_UINT8)0x80;
+	writer << (TQ_UINT8)XX;
+	writer << (TQ_UINT8)YY;
+	writer << (TQ_UINT8)ZZ;
+	writer << (TQ_UINT8)0x08;
+	writer << (TQ_UINT8)0x00;
 	writer << message+'\0';
-	//writer << (Q_UINT16)0x0000;
+	//writer << (TQ_UINT16)0x0000;
 
 	/*TQString echoS="";
 	unsigned int f=0;
@@ -462,7 +462,7 @@ void Webcam::makeSIPMessage(const TQString &message, Q_UINT8 XX, Q_UINT8 YY , Q_
 		{
 			unsigned char X=dataMessage[q+f];
 			char C=((char)(( X<128 && X>31 ) ? X : '.'));
-			echoS+=TQString::fromLatin1(&C,1);
+			echoS+=TQString::tqfromLatin1(&C,1);
 		}
 		f+=16;
 	}
@@ -482,7 +482,7 @@ void Webcam::sendBigP2PMessage( const TQByteArray & dataMessage)
 	{
 		m_offset=f;
 		TQByteArray dm2;
-		dm2.duplicate(dataMessage.data()+m_offset, QMIN(1200,m_totalDataSize-m_offset));
+		dm2.duplicate(dataMessage.data()+m_offset, TQMIN(1200,m_totalDataSize-m_offset));
 		sendData( dm2 );
 		m_offset+=dm2.size();
 	}
@@ -503,7 +503,7 @@ TQString Webcam::xml(uint session , uint rid)
 	TQStringList ips=m_dispatcher->localIp();
 	for ( it = ips.begin(); it != ips.end(); ++it )
 	{
-		ip+=TQString("<tcpipaddress%1>%2</tcpipaddress%3>").arg(ip_number).arg(*it).arg(ip_number);
+		ip+=TQString("<tcpipaddress%1>%2</tcpipaddress%3>").tqarg(ip_number).tqarg(*it).tqarg(ip_number);
 		++ip_number;
 	}
 
@@ -749,7 +749,7 @@ void Webcam::slotSocketRead()
 			TQByteArray buffer(24);
 			m_webcamSocket->peekBlock(buffer.data(), buffer.size());
 			
-			Q_UINT32 paysize=(uchar)buffer[8] + ((uchar)buffer[9]<<8) + ((uchar)buffer[10]<<16) + ((uchar)buffer[11]<<24);
+			TQ_UINT32 paysize=(uchar)buffer[8] + ((uchar)buffer[9]<<8) + ((uchar)buffer[10]<<16) + ((uchar)buffer[11]<<24);
 			
 			if(available < (paysize+24))
 			{
@@ -805,7 +805,7 @@ void Webcam::slotSocketClosed()
 void Webcam::slotSocketError(int errorCode)
 {
 	KBufferedSocket *socket=const_cast<KBufferedSocket*>(static_cast<const KBufferedSocket*>(sender()));
-	kdDebug(14140) << k_funcinfo <<  socket << " -  " << errorCode << " : " << socket->errorString() << endl;
+	kdDebug(14140) << k_funcinfo <<  socket << " -  " << errorCode << " : " << socket->KSocketBase::errorString() << endl;
 	//sendBYEMessage();
 }
 
@@ -868,13 +868,13 @@ void Webcam::timerEvent( TQTimerEvent *e )
 	
 	TQDataStream writer(header, IO_WriteOnly);
 	writer.setByteOrder(TQDataStream::LittleEndian);
-	writer << (Q_UINT16)24;  // header size
-	writer << (Q_UINT16)img.width();
-	writer << (Q_UINT16)img.height();
-	writer << (Q_UINT16)0x0000; //wtf .?
-	writer << (Q_UINT32)frame.size();
-	writer << (Q_UINT8)('M') << (Q_UINT8)('L') << (Q_UINT8)('2') << (Q_UINT8)('0');
-	writer << (Q_UINT32)0x00000000; //wtf .?
+	writer << (TQ_UINT16)24;  // header size
+	writer << (TQ_UINT16)img.width();
+	writer << (TQ_UINT16)img.height();
+	writer << (TQ_UINT16)0x0000; //wtf .?
+	writer << (TQ_UINT32)frame.size();
+	writer << (TQ_UINT8)('M') << (TQ_UINT8)('L') << (TQ_UINT8)('2') << (TQ_UINT8)('0');
+	writer << (TQ_UINT32)0x00000000; //wtf .?
 	writer << TQTime::currentTime();  //FIXME:  possible midnight bug ?
 
 	m_webcamSocket->writeBlock(header.data(), header.size());
diff --git a/kopete/protocols/msn/webcam.h b/kopete/protocols/msn/webcam.h
index 472a0fba..59858d94 100644
--- a/kopete/protocols/msn/webcam.h
+++ b/kopete/protocols/msn/webcam.h
@@ -30,10 +30,11 @@ namespace P2P {
 
 class Webcam  : public TransferContext
 {  Q_OBJECT
+  TQ_OBJECT
 	public:
 		enum Who { wProducer , wViewer };
 		
-		Webcam( Who who , const TQString& to, Dispatcher *parent, Q_UINT32 sessionID);
+		Webcam( Who who , const TQString& to, Dispatcher *tqparent, TQ_UINT32 sessionID);
 		~Webcam( );
 
 		virtual void processMessage(const Message& message);
@@ -44,7 +45,7 @@ class Webcam  : public TransferContext
 		void sendBYEMessage();
 	
 	private:
-		void makeSIPMessage(const TQString &message, Q_UINT8 XX=0, Q_UINT8 YY=9 , Q_UINT8 ZZ=0);
+		void makeSIPMessage(const TQString &message, TQ_UINT8 XX=0, TQ_UINT8 YY=9 , TQ_UINT8 ZZ=0);
 		void sendBigP2PMessage( const TQByteArray& dataMessage );
 		void closeAllOtherSockets();
 		TQString m_content;
@@ -56,7 +57,7 @@ class Webcam  : public TransferContext
 		KNetwork::KServerSocket   *m_listener;
 		KNetwork::KBufferedSocket *m_webcamSocket;
 		
-		enum WebcamStatus { wsNegotiating , wsConnecting, wsConnected, wsTransfer  } ;
+		enum WebcamtqStatus { wsNegotiating , wsConnecting, wsConnected, wsTransfer  } ;
 		
 		Who m_who;
 		
@@ -67,7 +68,7 @@ class Webcam  : public TransferContext
 		MSNWebcamDialog *m_widget;
 				
 		TQValueList<KNetwork::KBufferedSocket* > m_allSockets;
-		TQMap<KNetwork::KBufferedSocket*, WebcamStatus> m_webcamStates;
+		TQMap<KNetwork::KBufferedSocket*, WebcamtqStatus> m_webcamStates;
 		
 		int m_timerId;
 		int m_timerFps;
diff --git a/kopete/protocols/msn/webcam/libmimic/mimic-private.h b/kopete/protocols/msn/webcam/libmimic/mimic-private.h
index adf59291..245793fb 100644
--- a/kopete/protocols/msn/webcam/libmimic/mimic-private.h
+++ b/kopete/protocols/msn/webcam/libmimic/mimic-private.h
@@ -21,9 +21,9 @@
 #include "mimic.h"
 
 #define ENCODER_BUFFER_SIZE         16384
-#define ENCODER_QUALITY_DEFAULT     0
-#define ENCODER_QUALITY_MIN         0
-#define ENCODER_QUALITY_MAX         10000
+#define ENCODER_TQUALITY_DEFAULT     0
+#define ENCODER_TQUALITY_MIN         0
+#define ENCODER_TQUALITY_MAX         10000
 
 struct _MimCtx {
     gboolean encoder_initialized;
diff --git a/kopete/protocols/msn/webcam/libmimic/mimic.c b/kopete/protocols/msn/webcam/libmimic/mimic.c
index 61abf9e8..2013022d 100644
--- a/kopete/protocols/msn/webcam/libmimic/mimic.c
+++ b/kopete/protocols/msn/webcam/libmimic/mimic.c
@@ -155,7 +155,7 @@ gboolean mimic_encoder_init(MimCtx *ctx, const MimicResEnum resolution)
     mimic_init(ctx, width, height);
 
     /* Set a default quality setting. */
-    ctx->quality = ENCODER_QUALITY_DEFAULT;
+    ctx->quality = ENCODER_TQUALITY_DEFAULT;
 
     ctx->encoder_initialized = TRUE;
     
@@ -300,8 +300,8 @@ gboolean mimic_set_property(MimCtx *ctx, const gchar *name, gpointer data)
         if (strcmp(name, "quality") == 0) {
             gint new_quality = *((gint *) data);
 
-            if (new_quality < ENCODER_QUALITY_MIN ||
-                new_quality > ENCODER_QUALITY_MAX)
+            if (new_quality < ENCODER_TQUALITY_MIN ||
+                new_quality > ENCODER_TQUALITY_MAX)
             {
                 return FALSE;
             }
diff --git a/kopete/protocols/msn/webcam/mimicwrapper.cpp b/kopete/protocols/msn/webcam/mimicwrapper.cpp
index a9d3b131..75eb52cf 100644
--- a/kopete/protocols/msn/webcam/mimicwrapper.cpp
+++ b/kopete/protocols/msn/webcam/mimicwrapper.cpp
@@ -16,7 +16,7 @@
 
 #include "libmimic/mimic.h"
 
-//#include <qbytearray.h>
+//#include <tqbytearray.h>
 #include <kdebug.h>
 #include <tqimage.h>
 
diff --git a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp
index b0540cbb..e07aaebc 100644
--- a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp
+++ b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp
@@ -27,9 +27,9 @@
 
 
 
-MSNWebcamDialog::MSNWebcamDialog( const TQString& contact, TQWidget * parent, const char * name )
-	: KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).arg( contact ),
-                   KDialogBase::Close, KDialogBase::Close, parent, name, false, true /*seperator*/ ),
+MSNWebcamDialog::MSNWebcamDialog( const TQString& contact, TQWidget * tqparent, const char * name )
+	: KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).tqarg( contact ),
+                   KDialogBase::Close, KDialogBase::Close, tqparent, name, false, true /*seperator*/ ),
 	m_imageContainer( this )
 {
 	setInitialSize( TQSize(320,290), true );
@@ -48,7 +48,7 @@ MSNWebcamDialog::MSNWebcamDialog( const TQString& contact, TQWidget * parent, co
 	{
 		kdDebug(14180) << k_funcinfo << "Adding webcam image container" << endl;
 		//m_imageContainer.setText( i18n( "No webcam image received" ) );
-		//m_imageContainer.setAlignment( Qt::AlignCenter );
+		//m_imageContainer.tqsetAlignment( TQt::AlignCenter );
 		m_imageContainer.setMinimumSize(320,240);
 	}
 	show();
@@ -72,8 +72,8 @@ void MSNWebcamDialog::webcamClosed( int reason  )
 {
 	kdDebug(14180) << k_funcinfo << "webcam closed with reason?? " <<  reason <<endl;
 	//m_imageContainer.clear();
-	//m_imageContainer.setText( i18n( "Webcam closed with reason %1" ).arg( TQString::number( reason ) ) );
-	//m_imageContainer.setAlignment( Qt::AlignCenter );
+	//m_imageContainer.setText( i18n( "Webcam closed with reason %1" ).tqarg( TQString::number( reason ) ) );
+	//m_imageContainer.tqsetAlignment( TQt::AlignCenter );
 	//show();
 }
 
diff --git a/kopete/protocols/msn/webcam/msnwebcamdialog.h b/kopete/protocols/msn/webcam/msnwebcamdialog.h
index d0b0b988..292eb410 100644
--- a/kopete/protocols/msn/webcam/msnwebcamdialog.h
+++ b/kopete/protocols/msn/webcam/msnwebcamdialog.h
@@ -35,8 +35,9 @@ class MSNContact;
 class KOPETE_EXPORT MSNWebcamDialog : public KDialogBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	MSNWebcamDialog( const TQString& contact, TQWidget* parent = 0, const char* name = 0 );
+	MSNWebcamDialog( const TQString& contact, TQWidget* tqparent = 0, const char* name = 0 );
 	~MSNWebcamDialog();
 	
 public slots: