Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

15 files changed, 194 insertions, 194 deletions

diff --git a/kopete/protocols/msn/dispatcher.cpp b/kopete/protocols/msn/dispatcher.cpp
index 70d43a14..4c352de2 100644
--- a/kopete/protocols/msn/dispatcher.cpp
+++ b/kopete/protocols/msn/dispatcher.cpp
@@ -493,8 +493,8 @@ void Dispatcher::dispatch(const P2P::Message& message)
 					transfer->m_ackSessionIdentifier = message.header.identifier;
     				transfer->m_ackUniqueIdentifier = message.header.ackSessionIdentifier;
 
-					TQObject::connect(Kopete::TransferManager::transferManager(), TQT_SIGNAL(accepted(Kopete::Transfer*, const TQString&)), transfer, TQT_SLOT(slotTransferAccepted(Kopete::Transfer*, const TQString&)));
-					TQObject::connect(Kopete::TransferManager::transferManager(), TQT_SIGNAL(refused(const Kopete::FileTransferInfo&)), transfer, TQT_SLOT(slotTransferRefused(const Kopete::FileTransferInfo&)));
+					TQObject::connect(Kopete::TransferManager::transferManager(), TQ_SIGNAL(accepted(Kopete::Transfer*, const TQString&)), transfer, TQ_SLOT(slotTransferAccepted(Kopete::Transfer*, const TQString&)));
+					TQObject::connect(Kopete::TransferManager::transferManager(), TQ_SIGNAL(refused(const Kopete::FileTransferInfo&)), transfer, TQ_SLOT(slotTransferRefused(const Kopete::FileTransferInfo&)));
 
 					// Show the file transfer accept/decline dialog.
 					Kopete::TransferManager::transferManager()->askIncomingTransfer(contact, fileName, fileSize, TQString(), sessionId);
@@ -542,7 +542,7 @@ void Dispatcher::dispatch(const P2P::Message& message)
 				m_sessions.insert(sessionId.toUInt(), current);
 					// Acknowledge the session request.
 				current->acknowledge(message);
-				TQTimer::singleShot(0,current, TQT_SLOT(askIncommingInvitation()) );
+				TQTimer::singleShot(0,current, TQ_SLOT(askIncommingInvitation()) );
 #endif
 			}
 		}
diff --git a/kopete/protocols/msn/incomingtransfer.cpp b/kopete/protocols/msn/incomingtransfer.cpp
index 0da4a04c..ed5377f2 100644
--- a/kopete/protocols/msn/incomingtransfer.cpp
+++ b/kopete/protocols/msn/incomingtransfer.cpp
@@ -65,7 +65,7 @@ void IncomingTransfer::slotTransferAccepted(Kopete::Transfer* transfer, const TQ
 	if(sessionId!=m_sessionId)
 		return;
 	
-	TQObject::connect(transfer , TQT_SIGNAL(transferCanceled()), this, TQT_SLOT(abort()));
+	TQObject::connect(transfer , TQ_SIGNAL(transferCanceled()), this, TQ_SLOT(abort()));
 	m_transfer = transfer;
 		
 	TQString content = TQString("SessionID: %1\r\n\r\n").arg(sessionId);
@@ -243,8 +243,8 @@ void IncomingTransfer::processMessage(const Message& message)
 				m_listener = new TDEServerSocket("", "");
 				m_listener->setResolutionEnabled(true);
 				// Create the callback that will try to accept incoming connections.
-				TQObject::connect(m_listener, TQT_SIGNAL(readyAccept()), TQT_SLOT(slotAccept()));
-				TQObject::connect(m_listener, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotListenError(int)));
+				TQObject::connect(m_listener, TQ_SIGNAL(readyAccept()), TQ_SLOT(slotAccept()));
+				TQObject::connect(m_listener, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotListenError(int)));
 				// Listen for incoming connections.
 				bool isListening = m_listener->listen(1);
 				kdDebug(14140) << k_funcinfo << (isListening ? "listening" : "not listening") << endl;
@@ -349,11 +349,11 @@ void IncomingTransfer::slotAccept()
 	m_socket->enableWrite(false);
 
 	// Create the callback that will try to read bytes from the accepted socket.
-	TQObject::connect(m_socket, TQT_SIGNAL(readyRead()),   this, TQT_SLOT(slotSocketRead()));
+	TQObject::connect(m_socket, TQ_SIGNAL(readyRead()),   this, TQ_SLOT(slotSocketRead()));
 	// Create the callback that will try to handle the socket close event.
-	TQObject::connect(m_socket, TQT_SIGNAL(closed()),      this, TQT_SLOT(slotSocketClosed()));
+	TQObject::connect(m_socket, TQ_SIGNAL(closed()),      this, TQ_SLOT(slotSocketClosed()));
 	// Create the callback that will try to handle the socket error event.
-	TQObject::connect(m_socket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int)));
+	TQObject::connect(m_socket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotSocketError(int)));
 }
 
 void IncomingTransfer::slotSocketRead()
diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp
index 444c2710..8ff345f6 100644
--- a/kopete/protocols/msn/msnaccount.cpp
+++ b/kopete/protocols/msn/msnaccount.cpp
@@ -73,16 +73,16 @@ MSNAccount::MSNAccount( MSNProtocol *parent, const TQString& AccountID, const ch
 	setMyself( new MSNContact( this, accountId(), Kopete::ContactList::self()->myself() ) );
 	//myself()->setOnlineStatus( MSNProtocol::protocol()->FLN );
 
-	TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( groupRenamed( Kopete::Group *, const TQString & ) ),
-		TQT_SLOT( slotKopeteGroupRenamed( Kopete::Group * ) ) );
-	TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( groupRemoved( Kopete::Group * ) ),
-		TQT_SLOT( slotKopeteGroupRemoved( Kopete::Group * ) ) );
+	TQObject::connect( Kopete::ContactList::self(), TQ_SIGNAL( groupRenamed( Kopete::Group *, const TQString & ) ),
+		TQ_SLOT( slotKopeteGroupRenamed( Kopete::Group * ) ) );
+	TQObject::connect( Kopete::ContactList::self(), TQ_SIGNAL( groupRemoved( Kopete::Group * ) ),
+		TQ_SLOT( slotKopeteGroupRemoved( Kopete::Group * ) ) );
 
-	TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( globalIdentityChanged(const TQString&, const TQVariant& ) ), TQT_SLOT( slotGlobalIdentityChanged(const TQString&, const TQVariant& ) ));
+	TQObject::connect( Kopete::ContactList::self(), TQ_SIGNAL( globalIdentityChanged(const TQString&, const TQVariant& ) ), TQ_SLOT( slotGlobalIdentityChanged(const TQString&, const TQVariant& ) ));
 
-	m_openInboxAction = new TDEAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, TQT_SLOT( slotOpenInbox() ), this, "m_openInboxAction" );
-	m_changeDNAction = new TDEAction( i18n( "&Change Display Name..." ), TQString(), 0, this, TQT_SLOT( slotChangePublicName() ), this, "renameAction" );
-	m_startChatAction = new TDEAction( i18n( "&Start Chat..." ), "mail_generic", 0, this, TQT_SLOT( slotStartChat() ), this, "startChatAction" );
+	m_openInboxAction = new TDEAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, TQ_SLOT( slotOpenInbox() ), this, "m_openInboxAction" );
+	m_changeDNAction = new TDEAction( i18n( "&Change Display Name..." ), TQString(), 0, this, TQ_SLOT( slotChangePublicName() ), this, "renameAction" );
+	m_startChatAction = new TDEAction( i18n( "&Start Chat..." ), "mail_generic", 0, this, TQ_SLOT( slotStartChat() ), this, "startChatAction" );
 
 
 	TDEConfigGroup *config=configGroup();
@@ -200,36 +200,36 @@ void MSNAccount::createNotificationServer( const TQString &host, uint port )
 	m_notifySocket = new MSNNotifySocket( this, accountId() , m_password);
 	m_notifySocket->setUseHttpMethod( useHttpMethod() );
 
-	TQObject::connect( m_notifySocket, TQT_SIGNAL( groupAdded( const TQString&, const TQString& ) ),
-		TQT_SLOT( slotGroupAdded( const TQString&, const TQString& ) ) );
-	TQObject::connect( m_notifySocket, TQT_SIGNAL( groupRenamed( const TQString&, const TQString& ) ),
-		TQT_SLOT( slotGroupRenamed( const TQString&, const TQString& ) ) );
-	TQObject::connect( m_notifySocket, TQT_SIGNAL( groupListed( const TQString&, const TQString& ) ),
-		TQT_SLOT( slotGroupAdded( const TQString&, const TQString& ) ) );
-	TQObject::connect( m_notifySocket, TQT_SIGNAL( groupRemoved( const TQString& ) ),
-		TQT_SLOT( slotGroupRemoved( const TQString& ) ) );
-	TQObject::connect( m_notifySocket, TQT_SIGNAL( contactList(const TQString&, const TQString&, const TQString&, uint, const TQString& ) ),
-		TQT_SLOT( slotContactListed(const TQString&, const TQString&, const TQString&, uint, const TQString& ) ) );
-	TQObject::connect( m_notifySocket, TQT_SIGNAL(contactAdded(const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ),
-		TQT_SLOT( slotContactAdded(const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ) );
-	TQObject::connect( m_notifySocket, TQT_SIGNAL( contactRemoved(const TQString&, const TQString&, const TQString&, const TQString& ) ),
-		TQT_SLOT( slotContactRemoved(const TQString&, const TQString&, const TQString&, const TQString& ) ) );
-	TQObject::connect( m_notifySocket, TQT_SIGNAL( statusChanged( const Kopete::OnlineStatus & ) ),
-		TQT_SLOT( slotStatusChanged( const Kopete::OnlineStatus & ) ) );
-	TQObject::connect( m_notifySocket, TQT_SIGNAL( invitedToChat( const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ),
-		TQT_SLOT( slotCreateChat( const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ) );
-	TQObject::connect( m_notifySocket, TQT_SIGNAL( startChat( const TQString&, const TQString& ) ),
-		TQT_SLOT( slotCreateChat( const TQString&, const TQString& ) ) );
-	TQObject::connect( m_notifySocket, TQT_SIGNAL( socketClosed() ),
-		TQT_SLOT( slotNotifySocketClosed() ) );
-	TQObject::connect( m_notifySocket, TQT_SIGNAL( newContactList() ),
-		TQT_SLOT( slotNewContactList() ) );
-	TQObject::connect( m_notifySocket, TQT_SIGNAL( receivedNotificationServer(const TQString&, uint )  ),
-		TQT_SLOT(createNotificationServer(const TQString&, uint ) ) );
-	TQObject::connect( m_notifySocket, TQT_SIGNAL( hotmailSeted( bool ) ),
-		m_openInboxAction, TQT_SLOT( setEnabled( bool ) ) );
-	TQObject::connect( m_notifySocket, TQT_SIGNAL( errorMessage(int, const TQString& ) ), 
-		TQT_SLOT( slotErrorMessageReceived(int, const TQString& ) ) );
+	TQObject::connect( m_notifySocket, TQ_SIGNAL( groupAdded( const TQString&, const TQString& ) ),
+		TQ_SLOT( slotGroupAdded( const TQString&, const TQString& ) ) );
+	TQObject::connect( m_notifySocket, TQ_SIGNAL( groupRenamed( const TQString&, const TQString& ) ),
+		TQ_SLOT( slotGroupRenamed( const TQString&, const TQString& ) ) );
+	TQObject::connect( m_notifySocket, TQ_SIGNAL( groupListed( const TQString&, const TQString& ) ),
+		TQ_SLOT( slotGroupAdded( const TQString&, const TQString& ) ) );
+	TQObject::connect( m_notifySocket, TQ_SIGNAL( groupRemoved( const TQString& ) ),
+		TQ_SLOT( slotGroupRemoved( const TQString& ) ) );
+	TQObject::connect( m_notifySocket, TQ_SIGNAL( contactList(const TQString&, const TQString&, const TQString&, uint, const TQString& ) ),
+		TQ_SLOT( slotContactListed(const TQString&, const TQString&, const TQString&, uint, const TQString& ) ) );
+	TQObject::connect( m_notifySocket, TQ_SIGNAL(contactAdded(const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ),
+		TQ_SLOT( slotContactAdded(const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ) );
+	TQObject::connect( m_notifySocket, TQ_SIGNAL( contactRemoved(const TQString&, const TQString&, const TQString&, const TQString& ) ),
+		TQ_SLOT( slotContactRemoved(const TQString&, const TQString&, const TQString&, const TQString& ) ) );
+	TQObject::connect( m_notifySocket, TQ_SIGNAL( statusChanged( const Kopete::OnlineStatus & ) ),
+		TQ_SLOT( slotStatusChanged( const Kopete::OnlineStatus & ) ) );
+	TQObject::connect( m_notifySocket, TQ_SIGNAL( invitedToChat( const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ),
+		TQ_SLOT( slotCreateChat( const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ) );
+	TQObject::connect( m_notifySocket, TQ_SIGNAL( startChat( const TQString&, const TQString& ) ),
+		TQ_SLOT( slotCreateChat( const TQString&, const TQString& ) ) );
+	TQObject::connect( m_notifySocket, TQ_SIGNAL( socketClosed() ),
+		TQ_SLOT( slotNotifySocketClosed() ) );
+	TQObject::connect( m_notifySocket, TQ_SIGNAL( newContactList() ),
+		TQ_SLOT( slotNewContactList() ) );
+	TQObject::connect( m_notifySocket, TQ_SIGNAL( receivedNotificationServer(const TQString&, uint )  ),
+		TQ_SLOT(createNotificationServer(const TQString&, uint ) ) );
+	TQObject::connect( m_notifySocket, TQ_SIGNAL( hotmailSeted( bool ) ),
+		m_openInboxAction, TQ_SLOT( setEnabled( bool ) ) );
+	TQObject::connect( m_notifySocket, TQ_SIGNAL( errorMessage(int, const TQString& ) ), 
+		TQ_SLOT( slotErrorMessageReceived(int, const TQString& ) ) );
 
 	m_notifySocket->setStatus( m_connectstatus );
 	m_notifySocket->connect(host, port);
@@ -269,7 +269,7 @@ TDEActionMenu * MSNAccount::actionMenu()
 #if !defined NDEBUG
 	TDEActionMenu *debugMenu = new TDEActionMenu( "Debug", m_actionMenu );
 	debugMenu->insert( new TDEAction( i18n( "Send Raw C&ommand..." ), 0,
-		this, TQT_SLOT( slotDebugRawCommand() ), debugMenu, "m_debugRawCommand" ) );
+		this, TQ_SLOT( slotDebugRawCommand() ), debugMenu, "m_debugRawCommand" ) );
 	m_actionMenu->popupMenu()->insertSeparator();
 	m_actionMenu->insert( debugMenu );
 #endif
@@ -1012,8 +1012,8 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list,
 				Kopete::UI::ContactAddedNotifyDialog *dialog=
 						new Kopete::UI::ContactAddedNotifyDialog(  handle,nick,this,
 								Kopete::UI::ContactAddedNotifyDialog::InfoButton );
-				TQObject::connect(dialog,TQT_SIGNAL(applyClicked(const TQString&)),
-								 this,TQT_SLOT(slotContactAddedNotifyDialogClosed(const TQString& )));
+				TQObject::connect(dialog,TQ_SIGNAL(applyClicked(const TQString&)),
+								 this,TQ_SLOT(slotContactAddedNotifyDialogClosed(const TQString& )));
 				dialog->show();
 			}
 		}
diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp
index 794c4562..2dd5c219 100644
--- a/kopete/protocols/msn/msnchatsession.cpp
+++ b/kopete/protocols/msn/msnchatsession.cpp
@@ -66,43 +66,43 @@ MSNChatSession::MSNChatSession( Kopete::Protocol *protocol, const Kopete::Contac
 
 	setInstance(protocol->instance());
 
-	connect( this, TQT_SIGNAL( messageSent( Kopete::Message&,
+	connect( this, TQ_SIGNAL( messageSent( Kopete::Message&,
 		Kopete::ChatSession* ) ),
-		this, TQT_SLOT( slotMessageSent( Kopete::Message&,
+		this, TQ_SLOT( slotMessageSent( Kopete::Message&,
 		Kopete::ChatSession* ) ) );
 
-	connect( this, TQT_SIGNAL( invitation(MSNInvitation*& ,  const TQString & , long unsigned int , MSNChatSession*  , MSNContact*  ) ) ,
-		protocol,  TQT_SIGNAL( invitation(MSNInvitation*& ,  const TQString & , long unsigned int , MSNChatSession*  , MSNContact*  ) ) );
+	connect( this, TQ_SIGNAL( invitation(MSNInvitation*& ,  const TQString & , long unsigned int , MSNChatSession*  , MSNContact*  ) ) ,
+		protocol,  TQ_SIGNAL( invitation(MSNInvitation*& ,  const TQString & , long unsigned int , MSNChatSession*  , MSNContact*  ) ) );
 
 
 	m_actionInvite = new TDEActionMenu( i18n( "&Invite" ), "kontact_contacts", actionCollection(), "msnInvite" );
-	connect ( m_actionInvite->popupMenu() , TQT_SIGNAL( aboutToShow() ) , this , TQT_SLOT(slotActionInviteAboutToShow() ) ) ;
+	connect ( m_actionInvite->popupMenu() , TQ_SIGNAL( aboutToShow() ) , this , TQ_SLOT(slotActionInviteAboutToShow() ) ) ;
 
 	#if !defined NDEBUG
-	new TDEAction( i18n( "Send Raw C&ommand..." ), 0, this, TQT_SLOT( slotDebugRawCommand() ), actionCollection(), "msnDebugRawCommand" ) ;
+	new TDEAction( i18n( "Send Raw C&ommand..." ), 0, this, TQ_SLOT( slotDebugRawCommand() ), actionCollection(), "msnDebugRawCommand" ) ;
 	#endif
 
 
-	m_actionNudge=new TDEAction( i18n( "Send Nudge" ), "bell", 0, this, TQT_SLOT(slotSendNudge() ), actionCollection(), "msnSendNudge" ) ;
+	m_actionNudge=new TDEAction( i18n( "Send Nudge" ), "bell", 0, this, TQ_SLOT(slotSendNudge() ), actionCollection(), "msnSendNudge" ) ;
 #if MSN_WEBCAM
 	// Invite to receive webcam action
-	m_actionWebcamReceive=new TDEAction( i18n( "View Contact's Webcam" ), "webcamreceive",  0, this, TQT_SLOT(slotWebcamReceive()), actionCollection(), "msnWebcamReceive" ) ;
+	m_actionWebcamReceive=new TDEAction( i18n( "View Contact's Webcam" ), "webcamreceive",  0, this, TQ_SLOT(slotWebcamReceive()), actionCollection(), "msnWebcamReceive" ) ;
 	
 	//Send webcam action
-	m_actionWebcamSend=new TDEAction( i18n( "Send Webcam" ), "webcamsend",  0, this, TQT_SLOT(slotWebcamSend()), actionCollection(), "msnWebcamSend" ) ;
+	m_actionWebcamSend=new TDEAction( i18n( "Send Webcam" ), "webcamsend",  0, this, TQ_SLOT(slotWebcamSend()), actionCollection(), "msnWebcamSend" ) ;
 #endif
 	
-	new TDEAction( i18n( "Send File" ),"attach", 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "msnSendFile" );
+	new TDEAction( i18n( "Send File" ),"attach", 0, this, TQ_SLOT( slotSendFile() ), actionCollection(), "msnSendFile" );
 
 	MSNContact *c = static_cast<MSNContact*>( others.first() );
-	(new TDEAction( i18n( "Request Display Picture" ), "image", 0,  this, TQT_SLOT( slotRequestPicture() ), actionCollection(), "msnRequestDisplayPicture" ))->setEnabled(!c->object().isEmpty());
+	(new TDEAction( i18n( "Request Display Picture" ), "image", 0,  this, TQ_SLOT( slotRequestPicture() ), actionCollection(), "msnRequestDisplayPicture" ))->setEnabled(!c->object().isEmpty());
 
 	if ( !c->object().isEmpty() )
 	{
 		
-		connect( c, TQT_SIGNAL( displayPictureChanged() ), this, TQT_SLOT( slotDisplayPictureChanged() ) );
+		connect( c, TQ_SIGNAL( displayPictureChanged() ), this, TQ_SLOT( slotDisplayPictureChanged() ) );
 		m_image = new TQLabel( 0L, "kde toolbar widget" );
-		new KWidgetAction( m_image, i18n( "MSN Display Picture" ), 0, this, TQT_SLOT( slotRequestPicture() ), actionCollection(), "msnDisplayPicture" );
+		new KWidgetAction( m_image, i18n( "MSN Display Picture" ), 0, this, TQ_SLOT( slotRequestPicture() ), actionCollection(), "msnDisplayPicture" );
 		if(c->hasProperty(Kopete::Global::Properties::self()->photo().key())  )
 		{
 			//if the view doesn't exist yet, we will be unable to get the size of the toolbar
@@ -110,7 +110,7 @@ MSNChatSession::MSNChatSession( Kopete::Protocol *protocol, const Kopete::Contac
 			//How to know when a our view is created?  We can't.
 			// but chances are the next created view will be for this KMM
 			// And if it is not?  never mind. the icon will just be sized 22x22
-			connect( Kopete::ChatSessionManager::self() , TQT_SIGNAL(viewActivated(KopeteView* )) , this, TQT_SLOT(slotDisplayPictureChanged()) );
+			connect( Kopete::ChatSessionManager::self() , TQ_SIGNAL(viewActivated(KopeteView* )) , this, TQ_SLOT(slotDisplayPictureChanged()) );
 			//it's viewActivated and not viewCreated because the view get his mainwindow only when it is shown.
 		}
 	}
@@ -163,35 +163,35 @@ void MSNChatSession::createChat( const TQString &handle,
 	m_chatService->setMsgHandle( handle );
 	m_chatService->connectToSwitchBoard( ID, address, auth );
 
-	connect( m_chatService, TQT_SIGNAL( userJoined(const TQString&,const TQString&,bool)),
-		this, TQT_SLOT( slotUserJoined(const TQString&,const TQString&,bool) ) );
-	connect( m_chatService, TQT_SIGNAL( userLeft(const TQString&,const TQString&)),
-		this, TQT_SLOT( slotUserLeft(const TQString&,const TQString&) ) );
-	connect( m_chatService, TQT_SIGNAL( msgReceived( Kopete::Message & ) ),
-		this, TQT_SLOT( slotMessageReceived( Kopete::Message & ) ) );
-	connect( m_chatService, TQT_SIGNAL( switchBoardClosed() ),
-		this, TQT_SLOT( slotSwitchBoardClosed() ) );
-	connect( m_chatService, TQT_SIGNAL( receivedTypingMsg( const TQString &, bool ) ),
-		this, TQT_SLOT( receivedTypingMsg( const TQString &, bool ) ) );
+	connect( m_chatService, TQ_SIGNAL( userJoined(const TQString&,const TQString&,bool)),
+		this, TQ_SLOT( slotUserJoined(const TQString&,const TQString&,bool) ) );
+	connect( m_chatService, TQ_SIGNAL( userLeft(const TQString&,const TQString&)),
+		this, TQ_SLOT( slotUserLeft(const TQString&,const TQString&) ) );
+	connect( m_chatService, TQ_SIGNAL( msgReceived( Kopete::Message & ) ),
+		this, TQ_SLOT( slotMessageReceived( Kopete::Message & ) ) );
+	connect( m_chatService, TQ_SIGNAL( switchBoardClosed() ),
+		this, TQ_SLOT( slotSwitchBoardClosed() ) );
+	connect( m_chatService, TQ_SIGNAL( receivedTypingMsg( const TQString &, bool ) ),
+		this, TQ_SLOT( receivedTypingMsg( const TQString &, bool ) ) );
 	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "MSN" );
 	if(config->readBoolEntry( "SendTypingNotification" , true) )
 	{
-		connect( this, TQT_SIGNAL( myselfTyping( bool ) ),
-			m_chatService, TQT_SLOT( sendTypingMsg( bool ) ) );
+		connect( this, TQ_SIGNAL( myselfTyping( bool ) ),
+			m_chatService, TQ_SLOT( sendTypingMsg( bool ) ) );
 	}
-	connect( m_chatService, TQT_SIGNAL( msgAcknowledgement(unsigned int, bool) ),
-		this, TQT_SLOT( slotAcknowledgement(unsigned int, bool) ) );
-	connect( m_chatService, TQT_SIGNAL( invitation( const TQString&, const TQString& ) ),
-		this, TQT_SLOT( slotInvitation( const TQString&, const TQString& ) ) );
-	connect( m_chatService, TQT_SIGNAL( nudgeReceived(const TQString&) ),
-		this, TQT_SLOT( slotNudgeReceived(const TQString&) ) );
-	connect( m_chatService, TQT_SIGNAL( errorMessage(int, const TQString& ) ), static_cast<MSNAccount *>(myself()->account()), TQT_SLOT( slotErrorMessageReceived(int, const TQString& ) ) );
+	connect( m_chatService, TQ_SIGNAL( msgAcknowledgement(unsigned int, bool) ),
+		this, TQ_SLOT( slotAcknowledgement(unsigned int, bool) ) );
+	connect( m_chatService, TQ_SIGNAL( invitation( const TQString&, const TQString& ) ),
+		this, TQ_SLOT( slotInvitation( const TQString&, const TQString& ) ) );
+	connect( m_chatService, TQ_SIGNAL( nudgeReceived(const TQString&) ),
+		this, TQ_SLOT( slotNudgeReceived(const TQString&) ) );
+	connect( m_chatService, TQ_SIGNAL( errorMessage(int, const TQString& ) ), static_cast<MSNAccount *>(myself()->account()), TQ_SLOT( slotErrorMessageReceived(int, const TQString& ) ) );
 	
 	if(!m_timeoutTimer)
 	{
 		m_timeoutTimer=new TQTimer(this);
-		connect( m_timeoutTimer , TQT_SIGNAL(timeout()), this , TQT_SLOT(slotConnectionTimeout() ) );
+		connect( m_timeoutTimer , TQ_SIGNAL(timeout()), this , TQ_SLOT(slotConnectionTimeout() ) );
 	}
 	m_timeoutTimer->start(20000,true);
 }
@@ -319,12 +319,12 @@ void MSNChatSession::slotActionInviteAboutToShow()
 		if( !members().contains( it.current() ) && it.current()->isOnline() && it.current() != myself() )
 		{
 			TDEAction *a=new KopeteContactAction( it.current(), this,
-				TQT_SLOT( slotInviteContact( Kopete::Contact * ) ), m_actionInvite );
+				TQ_SLOT( slotInviteContact( Kopete::Contact * ) ), m_actionInvite );
 			m_actionInvite->insert( a );
 			m_inviteactions.append( a ) ;
 		}
 	}
-	TDEAction *b=new TDEAction( i18n ("Other..."), 0, this, TQT_SLOT( slotInviteOtherContact() ), m_actionInvite, "actionOther" );
+	TDEAction *b=new TDEAction( i18n ("Other..."), 0, this, TQ_SLOT( slotInviteOtherContact() ), m_actionInvite, "actionOther" );
 	m_actionInvite->insert( b );
 	m_inviteactions.append( b ) ;
 }
@@ -443,7 +443,7 @@ void MSNChatSession::slotInvitation(const TQString &handle, const TQString &msg)
 		if( msg.contains(MSNFileTransferSocket::applicationID()) )
 		{
 			MSNFileTransferSocket *MFTS=new MSNFileTransferSocket(myself()->account()->accountId(),c,true,this);
-			connect(MFTS, TQT_SIGNAL( done(MSNInvitation*) ) , this , TQT_SLOT( invitationDone(MSNInvitation*) ));
+			connect(MFTS, TQ_SIGNAL( done(MSNInvitation*) ) , this , TQ_SLOT( invitationDone(MSNInvitation*) ));
 			m_invitations.insert( cookie  , MFTS);
 			MFTS->parseInvitation(msg);
 			setCanBeDeleted(false);
@@ -499,7 +499,7 @@ void MSNChatSession::sendFile(const TQString &fileLocation, const TQString &/*fi
 
 void MSNChatSession::initInvitation(MSNInvitation* invitation)
 {
-	connect(invitation->object(), TQT_SIGNAL( done(MSNInvitation*) ) , this , TQT_SLOT( invitationDone(MSNInvitation*) ));
+	connect(invitation->object(), TQ_SIGNAL( done(MSNInvitation*) ) , this , TQ_SLOT( invitationDone(MSNInvitation*) ));
 	m_invitations.insert( invitation->cookie() , invitation);
 
 	if(m_chatService)
@@ -552,7 +552,7 @@ void MSNChatSession::slotDisplayPictureChanged()
 			if(w)
 			{
 				//We connected that in the constructor.  we don't need to keep this slot active.
-				disconnect( Kopete::ChatSessionManager::self() , TQT_SIGNAL(viewActivated(KopeteView* )) , this, TQT_SLOT(slotDisplayPictureChanged()) );
+				disconnect( Kopete::ChatSessionManager::self() , TQ_SIGNAL(viewActivated(KopeteView* )) , this, TQ_SLOT(slotDisplayPictureChanged()) );
 			
 				TQPtrListIterator<TDEToolBar>  it=w->toolBarIterator() ;
 				TDEAction *imgAction=actionCollection()->action("msnDisplayPicture");
@@ -563,8 +563,8 @@ void MSNChatSession::slotDisplayPictureChanged()
 					{
 						sz=tb->iconSize();
 						//ipdate if the size of the toolbar change.
-						disconnect(tb, TQT_SIGNAL(modechange()), this, TQT_SLOT(slotDisplayPictureChanged()));
-						connect(tb, TQT_SIGNAL(modechange()), this, TQT_SLOT(slotDisplayPictureChanged()));
+						disconnect(tb, TQ_SIGNAL(modechange()), this, TQ_SLOT(slotDisplayPictureChanged()));
+						connect(tb, TQ_SIGNAL(modechange()), this, TQ_SLOT(slotDisplayPictureChanged()));
 						break;
 					}
 					++it;
@@ -693,7 +693,7 @@ void MSNChatSession::startChatSession()
 	if(!m_timeoutTimer)
 	{
 		m_timeoutTimer=new TQTimer(this);
-		connect( m_timeoutTimer , TQT_SIGNAL(timeout()), this , TQT_SLOT(slotConnectionTimeout() ) );
+		connect( m_timeoutTimer , TQ_SIGNAL(timeout()), this , TQ_SLOT(slotConnectionTimeout() ) );
 	}
 	m_timeoutTimer->start(20000, true);
 }
diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp
index 6867cf6c..54230558 100644
--- a/kopete/protocols/msn/msncontact.cpp
+++ b/kopete/protocols/msn/msncontact.cpp
@@ -133,22 +133,22 @@ TQPtrList<TDEAction> *MSNContact::customContextMenuActions()
 	TQString label = isBlocked() ? i18n( "Unblock User" ) : i18n( "Block User" );
 	if( !actionBlock )
 	{
-		actionBlock = new TDEAction( label, "msn_blocked",0, this, TQT_SLOT( slotBlockUser() ),
+		actionBlock = new TDEAction( label, "msn_blocked",0, this, TQ_SLOT( slotBlockUser() ),
 			this, "actionBlock" );
 
 		//show profile
-		actionShowProfile = new TDEAction( i18n("Show Profile") , 0, this, TQT_SLOT( slotShowProfile() ),
+		actionShowProfile = new TDEAction( i18n("Show Profile") , 0, this, TQ_SLOT( slotShowProfile() ),
 			this, "actionShowProfile" );
 
 		// Send mail (only available if it is an hotmail account)
-		actionSendMail = new TDEAction( i18n("Send Email...") , "mail_generic",0, this, TQT_SLOT( slotSendMail() ),
+		actionSendMail = new TDEAction( i18n("Send Email...") , "mail_generic",0, this, TQ_SLOT( slotSendMail() ),
 			this, "actionSendMail" );
 
 		// Invite to receive webcam
-		actionWebcamReceive = new TDEAction( i18n( "View Contact's Webcam" ), "webcamreceive",  0, this, TQT_SLOT(slotWebcamReceive() ), this, "msnWebcamReceive" ) ;
+		actionWebcamReceive = new TDEAction( i18n( "View Contact's Webcam" ), "webcamreceive",  0, this, TQ_SLOT(slotWebcamReceive() ), this, "msnWebcamReceive" ) ;
 
 		//Send webcam action
-		actionWebcamSend = new TDEAction( i18n( "Send Webcam" ), "webcamsend",  0, this, TQT_SLOT(slotWebcamSend() ), this, "msnWebcamSend" ) ;
+		actionWebcamSend = new TDEAction( i18n( "Send Webcam" ), "webcamsend",  0, this, TQ_SLOT(slotWebcamSend() ), this, "msnWebcamSend" ) ;
 	}
 	else
 		actionBlock->setText( label );
@@ -203,7 +203,7 @@ void MSNContact::slotUserInfo()
 	info->m_phm->setText(m_phoneMobile);
 	info->m_reversed->setChecked(m_reversed);
 
-	connect( info->m_reversed, TQT_SIGNAL(toggled(bool)) , this, TQT_SLOT(slotUserInfoDialogReversedToggled()));
+	connect( info->m_reversed, TQ_SIGNAL(toggled(bool)) , this, TQ_SLOT(slotUserInfoDialogReversedToggled()));
 
 	infoDialog->setMainWidget(info);
 	infoDialog->setCaption(nick);
@@ -680,7 +680,7 @@ void MSNContact::setDisplayPicture(KTempFile *f)
 	delete f;
 
 	//let the time to TDEIO to copy the file
-	connect(j, TQT_SIGNAL(result(TDEIO::Job *)) , this, TQT_SLOT(slotEmitDisplayPictureChanged() ));
+	connect(j, TQ_SIGNAL(result(TDEIO::Job *)) , this, TQ_SLOT(slotEmitDisplayPictureChanged() ));
 }
 
 void MSNContact::slotEmitDisplayPictureChanged()
diff --git a/kopete/protocols/msn/msnfiletransfersocket.cpp b/kopete/protocols/msn/msnfiletransfersocket.cpp
index b7121c30..d010b723 100644
--- a/kopete/protocols/msn/msnfiletransfersocket.cpp
+++ b/kopete/protocols/msn/msnfiletransfersocket.cpp
@@ -50,8 +50,8 @@ MSNFileTransferSocket::MSNFileTransferSocket(const TQString &handle, Kopete::Con
 	m_contact=c;
 	ready=true;
 
-	TQObject::connect( this, TQT_SIGNAL( socketClosed() ), this, TQT_SLOT( slotSocketClosed() ) );
-	TQObject::connect( this, TQT_SIGNAL( blockRead( const TQByteArray & ) ), this, TQT_SLOT(slotReadBlock( const TQByteArray & ) ) );
+	TQObject::connect( this, TQ_SIGNAL( socketClosed() ), this, TQ_SLOT( slotSocketClosed() ) );
+	TQObject::connect( this, TQ_SIGNAL( blockRead( const TQByteArray & ) ), this, TQ_SLOT(slotReadBlock( const TQByteArray & ) ) );
 }
 
 MSNFileTransferSocket::~MSNFileTransferSocket()
@@ -112,7 +112,7 @@ void MSNFileTransferSocket::parseCommand(const TQString & cmd, uint id, const TQ
 	{
 		m_downsize=0;
 		ready=true;
-		TQTimer::singleShot( 0, this, TQT_SLOT(slotSendFile()) );
+		TQTimer::singleShot( 0, this, TQ_SLOT(slotSendFile()) );
 	}
 	else if( cmd == "CCL" )
 	{
@@ -136,7 +136,7 @@ void MSNFileTransferSocket::bytesReceived(const TQByteArray & head)
 	if(head[0]!='\0')
 	{
 		kdDebug(14140) << "MSNFileTransferSocket::bytesReceived: transfer aborted" <<endl;
-		TQTimer::singleShot(0,this,TQT_SLOT(disconnect()));
+		TQTimer::singleShot(0,this,TQ_SLOT(disconnect()));
 	}
 	unsigned int sz=(int)((unsigned char)head.data()[2])*256+(int)((unsigned char)head.data()[1]);
 //	kdDebug(14140) << "MSNFileTransferSocket::bytesReceived: " << sz <<endl;
@@ -175,7 +175,7 @@ void MSNFileTransferSocket::slotReadBlock(const TQByteArray &block)
 		//the transfer seems to be finished.  
 		sendCommand( "BYE" ,"16777989",false);
 		//  if we are not already disconected in 30 seconds, do it.
-		TQTimer::singleShot( 30000 , this, TQT_SLOT(disconnect() ) );
+		TQTimer::singleShot( 30000 , this, TQ_SLOT(disconnect() ) );
 
 	}
 }
@@ -185,8 +185,8 @@ void MSNFileTransferSocket::setKopeteTransfer(Kopete::Transfer *kt)
 	m_kopeteTransfer=kt;
 	if(kt)
 	{
-		TQObject::connect(kt , TQT_SIGNAL(transferCanceled()), this, TQT_SLOT(abort()));
-		TQObject::connect(kt,  TQT_SIGNAL(destroyed()) , this , TQT_SLOT(slotKopeteTransferDestroyed()));
+		TQObject::connect(kt , TQ_SIGNAL(transferCanceled()), this, TQ_SLOT(abort()));
+		TQObject::connect(kt,  TQ_SIGNAL(destroyed()) , this , TQ_SLOT(slotKopeteTransferDestroyed()));
 	}
 }
 
@@ -194,13 +194,13 @@ void MSNFileTransferSocket::listen(int port)
 {
 	m_server = new TDEServerSocket();
 
-	TQObject::connect( m_server, TQT_SIGNAL(readyAccept()), this,  TQT_SLOT(slotAcceptConnection()));
+	TQObject::connect( m_server, TQ_SIGNAL(readyAccept()), this,  TQ_SLOT(slotAcceptConnection()));
 	m_server->setAddress(TQString::number(port));
 
 	kdDebug(14140) << "MSNFileTransferSocket::listen: about to listen"<<endl;
 	bool listenResult = m_server->listen(1);
 	kdDebug(14140) << "MSNFileTransferSocket::listen: result: "<<  listenResult <<endl;
-	TQTimer::singleShot( 60000, this, TQT_SLOT(slotTimer()) );
+	TQTimer::singleShot( 60000, this, TQ_SLOT(slotTimer()) );
 	kdDebug(14140) << "MSNFileTransferSocket::listen done" <<endl;
 }
 
@@ -249,7 +249,7 @@ void MSNFileTransferSocket::abort()
 	}
 	//the timer wait one second, the time to send the CCL or the binary header
 	//retarding the disconnection keep away from a crash. (in TDEIO::Job::emitResult when `delete this`)
-	TQTimer::singleShot( 1000, this, TQT_SLOT(disconnect()) );
+	TQTimer::singleShot( 1000, this, TQ_SLOT(disconnect()) );
 	ready=false;
 }
 
@@ -286,7 +286,7 @@ void MSNFileTransferSocket::slotSendFile()
 	{
 		//the transfer seems to be finished.  
 		//  if we are not already disconected in 30 seconds, do it.
-		TQTimer::singleShot( 30000 , this, TQT_SLOT(disconnect() ) );
+		TQTimer::singleShot( 30000 , this, TQ_SLOT(disconnect() ) );
 		return;
 	}
 
@@ -317,7 +317,7 @@ void MSNFileTransferSocket::slotSendFile()
 	}
 	ready=false;
 
-	TQTimer::singleShot( 10, this, TQT_SLOT(slotSendFile()) );
+	TQTimer::singleShot( 10, this, TQ_SLOT(slotSendFile()) );
 }
 
 void MSNFileTransferSocket::slotReadyWrite()
@@ -328,7 +328,7 @@ void MSNFileTransferSocket::slotReadyWrite()
 
 TQString MSNFileTransferSocket::invitationHead()
 {
-	TQTimer::singleShot( 10 * 60000, this, TQT_SLOT(slotTimer()) );  //the user has 10 mins to accept or refuse or initiate the transfer
+	TQTimer::singleShot( 10 * 60000, this, TQ_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"
@@ -353,8 +353,8 @@ void MSNFileTransferSocket::parseInvitation(const TQString& msg)
 
 		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 & ) ) );
+		TQObject::connect( Kopete::TransferManager::transferManager(), TQ_SIGNAL( accepted( Kopete::Transfer *, const TQString& ) ),this, TQ_SLOT( slotFileTransferAccepted( Kopete::Transfer *, const TQString& ) ) );
+		TQObject::connect( Kopete::TransferManager::transferManager(), TQ_SIGNAL( refused( const Kopete::FileTransferInfo & ) ), this, TQ_SLOT( slotFileTransferRefused( const Kopete::FileTransferInfo & ) ) );
 
 	}
 	else if( msg.contains("Invitation-Command: ACCEPT") )
@@ -442,7 +442,7 @@ void MSNFileTransferSocket::slotFileTransferAccepted(Kopete::Transfer *trans, co
 			"Request-Data: IP-Address:\r\n"  ).utf8();
 		manager->service()->sendCommand( "MSG" , "N", true, message );
 
-		TQTimer::singleShot( 3 * 60000, this, TQT_SLOT(slotTimer()) ); //if after 3 minutes the transfer has not begin, delete this
+		TQTimer::singleShot( 3 * 60000, this, TQ_SLOT(slotTimer()) ); //if after 3 minutes the transfer has not begin, delete this
 	}
 	else
 	{
diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp
index ad4e2b6d..c29e6d8c 100644
--- a/kopete/protocols/msn/msnnotifysocket.cpp
+++ b/kopete/protocols/msn/msnnotifysocket.cpp
@@ -64,8 +64,8 @@ MSNNotifySocket::MSNNotifySocket( MSNAccount *account, const TQString& /*msnId*/
 
 	m_account = account;
 	m_password=password;
-	TQObject::connect( this, TQT_SIGNAL( blockRead( const TQByteArray & ) ),
-		this, TQT_SLOT( slotReadMessage( const TQByteArray & ) ) );
+	TQObject::connect( this, TQ_SIGNAL( blockRead( const TQByteArray & ) ),
+		this, TQ_SLOT( slotReadMessage( const TQByteArray & ) ) );
 	m_keepaliveTimer = 0L;
 	m_isLogged = false;
 }
@@ -288,9 +288,9 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString
 		{
 			m_secureLoginHandler = new MSNSecureLoginHandler(m_account->accountId(), m_password, data.section( ' ' , 2 , 2 ));
 
-			TQObject::connect(m_secureLoginHandler, TQT_SIGNAL(loginFailed()), this, TQT_SLOT(sslLoginFailed()));
-			TQObject::connect(m_secureLoginHandler, TQT_SIGNAL(loginBadPassword()), this, TQT_SLOT(sslLoginIncorrect()));
-			TQObject::connect(m_secureLoginHandler, TQT_SIGNAL(loginSuccesful(TQString )), this, TQT_SLOT(sslLoginSucceeded(TQString )));
+			TQObject::connect(m_secureLoginHandler, TQ_SIGNAL(loginFailed()), this, TQ_SLOT(sslLoginFailed()));
+			TQObject::connect(m_secureLoginHandler, TQ_SIGNAL(loginBadPassword()), this, TQ_SLOT(sslLoginIncorrect()));
+			TQObject::connect(m_secureLoginHandler, TQ_SIGNAL(loginSuccesful(TQString )), this, TQ_SLOT(sslLoginSucceeded(TQString )));
 
 			m_secureLoginHandler->login();
 		}
@@ -724,7 +724,7 @@ bool MSNNotifySocket::setUseHttpMethod(bool useHttp)
 	else {
 		if( !m_keepaliveTimer ) {
 			m_keepaliveTimer = new TQTimer( this, "m_keepaliveTimer" );
-			TQObject::connect( m_keepaliveTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotSendKeepAlive() ) );
+			TQObject::connect( m_keepaliveTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotSendKeepAlive() ) );
 		}
 	}
 
@@ -755,7 +755,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes )
 			// If there are new email message available, raise the unread email event.
 			TQObject::connect(KNotification::event( "msn_mail", i18n( "You have one unread message in your MSN inbox.",
 					"You have %n unread messages in your MSN inbox.", mailCount ), 0 , 0 , i18n( "Open Inbox..." ) ),
-				TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) );
+				TQ_SIGNAL(activated(unsigned int ) ) , this, TQ_SLOT( slotOpenInbox() ) );
 		}
 	}
 	else if(msg.contains("text/x-msmsgsactivemailnotification"))
@@ -777,7 +777,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes )
 		//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),
 										0 , 0 , i18n( "Open Inbox..." ) ),
-				TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) );
+				TQ_SIGNAL(activated(unsigned int ) ) , this, TQ_SLOT( slotOpenInbox() ) );
 	}
 	else if(msg.contains("text/x-msmsgsprofile"))
 	{
@@ -912,8 +912,8 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes )
 			if( subscString != TQString::fromLatin1("s.htm") && actionString != TQString::fromLatin1("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)));
-				TQObject::connect(notification, TQT_SIGNAL(closed()), this, TQT_SLOT(slotMSNAlertUnwanted()));
+				TQObject::connect(notification, TQ_SIGNAL(activated(unsigned int)), this, TQ_SLOT(slotMSNAlertLink(unsigned int)));
+				TQObject::connect(notification, TQ_SIGNAL(closed()), this, TQ_SLOT(slotMSNAlertUnwanted()));
 			}
 		} // end for each MSG tag
 	}
diff --git a/kopete/protocols/msn/msnsecureloginhandler.cpp b/kopete/protocols/msn/msnsecureloginhandler.cpp
index 936b88fc..4bc58277 100644
--- a/kopete/protocols/msn/msnsecureloginhandler.cpp
+++ b/kopete/protocols/msn/msnsecureloginhandler.cpp
@@ -45,7 +45,7 @@ void MSNSecureLoginHandler::login()
 	getLoginServer->addMetaData("cache", "reload");
 	getLoginServer->addMetaData("PropagateHttpHeader", "true");
 
-	connect(getLoginServer, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotLoginServerReceived(TDEIO::Job* )));
+	connect(getLoginServer, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotLoginServerReceived(TDEIO::Job* )));
 }
 
 void MSNSecureLoginHandler::slotLoginServerReceived(TDEIO::Job *loginJob)
@@ -86,7 +86,7 @@ void MSNSecureLoginHandler::slotLoginServerReceived(TDEIO::Job *loginJob)
 		authJob->addMetaData("cookies", "manual");
 		authJob->addMetaData("cache", "reload");
 		
-		connect(authJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotTweenerReceived(TDEIO::Job* )));
+		connect(authJob, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotTweenerReceived(TDEIO::Job* )));
 	}
 	else
 	{
diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp
index 167c9974..e090bdaf 100644
--- a/kopete/protocols/msn/msnsocket.cpp
+++ b/kopete/protocols/msn/msnsocket.cpp
@@ -112,12 +112,12 @@ void MSNSocket::connect( const TQString &server, uint port )
 	// non-empty, so disable it until we have actual data in the queue
 	m_socket->enableWrite( false );
 
-	TQObject::connect( m_socket, TQT_SIGNAL( readyRead() ),             this, TQT_SLOT( slotDataReceived() ) );
-	TQObject::connect( m_socket, TQT_SIGNAL( readyWrite() ),            this, TQT_SLOT( slotReadyWrite() ) );
-	TQObject::connect( m_socket, TQT_SIGNAL( hostFound() ),	       this, TQT_SLOT( slotHostFound() ) );
-	TQObject::connect( m_socket, TQT_SIGNAL( connected( const KResolverEntry&) ), this, TQT_SLOT( slotConnectionSuccess() ) );
-	TQObject::connect( m_socket, TQT_SIGNAL( gotError( int ) ),         this, TQT_SLOT( slotSocketError( int ) ) );
-	TQObject::connect( m_socket, TQT_SIGNAL( closed( ) ),               this, TQT_SLOT( slotSocketClosed( ) ) );
+	TQObject::connect( m_socket, TQ_SIGNAL( readyRead() ),             this, TQ_SLOT( slotDataReceived() ) );
+	TQObject::connect( m_socket, TQ_SIGNAL( readyWrite() ),            this, TQ_SLOT( slotReadyWrite() ) );
+	TQObject::connect( m_socket, TQ_SIGNAL( hostFound() ),	       this, TQ_SLOT( slotHostFound() ) );
+	TQObject::connect( m_socket, TQ_SIGNAL( connected( const KResolverEntry&) ), this, TQ_SLOT( slotConnectionSuccess() ) );
+	TQObject::connect( m_socket, TQ_SIGNAL( gotError( int ) ),         this, TQ_SLOT( slotSocketError( int ) ) );
+	TQObject::connect( m_socket, TQ_SIGNAL( closed( ) ),               this, TQ_SLOT( slotSocketClosed( ) ) );
 
 	if(m_useHttp)
 	{
@@ -125,7 +125,7 @@ void MSNSocket::connect( const TQString &server, uint port )
 		{
 			m_timer = new TQTimer(this, "Http poll timer");
 			// Connect the slot HttpPoll with the timer timeout signal.
-			TQObject::connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotHttpPoll()));
+			TQObject::connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotHttpPoll()));
 		}
 	}
 
@@ -429,7 +429,7 @@ void MSNSocket::slotReadLine()
 		if ( m_buffer.size() >= 3 && ( m_buffer.data()[ 0 ] == '\0' || m_buffer.data()[ 0 ]== '\1' ) )
 		{
 			bytesReceived( m_buffer.take( 3 ) );
-			TQTimer::singleShot( 0, this, TQT_SLOT( slotReadLine() ) );
+			TQTimer::singleShot( 0, this, TQ_SLOT( slotReadLine() ) );
 			return;
 		}
 
@@ -451,7 +451,7 @@ void MSNSocket::slotReadLine()
 
 			// Don't block the GUI while parsing data, only do a single line!
 			// (Done before parseLine() to prevent a potential crash)
-			TQTimer::singleShot( 0, this, TQT_SLOT( slotReadLine() ) );
+			TQTimer::singleShot( 0, this, TQ_SLOT( slotReadLine() ) );
 
 			parseLine( command );
 			// WARNING: At this point 'this' can be deleted (when disconnecting)
@@ -938,10 +938,10 @@ bool MSNSocket::accept( TDEServerSocket *server )
 	m_socket->enableRead( true );
 	m_socket->enableWrite( true );
 
-	TQObject::connect( m_socket, TQT_SIGNAL( readyRead() ),             this, TQT_SLOT( slotDataReceived() ) );
-	TQObject::connect( m_socket, TQT_SIGNAL( readyWrite() ),            this, TQT_SLOT( slotReadyWrite() ) );
-	TQObject::connect( m_socket, TQT_SIGNAL( closed() ),                this, TQT_SLOT( slotSocketClosed() ) );
-	TQObject::connect( m_socket, TQT_SIGNAL( gotError( int ) ),         this, TQT_SLOT( slotSocketError( int ) ) );
+	TQObject::connect( m_socket, TQ_SIGNAL( readyRead() ),             this, TQ_SLOT( slotDataReceived() ) );
+	TQObject::connect( m_socket, TQ_SIGNAL( readyWrite() ),            this, TQ_SLOT( slotReadyWrite() ) );
+	TQObject::connect( m_socket, TQ_SIGNAL( closed() ),                this, TQ_SLOT( slotSocketClosed() ) );
+	TQObject::connect( m_socket, TQ_SIGNAL( gotError( int ) ),         this, TQ_SLOT( slotSocketError( int ) ) );
 
 	doneConnect();
 	return true;
diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp
index e74e728f..e60c01aa 100644
--- a/kopete/protocols/msn/msnswitchboardsocket.cpp
+++ b/kopete/protocols/msn/msnswitchboardsocket.cpp
@@ -96,14 +96,14 @@ void MSNSwitchBoardSocket::connectToSwitchBoard(TQString ID, TQString address, T
 	TQString server = address.left( address.find( ":" ) );
 	uint port = address.right( address.length() - address.findRev( ":" ) - 1 ).toUInt();
 
-	TQObject::connect( this, TQT_SIGNAL( blockRead( const TQByteArray & ) ),
-		this, TQT_SLOT(slotReadMessage( const TQByteArray & ) ) );
+	TQObject::connect( this, TQ_SIGNAL( blockRead( const TQByteArray & ) ),
+		this, TQ_SLOT(slotReadMessage( const TQByteArray & ) ) );
 
-	TQObject::connect( this, TQT_SIGNAL( onlineStatusChanged( MSNSocket::OnlineStatus ) ),
-		this, TQT_SLOT( slotOnlineStatusChanged( MSNSocket::OnlineStatus ) ) );
+	TQObject::connect( this, TQ_SIGNAL( onlineStatusChanged( MSNSocket::OnlineStatus ) ),
+		this, TQ_SLOT( slotOnlineStatusChanged( MSNSocket::OnlineStatus ) ) );
 
-	TQObject::connect( this, TQT_SIGNAL( socketClosed( ) ),
-		this, TQT_SLOT( slotSocketClosed( ) ) );
+	TQObject::connect( this, TQ_SIGNAL( socketClosed( ) ),
+		this, TQ_SLOT( slotSocketClosed( ) ) );
 
 	connect( server, port );
 }
@@ -408,7 +408,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes )
 			if(!m_emoticonTimer) //to be sure no message will be lost, we will appends message to
 			{                    // the queue in 15 secondes even if we have not received emoticons
 				m_emoticonTimer=new TQTimer(this);
-				TQObject::connect(m_emoticonTimer , TQT_SIGNAL(timeout()) , this, TQT_SLOT(cleanQueue()));
+				TQObject::connect(m_emoticonTimer , TQ_SIGNAL(timeout()) , this, TQ_SLOT(cleanQueue()));
 				m_emoticonTimer->start( 15000 , true );
 			}
 		}
@@ -828,7 +828,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg )
 	{
 		m_keepAliveNb=20;
 		m_keepAlive=new TQTimer(this);
-		TQObject::connect(m_keepAlive, TQT_SIGNAL(timeout()) , this , TQT_SLOT(slotKeepAliveTimer()));
+		TQObject::connect(m_keepAlive, TQ_SIGNAL(timeout()) , this , TQ_SLOT(slotKeepAliveTimer()));
 		m_keepAlive->start(50*1000);
 	}
 
@@ -878,7 +878,7 @@ void MSNSwitchBoardSocket::slotOnlineStatusChanged( MSNSocket::OnlineStatus stat
 		{
 			m_keepAliveNb=20;
 			m_keepAlive=new TQTimer(this);
-			TQObject::connect(m_keepAlive, TQT_SIGNAL(timeout()) , this , TQT_SLOT(slotKeepAliveTimer()));
+			TQObject::connect(m_keepAlive, TQ_SIGNAL(timeout()) , this , TQ_SLOT(slotKeepAliveTimer()));
 			m_keepAlive->start(50*1000);
 		}
 	}
@@ -1090,11 +1090,11 @@ Dispatcher* MSNSwitchBoardSocket::PeerDispatcher()
 		}
 		m_dispatcher = new Dispatcher(this, m_account->accountId(),ip );
 
-// 		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&, 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)));
+// 		TQObject::connect(this, TQ_SIGNAL(blockRead(const TQByteArray&)), m_dispatcher, TQ_SLOT(slotReadMessage(const TQByteArray&)));
+// 		TQObject::connect(m_dispatcher, TQ_SIGNAL(sendCommand(const TQString&, const TQString&, bool, const TQByteArray&, bool)), this, TQ_SLOT(sendCommand(const TQString&, const TQString&, bool, const TQByteArray&, bool)));
+		TQObject::connect(m_dispatcher, TQ_SIGNAL(incomingTransfer(const TQString&, const TQString&, TQ_INT64)), this, TQ_SLOT(slotIncomingFileTransfer(const TQString&, const TQString&, TQ_INT64)));
+		TQObject::connect(m_dispatcher, TQ_SIGNAL(displayIconReceived(KTempFile *, const TQString&)), this, TQ_SLOT(slotEmoticonReceived( KTempFile *, const TQString&)));
+		TQObject::connect(this, TQ_SIGNAL(msgAcknowledgement(unsigned int, bool)), m_dispatcher, TQ_SLOT(messageAcknowledged(unsigned int, bool)));
 		m_dispatcher->m_pictureUrl = m_account->pictureUrl();
 	}
 	return m_dispatcher;
diff --git a/kopete/protocols/msn/outgoingtransfer.cpp b/kopete/protocols/msn/outgoingtransfer.cpp
index 5d66c495..037cd093 100644
--- a/kopete/protocols/msn/outgoingtransfer.cpp
+++ b/kopete/protocols/msn/outgoingtransfer.cpp
@@ -246,7 +246,7 @@ void OutgoingTransfer::processMessage(const Message& message)
 			m_transfer =
 				Kopete::TransferManager::transferManager()->addTransfer(contact, m_file->name(), m_file->size(), m_recipient, Kopete::FileTransferInfo::Outgoing);
 
-			TQObject::connect(m_transfer , TQT_SIGNAL(transferCanceled()), this, TQT_SLOT(abort()));
+			TQObject::connect(m_transfer , TQ_SIGNAL(transferCanceled()), this, TQ_SLOT(abort()));
 
 			m_state = Negotiation;
 
@@ -345,10 +345,10 @@ void OutgoingTransfer::connectToEndpoint(const TQString& hostName)
 	// when we are ready to sent data.
 	// NOTE readyWrite consumes too much cpu usage.
 	m_socket->enableWrite(false);
-	TQObject::connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotRead()));
-	TQObject::connect(m_socket, TQT_SIGNAL(connected(const KResolverEntry&)), this, TQT_SLOT(slotConnected()));
-	TQObject::connect(m_socket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int)));
-	TQObject::connect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotSocketClosed()));
+	TQObject::connect(m_socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotRead()));
+	TQObject::connect(m_socket, TQ_SIGNAL(connected(const KResolverEntry&)), this, TQ_SLOT(slotConnected()));
+	TQObject::connect(m_socket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotSocketError(int)));
+	TQObject::connect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotSocketClosed()));
 	// Try to connect to the endpoint.
 	m_socket->connect();
 }
@@ -363,7 +363,7 @@ void OutgoingTransfer::slotConnected()
 		// Not all data was written, close the socket.
 		m_socket->closeNow();
 		// Schedule the data to be sent through the existing session.
-		TQTimer::singleShot(2000, this, TQT_SLOT(slotSendData()));
+		TQTimer::singleShot(2000, this, TQ_SLOT(slotSendData()));
 		return;
 	}
 
@@ -418,7 +418,7 @@ void OutgoingTransfer::slotSocketError(int)
 	{
 		// Otherwise, send the data through the session.
 		m_identifier -= 1;
-		TQTimer::singleShot(2000, this, TQT_SLOT(slotSendData()));
+		TQTimer::singleShot(2000, this, TQ_SLOT(slotSendData()));
 	}
 }
 
diff --git a/kopete/protocols/msn/transport.cpp b/kopete/protocols/msn/transport.cpp
index 57b1f356..4f22ea8a 100644
--- a/kopete/protocols/msn/transport.cpp
+++ b/kopete/protocols/msn/transport.cpp
@@ -72,7 +72,7 @@ TransportBridge* Transport::getBridge (const TQString& to, TQ_UINT16 port, Trans
 
 	if (bridge != 0l)
 	{
-		TQObject::connect(bridge, TQT_SIGNAL(readyRead(const TQByteArray&)), TQT_SLOT(slotOnReceive(const TQByteArray&)));
+		TQObject::connect(bridge, TQ_SIGNAL(readyRead(const TQByteArray&)), TQ_SLOT(slotOnReceive(const TQByteArray&)));
 	}
 	
 	return 0l;
@@ -81,7 +81,7 @@ TransportBridge* Transport::getBridge (const TQString& to, TQ_UINT16 port, Trans
 void Transport::setDefaultBridge(MSNSwitchBoardSocket* mss)
 {
 	mDefaultBridge = mss;
-	TQObject::connect((MSNSwitchBoardSocket*)mDefaultBridge, TQT_SIGNAL(messageReceived(const TQString&, const TQByteArray&)), TQT_SLOT(slotOnReceive(const TQString&, const TQByteArray&)));
+	TQObject::connect((MSNSwitchBoardSocket*)mDefaultBridge, TQ_SIGNAL(messageReceived(const TQString&, const TQByteArray&)), TQ_SLOT(slotOnReceive(const TQString&, const TQByteArray&)));
 }
 
 //END
@@ -171,8 +171,8 @@ TcpTransportBridge::TcpTransportBridge(const KNetwork::KInetSocketAddress& to, M
 {	
 	mSocket = new KStreamSocket(mAddress.ipAddress().toString(), TQString::number(mAddress.port()), this);
 	mSocket->setBlocking(false);
-	TQObject::connect(mSocket, TQT_SIGNAL(connected(const KResolverEntry&)), TQT_SLOT(slotOnSocketConnect()));
-	TQObject::connect(mSocket, TQT_SIGNAL(gotError(int)), TQT_SLOT(slotOnError(int)));
+	TQObject::connect(mSocket, TQ_SIGNAL(connected(const KResolverEntry&)), TQ_SLOT(slotOnSocketConnect()));
+	TQObject::connect(mSocket, TQ_SIGNAL(gotError(int)), TQ_SLOT(slotOnError(int)));
 	mConnected = false;
 }
 
@@ -199,7 +199,7 @@ void TcpTransportBridge::slotOnConnect()
 
 	KStreamSocket *socket = static_cast<KStreamSocket*>(mSocket);
 	socket->setTimeout(5000);
-	TQObject::connect(socket, TQT_SIGNAL(timeOut()), TQT_SLOT(slotOnSocketConnectTimeout()));
+	TQObject::connect(socket, TQ_SIGNAL(timeOut()), TQ_SLOT(slotOnSocketConnectTimeout()));
 	mSocket->connect();
 }
 
@@ -239,8 +239,8 @@ void TcpTransportBridge::slotOnSocketConnect()
 		<< mSocket->localAddress().toString() << endl;
 	mConnected = true;
 
-	TQObject::connect(mSocket, TQT_SIGNAL(readyRead()), TQT_SLOT(slotOnSocketReceive()));
-	TQObject::connect(mSocket, TQT_SIGNAL(closed()), TQT_SLOT(slotOnSocketClose()));
+	TQObject::connect(mSocket, TQ_SIGNAL(readyRead()), TQ_SLOT(slotOnSocketReceive()));
+	TQObject::connect(mSocket, TQ_SIGNAL(closed()), TQ_SLOT(slotOnSocketClose()));
 
 	mVerified = true;
 	TQString foo = "foo\0";
diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
index 37cc1dd8..600f0f15 100644
--- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp
+++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
@@ -174,11 +174,11 @@ MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account
 		d->ui->m_phones->setDisabled( true );
 	}
 
-	connect( d->ui->m_allowButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAllow() ) );
-	connect( d->ui->m_blockButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBlock() ) );
-	connect( d->ui->m_selectImage, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSelectImage() ) );
-	connect( d->ui->m_RLButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotShowReverseList() ) );
-	connect( d->ui->buttonRegister, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpenRegister()));
+	connect( d->ui->m_allowButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAllow() ) );
+	connect( d->ui->m_blockButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBlock() ) );
+	connect( d->ui->m_selectImage, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSelectImage() ) );
+	connect( d->ui->m_RLButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotShowReverseList() ) );
+	connect( d->ui->buttonRegister, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOpenRegister()));
 	TQWidget::setTabOrder( d->ui->m_login, d->ui->m_password->mRemembered );
 	TQWidget::setTabOrder( d->ui->m_password->mRemembered, d->ui->m_password->mPassword );
 	TQWidget::setTabOrder( d->ui->m_password->mPassword, d->ui->m_autologin );
diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp
index 60046d17..44d3ffd4 100644
--- a/kopete/protocols/msn/webcam.cpp
+++ b/kopete/protocols/msn/webcam.cpp
@@ -131,7 +131,7 @@ void Webcam::sendBYEMessage()
 	sendMessage(BYE,content);
 	
 	//If ever the opposite client was dead or something, we'll ack anyway, so everything get cleaned
-	TQTimer::singleShot(60*1000 , this, TQT_SLOT(acknowledged()));
+	TQTimer::singleShot(60*1000 , this, TQ_SLOT(acknowledged()));
 }
 
 
@@ -342,8 +342,8 @@ void Webcam::processMessage(const Message& message)
 		}
 		//m_listener->setResolutionEnabled(true);
 				// Create the callback that will try to accept incoming connections.
-		TQObject::connect(m_listener, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotAccept()));
-		TQObject::connect(m_listener, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotListenError(int)));
+		TQObject::connect(m_listener, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotAccept()));
+		TQObject::connect(m_listener, TQ_SIGNAL(gotError(int)), this, TQ_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;		
@@ -383,8 +383,8 @@ void Webcam::processMessage(const Message& message)
 				kdDebug(14140) << k_funcinfo << "trying to connect on " << ip <<":" << port1 << endl;
 				TDEBufferedSocket *sock=new TDEBufferedSocket( ip, port1, this );
 				m_allSockets.append(sock);
-				TQObject::connect( sock, TQT_SIGNAL( connected( const KResolverEntry&) ), this, TQT_SLOT( slotSocketConnected() ) );
-				TQObject::connect( sock, TQT_SIGNAL( gotError(int)), this, TQT_SLOT(slotSocketError(int)));
+				TQObject::connect( sock, TQ_SIGNAL( connected( const KResolverEntry&) ), this, TQ_SLOT( slotSocketConnected() ) );
+				TQObject::connect( sock, TQ_SIGNAL( gotError(int)), this, TQ_SLOT(slotSocketError(int)));
 				sock->connect(ip, port1);
 				kdDebug(14140) << k_funcinfo << "okok " << sock << " - " << sock->peerAddress().toString() << " ; " << sock->localAddress().toString()  << endl;
 			}
@@ -393,8 +393,8 @@ void Webcam::processMessage(const Message& message)
 				kdDebug(14140) << k_funcinfo << "trying to connect on " << ip <<":" << port2 << endl;
 				TDEBufferedSocket *sock=new TDEBufferedSocket( ip, port2, this );
 				m_allSockets.append(sock);
-				TQObject::connect( sock, TQT_SIGNAL( connected( const KResolverEntry&) ), this, TQT_SLOT( slotSocketConnected() ) );
-				TQObject::connect( sock, TQT_SIGNAL( gotError(int)), this, TQT_SLOT(slotSocketError(int)));
+				TQObject::connect( sock, TQ_SIGNAL( connected( const KResolverEntry&) ), this, TQ_SLOT( slotSocketConnected() ) );
+				TQObject::connect( sock, TQ_SIGNAL( gotError(int)), this, TQ_SLOT(slotSocketError(int)));
 				sock->connect(ip, port2);
 			}
 			if(!port3.isNull())
@@ -402,8 +402,8 @@ void Webcam::processMessage(const Message& message)
 				kdDebug(14140) << k_funcinfo << "trying to connect on " << ip <<":" << port3 << endl;
 				TDEBufferedSocket *sock=new TDEBufferedSocket( ip, port3, this );
 				m_allSockets.append(sock);
-				TQObject::connect( sock, TQT_SIGNAL( connected( const KResolverEntry&) ), this, TQT_SLOT( slotSocketConnected() ) );
-				TQObject::connect( sock, TQT_SIGNAL( gotError(int)), this, TQT_SLOT(slotSocketError(int)));
+				TQObject::connect( sock, TQ_SIGNAL( connected( const KResolverEntry&) ), this, TQ_SLOT( slotSocketConnected() ) );
+				TQObject::connect( sock, TQ_SIGNAL( gotError(int)), this, TQ_SLOT(slotSocketError(int)));
 				sock->connect(ip, port3);
 			}
 		}
@@ -568,11 +568,11 @@ void Webcam::slotSocketConnected()
 	m_webcamSocket->enableWrite(false);
 
 	// Create the callback that will try to read bytes from the accepted socket.
-	TQObject::connect(m_webcamSocket, TQT_SIGNAL(readyRead()),   this, TQT_SLOT(slotSocketRead()));
+	TQObject::connect(m_webcamSocket, TQ_SIGNAL(readyRead()),   this, TQ_SLOT(slotSocketRead()));
 	// Create the callback that will try to handle the socket close event.
-	TQObject::connect(m_webcamSocket, TQT_SIGNAL(closed()),      this, TQT_SLOT(slotSocketClosed()));
+	TQObject::connect(m_webcamSocket, TQ_SIGNAL(closed()),      this, TQ_SLOT(slotSocketClosed()));
 	// Create the callback that will try to handle the socket error event.
-//	TQObject::connect(m_webcamSocket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int)));
+//	TQObject::connect(m_webcamSocket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotSocketError(int)));
 
 	m_webcamStates[m_webcamSocket]=wsConnected;
 	TQCString to_send=m_peerAuth.utf8();
@@ -608,11 +608,11 @@ void Webcam::slotAccept()
 	m_webcamSocket->enableWrite(false);
 
 	// Create the callback that will try to read bytes from the accepted socket.
-	TQObject::connect(m_webcamSocket, TQT_SIGNAL(readyRead()),   this, TQT_SLOT(slotSocketRead()));
+	TQObject::connect(m_webcamSocket, TQ_SIGNAL(readyRead()),   this, TQ_SLOT(slotSocketRead()));
 	// Create the callback that will try to handle the socket close event.
-	TQObject::connect(m_webcamSocket, TQT_SIGNAL(closed()),      this, TQT_SLOT(slotSocketClosed()));
+	TQObject::connect(m_webcamSocket, TQ_SIGNAL(closed()),      this, TQ_SLOT(slotSocketClosed()));
 	// Create the callback that will try to handle the socket error event.
-	TQObject::connect(m_webcamSocket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int)));
+	TQObject::connect(m_webcamSocket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotSocketError(int)));
 	
 	m_allSockets.append(m_webcamSocket);
 	m_webcamStates[m_webcamSocket]=wsNegotiating;
@@ -668,7 +668,7 @@ void Webcam::slotSocketRead()
 					kdDebug(14140) << k_funcinfo <<  "new timer" << m_timerId << endl;
 				}
 				m_widget=new MSNWebcamDialog(m_recipient);
-				connect(m_widget, TQT_SIGNAL( closingWebcamDialog() ) , this , TQT_SLOT(sendBYEMessage()));
+				connect(m_widget, TQ_SIGNAL( closingWebcamDialog() ) , this , TQ_SLOT(sendBYEMessage()));
 
 			}
 			else
@@ -718,7 +718,7 @@ void Webcam::slotSocketRead()
 					kdDebug(14140) << k_funcinfo <<  "new timer" << m_timerId << endl;
 				}
 				m_widget=new MSNWebcamDialog(m_recipient);
-				connect(m_widget, TQT_SIGNAL( closingWebcamDialog() ) , this , TQT_SLOT(sendBYEMessage()));
+				connect(m_widget, TQ_SIGNAL( closingWebcamDialog() ) , this , TQ_SLOT(sendBYEMessage()));
 				
 				}
 				m_webcamStates[m_webcamSocket]=wsTransfer;
diff --git a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp
index d7a49e09..311f12a3 100644
--- a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp
+++ b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp
@@ -36,12 +36,12 @@ MSNWebcamDialog::MSNWebcamDialog( const TQString& contact, TQWidget * parent, co
 	
 	setEscapeButton( KDialogBase::Close );
 	/*
-	TQObject::connect( contact, TQT_SIGNAL( signalReceivedWebcamImage( const TQPixmap&  ) ),
-	                  this, TQT_SLOT( newImage( const TQPixmap& ) ) );
+	TQObject::connect( contact, TQ_SIGNAL( signalReceivedWebcamImage( const TQPixmap&  ) ),
+	                  this, TQ_SLOT( newImage( const TQPixmap& ) ) );
 	*/
-	TQObject::connect( this, TQT_SIGNAL( closeClicked() ), this, TQT_SIGNAL( closingWebcamDialog() ) );
+	TQObject::connect( this, TQ_SIGNAL( closeClicked() ), this, TQ_SIGNAL( closingWebcamDialog() ) );
 	/*
-	TQObject::connect( contact, TQT_SIGNAL( webcamClosed( int ) ), this, TQT_SLOT( webcamClosed( int ) ) );
+	TQObject::connect( contact, TQ_SIGNAL( webcamClosed( int ) ), this, TQ_SLOT( webcamClosed( int ) ) );
 	*/
 	TQFrame* page = plainPage();
 	if ( page )