Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

55 files changed, 467 insertions, 467 deletions

diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp
index 5eb071a2..4117bb3c 100644
--- a/kopete/protocols/jabber/jabberaccount.cpp
+++ b/kopete/protocols/jabber/jabberaccount.cpp
@@ -109,7 +109,7 @@ JabberAccount::JabberAccount (JabberProtocol * parent, const TQString & accountI
 	JabberContact *myContact = contactPool()->addContact ( XMPP::RosterItem ( accountId ), Kopete::ContactList::self()->myself(), false );
 	setMyself( myContact );
 
-	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_initialPresence = XMPP::Status ( "", "", 5, true );
 
@@ -178,7 +178,7 @@ TDEActionMenu *JabberAccount::actionMenu ()
 
 	TDEAction *action;
 	
-	action = new TDEAction (i18n ("Join Groupchat..."), "jabber_group", 0, this, TQT_SLOT (slotJoinNewChat ()), this, "actionJoinChat");
+	action = new TDEAction (i18n ("Join Groupchat..."), "jabber_group", 0, this, TQ_SLOT (slotJoinNewChat ()), this, "actionJoinChat");
 	m_actionMenu->insert(action);
 	action->setEnabled( isConnected() );
 	
@@ -190,17 +190,17 @@ TDEActionMenu *JabberAccount::actionMenu ()
 	m_actionMenu->popupMenu()->insertSeparator();
 	
 	action =  new TDEAction ( i18n ("Services..."), "jabber_serv_on", 0,
-							this, TQT_SLOT ( slotGetServices () ), this, "actionJabberServices");
+							this, TQ_SLOT ( slotGetServices () ), this, "actionJabberServices");
 	action->setEnabled( isConnected() );
 	m_actionMenu->insert ( action );
 
 	action = new TDEAction ( i18n ("Send Raw Packet to Server..."), "mail-message-new", 0,
-										 this, TQT_SLOT ( slotSendRaw () ), this, "actionJabberSendRaw") ;
+										 this, TQ_SLOT ( slotSendRaw () ), this, "actionJabberSendRaw") ;
 	action->setEnabled( isConnected() );
 	m_actionMenu->insert ( action );
 
 	action = new TDEAction ( i18n ("Edit User Info..."), "identity", 0,
-										 this, TQT_SLOT ( slotEditVCard () ), this, "actionEditVCard") ;
+										 this, TQ_SLOT ( slotEditVCard () ), this, "actionEditVCard") ;
 	action->setEnabled( isConnected() );
 	m_actionMenu->insert ( action );
 
@@ -295,40 +295,40 @@ void JabberAccount::connectWithPassword ( const TQString &password )
 	{
 		m_jabberClient = new JabberClient;
 	
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( csDisconnected () ), this, TQT_SLOT ( slotCSDisconnected () ) );
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( csError ( int ) ), this, TQT_SLOT ( slotCSError ( int ) ) );
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( tlsWarning ( int ) ), this, TQT_SLOT ( slotHandleTLSWarning ( int ) ) );
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) );
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( error ( JabberClient::ErrorCode ) ), this, TQT_SLOT ( slotClientError ( JabberClient::ErrorCode ) ) );
-
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( subscription ( const XMPP::Jid &, const TQString & ) ),
-				   this, TQT_SLOT ( slotSubscription ( const XMPP::Jid &, const TQString & ) ) );
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( rosterRequestFinished ( bool ) ),
-				   this, TQT_SLOT ( slotRosterRequestFinished ( bool ) ) );
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( newContact ( const XMPP::RosterItem & ) ),
-				   this, TQT_SLOT ( slotContactUpdated ( const XMPP::RosterItem & ) ) );
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( contactUpdated ( const XMPP::RosterItem & ) ),
-				   this, TQT_SLOT ( slotContactUpdated ( const XMPP::RosterItem & ) ) );
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( contactDeleted ( const XMPP::RosterItem & ) ),
-				   this, TQT_SLOT ( slotContactDeleted ( const XMPP::RosterItem & ) ) );
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( resourceAvailable ( const XMPP::Jid &, const XMPP::Resource & ) ),
-				   this, TQT_SLOT ( slotResourceAvailable ( const XMPP::Jid &, const XMPP::Resource & ) ) );
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( resourceUnavailable ( const XMPP::Jid &, const XMPP::Resource & ) ),
-				   this, TQT_SLOT ( slotResourceUnavailable ( const XMPP::Jid &, const XMPP::Resource & ) ) );
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( messageReceived ( const XMPP::Message & ) ),
-				   this, TQT_SLOT ( slotReceivedMessage ( const XMPP::Message & ) ) );
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( incomingFileTransfer () ),
-				   this, TQT_SLOT ( slotIncomingFileTransfer () ) );
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatJoined ( const XMPP::Jid & ) ),
-				   this, TQT_SLOT ( slotGroupChatJoined ( const XMPP::Jid & ) ) );
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatLeft ( const XMPP::Jid & ) ),
-				   this, TQT_SLOT ( slotGroupChatLeft ( const XMPP::Jid & ) ) );
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatPresence ( const XMPP::Jid &, const XMPP::Status & ) ),
-				   this, TQT_SLOT ( slotGroupChatPresence ( const XMPP::Jid &, const XMPP::Status & ) ) );
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatError ( const XMPP::Jid &, int, const TQString & ) ),
-				   this, TQT_SLOT ( slotGroupChatError ( const XMPP::Jid &, int, const TQString & ) ) );
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( debugMessage ( const TQString & ) ),
-				   this, TQT_SLOT ( slotClientDebugMessage ( const TQString & ) ) );
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( csDisconnected () ), this, TQ_SLOT ( slotCSDisconnected () ) );
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( csError ( int ) ), this, TQ_SLOT ( slotCSError ( int ) ) );
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( tlsWarning ( int ) ), this, TQ_SLOT ( slotHandleTLSWarning ( int ) ) );
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( connected () ), this, TQ_SLOT ( slotConnected () ) );
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( error ( JabberClient::ErrorCode ) ), this, TQ_SLOT ( slotClientError ( JabberClient::ErrorCode ) ) );
+
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( subscription ( const XMPP::Jid &, const TQString & ) ),
+				   this, TQ_SLOT ( slotSubscription ( const XMPP::Jid &, const TQString & ) ) );
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( rosterRequestFinished ( bool ) ),
+				   this, TQ_SLOT ( slotRosterRequestFinished ( bool ) ) );
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( newContact ( const XMPP::RosterItem & ) ),
+				   this, TQ_SLOT ( slotContactUpdated ( const XMPP::RosterItem & ) ) );
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( contactUpdated ( const XMPP::RosterItem & ) ),
+				   this, TQ_SLOT ( slotContactUpdated ( const XMPP::RosterItem & ) ) );
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( contactDeleted ( const XMPP::RosterItem & ) ),
+				   this, TQ_SLOT ( slotContactDeleted ( const XMPP::RosterItem & ) ) );
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( resourceAvailable ( const XMPP::Jid &, const XMPP::Resource & ) ),
+				   this, TQ_SLOT ( slotResourceAvailable ( const XMPP::Jid &, const XMPP::Resource & ) ) );
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( resourceUnavailable ( const XMPP::Jid &, const XMPP::Resource & ) ),
+				   this, TQ_SLOT ( slotResourceUnavailable ( const XMPP::Jid &, const XMPP::Resource & ) ) );
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( messageReceived ( const XMPP::Message & ) ),
+				   this, TQ_SLOT ( slotReceivedMessage ( const XMPP::Message & ) ) );
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( incomingFileTransfer () ),
+				   this, TQ_SLOT ( slotIncomingFileTransfer () ) );
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( groupChatJoined ( const XMPP::Jid & ) ),
+				   this, TQ_SLOT ( slotGroupChatJoined ( const XMPP::Jid & ) ) );
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( groupChatLeft ( const XMPP::Jid & ) ),
+				   this, TQ_SLOT ( slotGroupChatLeft ( const XMPP::Jid & ) ) );
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( groupChatPresence ( const XMPP::Jid &, const XMPP::Status & ) ),
+				   this, TQ_SLOT ( slotGroupChatPresence ( const XMPP::Jid &, const XMPP::Status & ) ) );
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( groupChatError ( const XMPP::Jid &, int, const TQString & ) ),
+				   this, TQ_SLOT ( slotGroupChatError ( const XMPP::Jid &, int, const TQString & ) ) );
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( debugMessage ( const TQString & ) ),
+				   this, TQ_SLOT ( slotClientDebugMessage ( const TQString & ) ) );
 	}
 	else
 	{
@@ -560,7 +560,7 @@ void JabberAccount::slotConnected ()
 	{
 		kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Creating Jingle Voice caller..." << endl;
 		m_voiceCaller = new JingleVoiceCaller( this );
-		TQObject::connect(m_voiceCaller,TQT_SIGNAL(incoming(const Jid&)),this,TQT_SLOT(slotIncomingVoiceCall( const Jid& )));
+		TQObject::connect(m_voiceCaller,TQ_SIGNAL(incoming(const Jid&)),this,TQ_SLOT(slotIncomingVoiceCall( const Jid& )));
 		m_voiceCaller->initialize();
 	}
 	
@@ -571,7 +571,7 @@ void JabberAccount::slotConnected ()
 	{
 		kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Creating Jingle Session Manager..." << endl;
 		m_jingleSessionManager = new JingleSessionManager( this );
-		TQObject::connect(m_jingleSessionManager, TQT_SIGNAL(incomingSession(const TQString &, JingleSession *)), this, TQT_SLOT(slotIncomingJingleSession(const TQString &, JingleSession *)));
+		TQObject::connect(m_jingleSessionManager, TQ_SIGNAL(incomingSession(const TQString &, JingleSession *)), this, TQ_SLOT(slotIncomingJingleSession(const TQString &, JingleSession *)));
 	}
 #endif
 
@@ -1108,8 +1108,8 @@ void JabberAccount::slotSubscription (const XMPP::Jid & jid, const TQString & ty
 		
 		Kopete::UI::ContactAddedNotifyDialog *dialog=
 				new Kopete::UI::ContactAddedNotifyDialog( jid.full() ,TQString(),this, hideFlags );
-		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();
 	}
 	else if (type == "unsubscribed")
@@ -1709,13 +1709,13 @@ bool JabberAccount::removeAccount( )
 			}
 			
 			XMPP::JT_Register *task = new XMPP::JT_Register ( client()->rootTask () );
-			TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotUnregisterFinished ) );
+			TQObject::connect ( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( slotUnregisterFinished ) );
 			task->unreg ();
 			task->go ( true );
 			m_removing=true;
 			// from my experiment, not all server reply us with a response.   it simply dosconnect
 			// so after one seconde, we will force to remove the account
-			TQTimer::singleShot(1111, this, TQT_SLOT(slotUnregisterFinished())); 
+			TQTimer::singleShot(1111, this, TQ_SLOT(slotUnregisterFinished())); 
 			
 			return false; //the account will be removed when the task will be finished
 		}
diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp
index 54d4e427..f13c28a7 100644
--- a/kopete/protocols/jabber/jabberbasecontact.cpp
+++ b/kopete/protocols/jabber/jabberbasecontact.cpp
@@ -217,7 +217,7 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item )
 	setDontSync ( false );
 	
 	//can't do it now because it's called from contructor at a point some virtual function are not available
-	TQTimer::singleShot(0, this, TQT_SLOT(reevaluateStatus()));
+	TQTimer::singleShot(0, this, TQ_SLOT(reevaluateStatus()));
 
 }
 
diff --git a/kopete/protocols/jabber/jabberbookmarks.cpp b/kopete/protocols/jabber/jabberbookmarks.cpp
index ba8d1779..875bc5b6 100644
--- a/kopete/protocols/jabber/jabberbookmarks.cpp
+++ b/kopete/protocols/jabber/jabberbookmarks.cpp
@@ -28,7 +28,7 @@
 
 JabberBookmarks::JabberBookmarks(JabberAccount *parent) : TQObject(parent) , m_account(parent) 
 {
-	connect( m_account , TQT_SIGNAL( isConnectedChanged() ) , this , TQT_SLOT( accountConnected() ) );
+	connect( m_account , TQ_SIGNAL( isConnectedChanged() ) , this , TQ_SLOT( accountConnected() ) );
 }
 
 void JabberBookmarks::accountConnected()
@@ -38,7 +38,7 @@ void JabberBookmarks::accountConnected()
 	
 	XMPP::JT_PrivateStorage * task = new XMPP::JT_PrivateStorage ( m_account->client()->rootTask ());
 	task->get( "storage" , "storage:bookmarks" );
-	TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotReceivedBookmarks() ) );
+	TQObject::connect ( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( slotReceivedBookmarks() ) );
 	task->go ( true );
 }
 
@@ -131,7 +131,7 @@ TDEAction * JabberBookmarks::bookmarksAction(TQObject *parent)
 {
 	TDESelectAction *groupchatBM = new TDESelectAction( i18n("Groupchat bookmark") , "jabber_group" , 0 , parent , "actionBookMark" );
 	groupchatBM->setItems(m_conferencesJID);
-	TQObject::connect(groupchatBM, TQT_SIGNAL(activated (const TQString&)) , this, TQT_SLOT(slotJoinChatBookmark(const TQString&)));
+	TQObject::connect(groupchatBM, TQ_SIGNAL(activated (const TQString&)) , this, TQ_SLOT(slotJoinChatBookmark(const TQString&)));
 	return groupchatBM;
 }
 
diff --git a/kopete/protocols/jabber/jabberbytestream.cpp b/kopete/protocols/jabber/jabberbytestream.cpp
index f04518a6..2f711bcb 100644
--- a/kopete/protocols/jabber/jabberbytestream.cpp
+++ b/kopete/protocols/jabber/jabberbytestream.cpp
@@ -38,11 +38,11 @@ JabberByteStream::JabberByteStream ( TQObject *parent, const char */*name*/ )
 	mSocket->enableRead ( true );
 
 	// connect signals and slots
-	TQObject::connect ( mSocket, TQT_SIGNAL ( gotError ( int ) ), this, TQT_SLOT ( slotError ( int ) ) );
-	TQObject::connect ( mSocket, TQT_SIGNAL ( connected ( const KResolverEntry& ) ), this, TQT_SLOT ( slotConnected () ) );
-	TQObject::connect ( mSocket, TQT_SIGNAL ( closed () ), this, TQT_SLOT ( slotConnectionClosed () ) );
-	TQObject::connect ( mSocket, TQT_SIGNAL ( readyRead () ), this, TQT_SLOT ( slotReadyRead () ) );
-	TQObject::connect ( mSocket, TQT_SIGNAL ( bytesWritten ( int ) ), this, TQT_SLOT ( slotBytesWritten ( int ) ) );
+	TQObject::connect ( mSocket, TQ_SIGNAL ( gotError ( int ) ), this, TQ_SLOT ( slotError ( int ) ) );
+	TQObject::connect ( mSocket, TQ_SIGNAL ( connected ( const KResolverEntry& ) ), this, TQ_SLOT ( slotConnected () ) );
+	TQObject::connect ( mSocket, TQ_SIGNAL ( closed () ), this, TQ_SLOT ( slotConnectionClosed () ) );
+	TQObject::connect ( mSocket, TQ_SIGNAL ( readyRead () ), this, TQ_SLOT ( slotReadyRead () ) );
+	TQObject::connect ( mSocket, TQ_SIGNAL ( bytesWritten ( int ) ), this, TQ_SLOT ( slotBytesWritten ( int ) ) );
 
 }
 
diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp
index 57292ad3..b4aeb5ad 100644
--- a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp
+++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp
@@ -433,7 +433,7 @@ void JabberCapabilitiesManager::requestDiscoInfo(JabberAccount *account, const J
 		return;
  
 	JT_DiscoInfo *discoInfo = new JT_DiscoInfo(account->client()->rootTask());
-	connect(discoInfo, TQT_SIGNAL(finished()), TQT_SLOT(discoRequestFinished()));
+	connect(discoInfo, TQ_SIGNAL(finished()), TQ_SLOT(discoRequestFinished()));
 	discoInfo->get(jid, node);
 	//pending_++;
 	//timer_.start(REQUEST_TIMEOUT,true);
diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp
index 3ff2680c..f83774c2 100644
--- a/kopete/protocols/jabber/jabberchatsession.cpp
+++ b/kopete/protocols/jabber/jabberchatsession.cpp
@@ -50,12 +50,12 @@ JabberChatSession::JabberChatSession ( JabberProtocol *protocol, const JabberBas
 	// make sure Kopete knows about this instance
 	Kopete::ChatSessionManager::self()->registerChatSession ( this );
 
-	connect ( this, TQT_SIGNAL ( messageSent ( Kopete::Message &, Kopete::ChatSession * ) ),
-			  this, TQT_SLOT ( slotMessageSent ( Kopete::Message &, Kopete::ChatSession * ) ) );
+	connect ( this, TQ_SIGNAL ( messageSent ( Kopete::Message &, Kopete::ChatSession * ) ),
+			  this, TQ_SLOT ( slotMessageSent ( Kopete::Message &, Kopete::ChatSession * ) ) );
 
-	connect ( this, TQT_SIGNAL ( myselfTyping ( bool ) ), this, TQT_SLOT ( slotSendTypingNotification ( bool ) ) );
+	connect ( this, TQ_SIGNAL ( myselfTyping ( bool ) ), this, TQ_SLOT ( slotSendTypingNotification ( bool ) ) );
 
-	connect ( this, TQT_SIGNAL ( onlineStatusChanged(Kopete::Contact*, const Kopete::OnlineStatus&, const Kopete::OnlineStatus& ) ), this, TQT_SLOT ( slotUpdateDisplayName () ) );
+	connect ( this, TQ_SIGNAL ( onlineStatusChanged(Kopete::Contact*, const Kopete::OnlineStatus&, const Kopete::OnlineStatus& ) ), this, TQ_SLOT ( slotUpdateDisplayName () ) );
 
 	// check if the user ID contains a hardwired resource,
 	// we'll have to use that one in that case
@@ -65,7 +65,7 @@ JabberChatSession::JabberChatSession ( JabberProtocol *protocol, const JabberBas
 	slotUpdateDisplayName ();
 
 #ifdef SUPPORT_JINGLE
-	TDEAction *jabber_voicecall = new TDEAction( i18n("Voice call" ), "voicecall", 0, members().getFirst(), TQT_SLOT(voiceCall ()), actionCollection(), "jabber_voicecall" );
+	TDEAction *jabber_voicecall = new TDEAction( i18n("Voice call" ), "voicecall", 0, members().getFirst(), TQ_SLOT(voiceCall ()), actionCollection(), "jabber_voicecall" );
 
 	setInstance(protocol->instance());
 	jabber_voicecall->setEnabled( false );
@@ -85,7 +85,7 @@ JabberChatSession::JabberChatSession ( JabberProtocol *protocol, const JabberBas
 
 #endif
 
- new TDEAction( i18n( "Send File" ), "attach", 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "jabberSendFile" );
+ new TDEAction( i18n( "Send File" ), "attach", 0, this, TQ_SLOT( slotSendFile() ), actionCollection(), "jabberSendFile" );
 
 	setXMLFile("jabberchatui.rc");
 
diff --git a/kopete/protocols/jabber/jabberclient.cpp b/kopete/protocols/jabber/jabberclient.cpp
index 0bcdaebd..458ee605 100644
--- a/kopete/protocols/jabber/jabberclient.cpp
+++ b/kopete/protocols/jabber/jabberclient.cpp
@@ -126,7 +126,7 @@ JabberClient::JabberClient ()
 	cleanUp ();
 
 	// initiate penalty timer
-	TQTimer::singleShot ( JABBER_PENALTY_TIME * 1000, this, TQT_SLOT ( slotUpdatePenaltyTime () ) );
+	TQTimer::singleShot ( JABBER_PENALTY_TIME * 1000, this, TQ_SLOT ( slotUpdatePenaltyTime () ) );
 
 }
 
@@ -189,7 +189,7 @@ void JabberClient::slotUpdatePenaltyTime ()
 	else
 		d->currentPenaltyTime = 0;
 
-	TQTimer::singleShot ( JABBER_PENALTY_TIME * 1000, this, TQT_SLOT ( slotUpdatePenaltyTime () ) );
+	TQTimer::singleShot ( JABBER_PENALTY_TIME * 1000, this, TQ_SLOT ( slotUpdatePenaltyTime () ) );
 
 }
 
@@ -234,7 +234,7 @@ XMPP::S5BServer *JabberClient::s5bServer ()
 	if ( !d->s5bServer )
 	{
 		d->s5bServer = new XMPP::S5BServer ();
-		TQObject::connect ( d->s5bServer, TQT_SIGNAL ( destroyed () ), this, TQT_SLOT ( slotS5BServerGone () ) );
+		TQObject::connect ( d->s5bServer, TQ_SIGNAL ( destroyed () ), this, TQ_SLOT ( slotS5BServerGone () ) );
 
 		/*
 		 * Try to start the server at the default port here.
@@ -638,7 +638,7 @@ JabberClient::ErrorCode JabberClient::connect ( const XMPP::Jid &jid, const TQSt
 
 		{
 			using namespace XMPP;
-			TQObject::connect ( d->jabberTLSHandler, TQT_SIGNAL ( tlsHandshaken() ), this, TQT_SLOT ( slotTLSHandshaken () ) );
+			TQObject::connect ( d->jabberTLSHandler, TQ_SIGNAL ( tlsHandshaken() ), this, TQ_SLOT ( slotTLSHandshaken () ) );
 		}
 
 		TQPtrList<TQCA::Cert> certStore;
@@ -653,18 +653,18 @@ JabberClient::ErrorCode JabberClient::connect ( const XMPP::Jid &jid, const TQSt
 
 	{
 		using namespace XMPP;
-		TQObject::connect ( d->jabberClientStream, TQT_SIGNAL ( needAuthParams(bool, bool, bool) ),
-				   this, TQT_SLOT ( slotCSNeedAuthParams (bool, bool, bool) ) );
-		TQObject::connect ( d->jabberClientStream, TQT_SIGNAL ( authenticated () ),
-				   this, TQT_SLOT ( slotCSAuthenticated () ) );
-		TQObject::connect ( d->jabberClientStream, TQT_SIGNAL ( connectionClosed () ),
-				   this, TQT_SLOT ( slotCSDisconnected () ) );
-		TQObject::connect ( d->jabberClientStream, TQT_SIGNAL ( delayedCloseFinished () ),
-				   this, TQT_SLOT ( slotCSDisconnected () ) );
-		TQObject::connect ( d->jabberClientStream, TQT_SIGNAL ( warning (int) ),
-				   this, TQT_SLOT ( slotCSWarning (int) ) );
-		TQObject::connect ( d->jabberClientStream, TQT_SIGNAL ( error (int) ),
-				   this, TQT_SLOT ( slotCSError (int) ) );
+		TQObject::connect ( d->jabberClientStream, TQ_SIGNAL ( needAuthParams(bool, bool, bool) ),
+				   this, TQ_SLOT ( slotCSNeedAuthParams (bool, bool, bool) ) );
+		TQObject::connect ( d->jabberClientStream, TQ_SIGNAL ( authenticated () ),
+				   this, TQ_SLOT ( slotCSAuthenticated () ) );
+		TQObject::connect ( d->jabberClientStream, TQ_SIGNAL ( connectionClosed () ),
+				   this, TQ_SLOT ( slotCSDisconnected () ) );
+		TQObject::connect ( d->jabberClientStream, TQ_SIGNAL ( delayedCloseFinished () ),
+				   this, TQ_SLOT ( slotCSDisconnected () ) );
+		TQObject::connect ( d->jabberClientStream, TQ_SIGNAL ( warning (int) ),
+				   this, TQ_SLOT ( slotCSWarning (int) ) );
+		TQObject::connect ( d->jabberClientStream, TQ_SIGNAL ( error (int) ),
+				   this, TQ_SLOT ( slotCSError (int) ) );
 	}
 
 	d->jabberClientStream->setOldOnly ( useXMPP09 () );
@@ -694,8 +694,8 @@ JabberClient::ErrorCode JabberClient::connect ( const XMPP::Jid &jid, const TQSt
 
 		{
 			using namespace XMPP;
-			TQObject::connect ( d->jabberClient->fileTransferManager(), TQT_SIGNAL ( incomingReady() ),
-					   this, TQT_SLOT ( slotIncomingFileTransfer () ) );
+			TQObject::connect ( d->jabberClient->fileTransferManager(), TQ_SIGNAL ( incomingReady() ),
+					   this, TQ_SLOT ( slotIncomingFileTransfer () ) );
 		}
 	}
 
@@ -704,36 +704,36 @@ JabberClient::ErrorCode JabberClient::connect ( const XMPP::Jid &jid, const TQSt
 	 */
 	{
 		using namespace XMPP;
-		TQObject::connect ( d->jabberClient, TQT_SIGNAL ( subscription (const Jid &, const TQString &) ),
-				   this, TQT_SLOT ( slotSubscription (const Jid &, const TQString &) ) );
-		TQObject::connect ( d->jabberClient, TQT_SIGNAL ( rosterRequestFinished ( bool, int, const TQString & ) ),
-				   this, TQT_SLOT ( slotRosterRequestFinished ( bool, int, const TQString & ) ) );
-		TQObject::connect ( d->jabberClient, TQT_SIGNAL ( rosterItemAdded (const RosterItem &) ),
-				   this, TQT_SLOT ( slotNewContact (const RosterItem &) ) );
-		TQObject::connect ( d->jabberClient, TQT_SIGNAL ( rosterItemUpdated (const RosterItem &) ),
-				   this, TQT_SLOT ( slotContactUpdated (const RosterItem &) ) );
-		TQObject::connect ( d->jabberClient, TQT_SIGNAL ( rosterItemRemoved (const RosterItem &) ),
-				   this, TQT_SLOT ( slotContactDeleted (const RosterItem &) ) );
-		TQObject::connect ( d->jabberClient, TQT_SIGNAL ( resourceAvailable (const Jid &, const Resource &) ),
-				   this, TQT_SLOT ( slotResourceAvailable (const Jid &, const Resource &) ) );
-		TQObject::connect ( d->jabberClient, TQT_SIGNAL ( resourceUnavailable (const Jid &, const Resource &) ),
-				   this, TQT_SLOT ( slotResourceUnavailable (const Jid &, const Resource &) ) );
-		TQObject::connect ( d->jabberClient, TQT_SIGNAL ( messageReceived (const Message &) ),
-				   this, TQT_SLOT ( slotReceivedMessage (const Message &) ) );
-		TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatJoined (const Jid &) ),
-				   this, TQT_SLOT ( slotGroupChatJoined (const Jid &) ) );
-		TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatLeft (const Jid &) ),
-				   this, TQT_SLOT ( slotGroupChatLeft (const Jid &) ) );
-		TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatPresence (const Jid &, const Status &) ),
-				   this, TQT_SLOT ( slotGroupChatPresence (const Jid &, const Status &) ) );
-		TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatError (const Jid &, int, const TQString &) ),
-				   this, TQT_SLOT ( slotGroupChatError (const Jid &, int, const TQString &) ) );
-		//TQObject::connect ( d->jabberClient, TQT_SIGNAL (debugText (const TQString &) ),
-		//		   this, TQT_SLOT ( slotPsiDebug (const TQString &) ) );
-		TQObject::connect ( d->jabberClient, TQT_SIGNAL ( xmlIncoming(const TQString& ) ),
-				   this, TQT_SLOT ( slotIncomingXML (const TQString &) ) );
-		TQObject::connect ( d->jabberClient, TQT_SIGNAL ( xmlOutgoing(const TQString& ) ),
-				   this, TQT_SLOT ( slotOutgoingXML (const TQString &) ) );
+		TQObject::connect ( d->jabberClient, TQ_SIGNAL ( subscription (const Jid &, const TQString &) ),
+				   this, TQ_SLOT ( slotSubscription (const Jid &, const TQString &) ) );
+		TQObject::connect ( d->jabberClient, TQ_SIGNAL ( rosterRequestFinished ( bool, int, const TQString & ) ),
+				   this, TQ_SLOT ( slotRosterRequestFinished ( bool, int, const TQString & ) ) );
+		TQObject::connect ( d->jabberClient, TQ_SIGNAL ( rosterItemAdded (const RosterItem &) ),
+				   this, TQ_SLOT ( slotNewContact (const RosterItem &) ) );
+		TQObject::connect ( d->jabberClient, TQ_SIGNAL ( rosterItemUpdated (const RosterItem &) ),
+				   this, TQ_SLOT ( slotContactUpdated (const RosterItem &) ) );
+		TQObject::connect ( d->jabberClient, TQ_SIGNAL ( rosterItemRemoved (const RosterItem &) ),
+				   this, TQ_SLOT ( slotContactDeleted (const RosterItem &) ) );
+		TQObject::connect ( d->jabberClient, TQ_SIGNAL ( resourceAvailable (const Jid &, const Resource &) ),
+				   this, TQ_SLOT ( slotResourceAvailable (const Jid &, const Resource &) ) );
+		TQObject::connect ( d->jabberClient, TQ_SIGNAL ( resourceUnavailable (const Jid &, const Resource &) ),
+				   this, TQ_SLOT ( slotResourceUnavailable (const Jid &, const Resource &) ) );
+		TQObject::connect ( d->jabberClient, TQ_SIGNAL ( messageReceived (const Message &) ),
+				   this, TQ_SLOT ( slotReceivedMessage (const Message &) ) );
+		TQObject::connect ( d->jabberClient, TQ_SIGNAL ( groupChatJoined (const Jid &) ),
+				   this, TQ_SLOT ( slotGroupChatJoined (const Jid &) ) );
+		TQObject::connect ( d->jabberClient, TQ_SIGNAL ( groupChatLeft (const Jid &) ),
+				   this, TQ_SLOT ( slotGroupChatLeft (const Jid &) ) );
+		TQObject::connect ( d->jabberClient, TQ_SIGNAL ( groupChatPresence (const Jid &, const Status &) ),
+				   this, TQ_SLOT ( slotGroupChatPresence (const Jid &, const Status &) ) );
+		TQObject::connect ( d->jabberClient, TQ_SIGNAL ( groupChatError (const Jid &, int, const TQString &) ),
+				   this, TQ_SLOT ( slotGroupChatError (const Jid &, int, const TQString &) ) );
+		//TQObject::connect ( d->jabberClient, TQ_SIGNAL (debugText (const TQString &) ),
+		//		   this, TQ_SLOT ( slotPsiDebug (const TQString &) ) );
+		TQObject::connect ( d->jabberClient, TQ_SIGNAL ( xmlIncoming(const TQString& ) ),
+				   this, TQ_SLOT ( slotIncomingXML (const TQString &) ) );
+		TQObject::connect ( d->jabberClient, TQ_SIGNAL ( xmlOutgoing(const TQString& ) ),
+				   this, TQ_SLOT ( slotOutgoingXML (const TQString &) ) );
 	}
 
 	d->jabberClient->setClientName ( clientName () );
diff --git a/kopete/protocols/jabber/jabberconnector.cpp b/kopete/protocols/jabber/jabberconnector.cpp
index d08db42e..aa1e7921 100644
--- a/kopete/protocols/jabber/jabberconnector.cpp
+++ b/kopete/protocols/jabber/jabberconnector.cpp
@@ -32,9 +32,9 @@ JabberConnector::JabberConnector ( TQObject *parent, const char */*name*/ )
 	mByteStream = new JabberByteStream ( this );
 	mSrvResolver = new SrvResolver;
 
-	connect ( mByteStream, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) );
-	connect ( mByteStream, TQT_SIGNAL ( error ( int ) ), this, TQT_SLOT ( slotError ( int ) ) );
-	connect ( mSrvResolver, TQT_SIGNAL( resultsReady() ), this, TQT_SLOT( slotSrvLookup() ) );
+	connect ( mByteStream, TQ_SIGNAL ( connected () ), this, TQ_SLOT ( slotConnected () ) );
+	connect ( mByteStream, TQ_SIGNAL ( error ( int ) ), this, TQ_SLOT ( slotError ( int ) ) );
+	connect ( mSrvResolver, TQ_SIGNAL( resultsReady() ), this, TQ_SLOT( slotSrvLookup() ) );
 }
 
 JabberConnector::~JabberConnector ()
diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp
index 7d8035f9..79b09508 100644
--- a/kopete/protocols/jabber/jabbercontact.cpp
+++ b/kopete/protocols/jabber/jabbercontact.cpp
@@ -89,19 +89,19 @@ JabberContact::JabberContact (const XMPP::RosterItem &rosterItem, Kopete::Accoun
 	{
 		// this contact is a regular contact
 		connect ( this,
-				  TQT_SIGNAL ( onlineStatusChanged ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ),
-				  this, TQT_SLOT ( slotCheckVCard () ) );
+				  TQ_SIGNAL ( onlineStatusChanged ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ),
+				  this, TQ_SLOT ( slotCheckVCard () ) );
 	}
 	else
 	{
 		// this contact is the myself instance
 		connect ( account()->myself (),
-				  TQT_SIGNAL ( onlineStatusChanged ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ),
-				  this, TQT_SLOT ( slotCheckVCard () ) );
+				  TQ_SIGNAL ( onlineStatusChanged ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ),
+				  this, TQ_SLOT ( slotCheckVCard () ) );
 
 		connect ( account()->myself (),
-				  TQT_SIGNAL ( onlineStatusChanged ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ),
-				  this, TQT_SLOT ( slotCheckLastActivity ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) );
+				  TQ_SIGNAL ( onlineStatusChanged ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ),
+				  this, TQ_SLOT ( slotCheckLastActivity ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) );
 
 		/*
 		 * Trigger update once if we're already connected for contacts
@@ -137,34 +137,34 @@ TQPtrList<TDEAction> *JabberContact::customContextMenuActions ()
 	TDEAction *resendAuthAction, *requestAuthAction, *removeAuthAction;
 	
 	resendAuthAction = new TDEAction (i18n ("(Re)send Authorization To"), "mail-forward", 0,
-								 this, TQT_SLOT (slotSendAuth ()), actionAuthorization, "actionSendAuth");
+								 this, TQ_SLOT (slotSendAuth ()), actionAuthorization, "actionSendAuth");
 	resendAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::To || mRosterItem.subscription().type() == XMPP::Subscription::None );
 	actionAuthorization->insert(resendAuthAction);
 
 	requestAuthAction = new TDEAction (i18n ("(Re)request Authorization From"), "mail-reply-sender", 0,
-								 this, TQT_SLOT (slotRequestAuth ()), actionAuthorization, "actionRequestAuth");
+								 this, TQ_SLOT (slotRequestAuth ()), actionAuthorization, "actionRequestAuth");
 	requestAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::From || mRosterItem.subscription().type() == XMPP::Subscription::None );
 	actionAuthorization->insert(requestAuthAction);
 	
 	removeAuthAction = new TDEAction (i18n ("Remove Authorization From"), "mail_delete", 0,
-								 this, TQT_SLOT (slotRemoveAuth ()), actionAuthorization, "actionRemoveAuth");
+								 this, TQ_SLOT (slotRemoveAuth ()), actionAuthorization, "actionRemoveAuth");
 	removeAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::Both || mRosterItem.subscription().type() == XMPP::Subscription::From );
 	actionAuthorization->insert(removeAuthAction);
 
 	TDEActionMenu *actionSetAvailability = new TDEActionMenu (i18n ("Set Availability"), "kopeteavailable", this, "jabber_online");
 
 	actionSetAvailability->insert(new TDEAction (i18n ("Online"), protocol()->JabberKOSOnline.iconFor(this),
-								  0, this, TQT_SLOT (slotStatusOnline ()), actionSetAvailability, "actionOnline"));
+								  0, this, TQ_SLOT (slotStatusOnline ()), actionSetAvailability, "actionOnline"));
 	actionSetAvailability->insert(new TDEAction (i18n ("Free to Chat"), protocol()->JabberKOSChatty.iconFor(this),
-								  0, this, TQT_SLOT (slotStatusChatty ()), actionSetAvailability, "actionChatty"));
+								  0, this, TQ_SLOT (slotStatusChatty ()), actionSetAvailability, "actionChatty"));
 	actionSetAvailability->insert(new TDEAction (i18n ("Away"), protocol()->JabberKOSAway.iconFor(this),
-								  0, this, TQT_SLOT (slotStatusAway ()), actionSetAvailability, "actionAway"));
+								  0, this, TQ_SLOT (slotStatusAway ()), actionSetAvailability, "actionAway"));
 	actionSetAvailability->insert(new TDEAction (i18n ("Extended Away"), protocol()->JabberKOSXA.iconFor(this),
-								  0, this, TQT_SLOT (slotStatusXA ()), actionSetAvailability, "actionXA"));
+								  0, this, TQ_SLOT (slotStatusXA ()), actionSetAvailability, "actionXA"));
 	actionSetAvailability->insert(new TDEAction (i18n ("Do Not Disturb"), protocol()->JabberKOSDND.iconFor(this),
-								  0, this, TQT_SLOT (slotStatusDND ()), actionSetAvailability, "actionDND"));
+								  0, this, TQ_SLOT (slotStatusDND ()), actionSetAvailability, "actionDND"));
 	actionSetAvailability->insert(new TDEAction (i18n ("Invisible"), protocol()->JabberKOSInvisible.iconFor(this),
-								  0, this, TQT_SLOT (slotStatusInvisible ()), actionSetAvailability, "actionInvisible"));
+								  0, this, TQ_SLOT (slotStatusInvisible ()), actionSetAvailability, "actionInvisible"));
 
 	TDEActionMenu *actionSelectResource = new TDEActionMenu (i18n ("Select Resource"), "connect_no", this, "actionSelectResource");
 
@@ -203,7 +203,7 @@ TQPtrList<TDEAction> *JabberContact::customContextMenuActions ()
 		{
 			if( i == activeItem )
 			{
-				actionSelectResource->insert ( new TDEAction( ( *it ), "button_ok", 0, this, TQT_SLOT( slotSelectResource() ),
+				actionSelectResource->insert ( new TDEAction( ( *it ), "button_ok", 0, this, TQ_SLOT( slotSelectResource() ),
 											   actionSelectResource, TQString::number( i ).latin1() ) );
 			}
 			else
@@ -215,7 +215,7 @@ TQPtrList<TDEAction> *JabberContact::customContextMenuActions ()
 				TQIconSet iconSet ( !i ?
 					protocol()->resourceToKOS ( account()->resourcePool()->bestResource ( mRosterItem.jid(), false ) ).iconFor ( account () ) : protocol()->resourceToKOS ( *availableResources.find(*it) ).iconFor ( account () ));
 
-				actionSelectResource->insert ( new TDEAction( ( *it ), iconSet, 0, this, TQT_SLOT( slotSelectResource() ),
+				actionSelectResource->insert ( new TDEAction( ( *it ), iconSet, 0, this, TQ_SLOT( slotSelectResource() ),
 											   actionSelectResource, TQString::number( i ).latin1() ) );
 			}
 
@@ -230,7 +230,7 @@ TQPtrList<TDEAction> *JabberContact::customContextMenuActions ()
 	
 	
 #ifdef SUPPORT_JINGLE
-	TDEAction *actionVoiceCall = new TDEAction (i18n ("Voice call"), "voicecall", 0, this, TQT_SLOT (voiceCall ()), this, "jabber_voicecall");
+	TDEAction *actionVoiceCall = new TDEAction (i18n ("Voice call"), "voicecall", 0, this, TQ_SLOT (voiceCall ()), this, "jabber_voicecall");
 	actionVoiceCall->setEnabled( false );
 
 	actionCollection->append( actionVoiceCall );
@@ -431,7 +431,7 @@ void JabberContact::slotCheckVCard ()
 			mDiscoDone = true; //or it will happen twice, we don't want that.
 			//disco to see if it's not a transport
 			XMPP::JT_DiscoInfo *jt = new XMPP::JT_DiscoInfo(account()->client()->rootTask());
-			TQObject::connect(jt, TQT_SIGNAL(finished()),this, TQT_SLOT(slotDiscoFinished()));
+			TQObject::connect(jt, TQ_SIGNAL(finished()),this, TQ_SLOT(slotDiscoFinished()));
 			jt->get(rosterItem().jid(), TQString());
 			jt->go(true);
 		}
@@ -453,7 +453,7 @@ void JabberContact::slotCheckVCard ()
 		mVCardUpdateInProgress = true;
 
 		// current data is older than 24 hours, request a new one
-		TQTimer::singleShot ( account()->client()->getPenaltyTime () * 1000, this, TQT_SLOT ( slotGetTimedVCard () ) );
+		TQTimer::singleShot ( account()->client()->getPenaltyTime () * 1000, this, TQ_SLOT ( slotGetTimedVCard () ) );
 	}
 
 }
@@ -479,7 +479,7 @@ void JabberContact::slotGetTimedVCard ()
 		{
 			//disco to see if it's not a transport
 			XMPP::JT_DiscoInfo *jt = new XMPP::JT_DiscoInfo(account()->client()->rootTask());
-			TQObject::connect(jt, TQT_SIGNAL(finished()),this, TQT_SLOT(slotDiscoFinished()));
+			TQObject::connect(jt, TQ_SIGNAL(finished()),this, TQ_SLOT(slotDiscoFinished()));
 			jt->get(rosterItem().jid(), TQString());
 			jt->go(true);
 		}
@@ -492,7 +492,7 @@ void JabberContact::slotGetTimedVCard ()
 	// request vCard
 	XMPP::JT_VCard *task = new XMPP::JT_VCard ( account()->client()->rootTask () );
 	// signal to ourselves when the vCard data arrived
-	TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotGotVCard () ) );
+	TQObject::connect ( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( slotGotVCard () ) );
 	task->get ( mRosterItem.jid () );
 	task->go ( true );
 
@@ -551,7 +551,7 @@ void JabberContact::slotCheckLastActivity ( Kopete::Contact *, const Kopete::Onl
 	{
 		kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Scheduling request for last activity for " << mRosterItem.jid().bare () << endl;
 
-		TQTimer::singleShot ( account()->client()->getPenaltyTime () * 1000, this, TQT_SLOT ( slotGetTimedLastActivity () ) );
+		TQTimer::singleShot ( account()->client()->getPenaltyTime () * 1000, this, TQ_SLOT ( slotGetTimedLastActivity () ) );
 	}
 
 }
@@ -578,7 +578,7 @@ void JabberContact::slotGetTimedLastActivity ()
 		kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Requesting last activity from timer for " << mRosterItem.jid().bare () << endl;
 
 		XMPP::JT_GetLastActivity *task = new XMPP::JT_GetLastActivity ( account()->client()->rootTask () );
-		TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotGotLastActivity () ) );
+		TQObject::connect ( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( slotGotLastActivity () ) );
 		task->get ( mRosterItem.jid () );
 		task->go ( true );
 	}
@@ -717,7 +717,7 @@ void JabberContact::slotSendVCard()
 
 	XMPP::JT_VCard *task = new XMPP::JT_VCard (account()->client()->rootTask ());
 	// signal to ourselves when the vCard data arrived
-	TQObject::connect (task, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotSentVCard ()));
+	TQObject::connect (task, TQ_SIGNAL (finished ()), this, TQ_SLOT (slotSentVCard ()));
 	task->set (vCard);
 	task->go (true);
 }
@@ -826,7 +826,7 @@ JabberChatSession *JabberContact::manager ( Kopete::ContactPtrList chatMembers,
 		kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "No manager found, creating a new one with resource '" << jid.resource () << "'" << endl;
 
 		manager = new JabberChatSession ( protocol(), static_cast<JabberBaseContact *>(account()->myself()), chatMembers, jid.resource () );
-		connect ( manager, TQT_SIGNAL ( destroyed ( TQObject * ) ), this, TQT_SLOT ( slotChatSessionDeleted ( TQObject * ) ) );
+		connect ( manager, TQ_SIGNAL ( destroyed ( TQObject * ) ), this, TQ_SLOT ( slotChatSessionDeleted ( TQObject * ) ) );
 		mManagers.append ( manager );
 	}
 
@@ -880,7 +880,7 @@ JabberChatSession *JabberContact::manager ( const TQString &resource, Kopete::Co
 		JabberChatSession *manager = new JabberChatSession ( protocol(),
 																   static_cast<JabberBaseContact *>(account()->myself()),
 																   chatmembers, resource );
-		connect ( manager, TQT_SIGNAL ( destroyed ( TQObject * ) ), this, TQT_SLOT ( slotChatSessionDeleted ( TQObject * ) ) );
+		connect ( manager, TQ_SIGNAL ( destroyed ( TQObject * ) ), this, TQ_SLOT ( slotChatSessionDeleted ( TQObject * ) ) );
 		mManagers.append ( manager );
 
 		return manager;
@@ -955,7 +955,7 @@ void JabberContact::sync ( unsigned int )
 	if(!m_syncTimer)
 	{
 		m_syncTimer=new TQTimer(this);
-		connect(m_syncTimer, TQT_SIGNAL(timeout()) , this , TQT_SLOT(slotDelayedSync()));
+		connect(m_syncTimer, TQ_SIGNAL(timeout()) , this , TQ_SLOT(slotDelayedSync()));
 	}
 	m_syncTimer->start(2*1000,true);
 	/*
diff --git a/kopete/protocols/jabber/jabbercontactpool.cpp b/kopete/protocols/jabber/jabbercontactpool.cpp
index 2d580957..16463c8c 100644
--- a/kopete/protocols/jabber/jabbercontactpool.cpp
+++ b/kopete/protocols/jabber/jabbercontactpool.cpp
@@ -102,7 +102,7 @@ JabberContact *JabberContactPool::addContact ( const XMPP::RosterItem &contact,
 	// create new contact instance and add it to the dictionary
 	JabberContact *newContact = new JabberContact ( contact, transport ? (Kopete::Account*)transport : (Kopete::Account*)mAccount, metaContact , legacyId );
 	JabberContactPoolItem *newContactItem = new JabberContactPoolItem ( newContact );
-	connect ( newContact, TQT_SIGNAL ( contactDestroyed ( Kopete::Contact * ) ), this, TQT_SLOT ( slotContactDestroyed ( Kopete::Contact * ) ) );
+	connect ( newContact, TQ_SIGNAL ( contactDestroyed ( Kopete::Contact * ) ), this, TQ_SLOT ( slotContactDestroyed ( Kopete::Contact * ) ) );
 	newContactItem->setDirty ( dirty );
 	mPool.append ( newContactItem );
 
@@ -161,7 +161,7 @@ JabberBaseContact *JabberContactPool::addGroupContact ( const XMPP::RosterItem &
 
 	JabberContactPoolItem *newContactItem = new JabberContactPoolItem ( newContact );
 
-	connect ( newContact, TQT_SIGNAL ( contactDestroyed ( Kopete::Contact * ) ), this, TQT_SLOT ( slotContactDestroyed ( Kopete::Contact * ) ) );
+	connect ( newContact, TQ_SIGNAL ( contactDestroyed ( Kopete::Contact * ) ), this, TQ_SLOT ( slotContactDestroyed ( Kopete::Contact * ) ) );
 
 	newContactItem->setDirty ( dirty );
 	mPool.append ( newContactItem );
diff --git a/kopete/protocols/jabber/jabberfiletransfer.cpp b/kopete/protocols/jabber/jabberfiletransfer.cpp
index c172b30f..f8303855 100644
--- a/kopete/protocols/jabber/jabberfiletransfer.cpp
+++ b/kopete/protocols/jabber/jabberfiletransfer.cpp
@@ -62,10 +62,10 @@ JabberFileTransfer::JabberFileTransfer ( JabberAccount *account, XMPP::FileTrans
 		Kopete::ContactList::self ()->addMetaContact ( metaContact );
 	}
 
-	connect ( Kopete::TransferManager::transferManager (), TQT_SIGNAL ( accepted ( Kopete::Transfer *, const TQString & ) ),
-			  this, TQT_SLOT ( slotIncomingTransferAccepted ( Kopete::Transfer *, const TQString & ) ) );
-	connect ( Kopete::TransferManager::transferManager (), TQT_SIGNAL ( refused ( const Kopete::FileTransferInfo & ) ),
-			  this, TQT_SLOT ( slotTransferRefused ( const Kopete::FileTransferInfo & ) ) );
+	connect ( Kopete::TransferManager::transferManager (), TQ_SIGNAL ( accepted ( Kopete::Transfer *, const TQString & ) ),
+			  this, TQ_SLOT ( slotIncomingTransferAccepted ( Kopete::Transfer *, const TQString & ) ) );
+	connect ( Kopete::TransferManager::transferManager (), TQ_SIGNAL ( refused ( const Kopete::FileTransferInfo & ) ),
+			  this, TQ_SLOT ( slotTransferRefused ( const Kopete::FileTransferInfo & ) ) );
 
 	initializeVariables ();
 
@@ -90,15 +90,15 @@ JabberFileTransfer::JabberFileTransfer ( JabberAccount *account, JabberBaseConta
 																			  contact->contactId (),
 																			  Kopete::FileTransferInfo::Outgoing );
 
- 	connect ( mKopeteTransfer, TQT_SIGNAL ( result ( TDEIO::Job * ) ), this, TQT_SLOT ( slotTransferResult () ) );
+ 	connect ( mKopeteTransfer, TQ_SIGNAL ( result ( TDEIO::Job * ) ), this, TQ_SLOT ( slotTransferResult () ) );
 
 	mXMPPTransfer = mAccount->client()->fileTransferManager()->createTransfer ();
 
 	initializeVariables ();
 
-	connect ( mXMPPTransfer, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotOutgoingConnected () ) );
-	connect ( mXMPPTransfer, TQT_SIGNAL ( bytesWritten ( int ) ), this, TQT_SLOT ( slotOutgoingBytesWritten ( int ) ) );
-	connect ( mXMPPTransfer, TQT_SIGNAL ( error ( int ) ), this, TQT_SLOT ( slotTransferError ( int ) ) );
+	connect ( mXMPPTransfer, TQ_SIGNAL ( connected () ), this, TQ_SLOT ( slotOutgoingConnected () ) );
+	connect ( mXMPPTransfer, TQ_SIGNAL ( bytesWritten ( int ) ), this, TQ_SLOT ( slotOutgoingBytesWritten ( int ) ) );
+	connect ( mXMPPTransfer, TQ_SIGNAL ( error ( int ) ), this, TQ_SLOT ( slotTransferError ( int ) ) );
 
 	mXMPPTransfer->sendFile ( XMPP::Jid ( contact->fullAddress () ), KURL(file).fileName (), mLocalFile.size (), "" );
 
@@ -188,9 +188,9 @@ void JabberFileTransfer::slotIncomingTransferAccepted ( Kopete::Transfer *transf
 	}
 	else
 	{
-		connect ( mKopeteTransfer, TQT_SIGNAL ( result ( TDEIO::Job * ) ), this, TQT_SLOT ( slotTransferResult () ) );
-		connect ( mXMPPTransfer, TQT_SIGNAL ( readyRead ( const TQByteArray& ) ), this, TQT_SLOT ( slotIncomingDataReady ( const TQByteArray & ) ) );
-		connect ( mXMPPTransfer, TQT_SIGNAL ( error ( int ) ), this, TQT_SLOT ( slotTransferError ( int ) ) );
+		connect ( mKopeteTransfer, TQ_SIGNAL ( result ( TDEIO::Job * ) ), this, TQ_SLOT ( slotTransferResult () ) );
+		connect ( mXMPPTransfer, TQ_SIGNAL ( readyRead ( const TQByteArray& ) ), this, TQ_SLOT ( slotIncomingDataReady ( const TQByteArray & ) ) );
+		connect ( mXMPPTransfer, TQ_SIGNAL ( error ( int ) ), this, TQ_SLOT ( slotTransferError ( int ) ) );
 		mXMPPTransfer->accept ( offset, length );
 	}
 
diff --git a/kopete/protocols/jabber/jabberformtranslator.cpp b/kopete/protocols/jabber/jabberformtranslator.cpp
index 3344f802..4d88fb17 100644
--- a/kopete/protocols/jabber/jabberformtranslator.cpp
+++ b/kopete/protocols/jabber/jabberformtranslator.cpp
@@ -67,7 +67,7 @@ JabberFormTranslator::JabberFormTranslator (const XMPP::Form & form, TQWidget *
 		formLayout->addWidget (edit, row, 1);
 		edit->show ();
 
-		connect (this, TQT_SIGNAL (gatherData (XMPP::Form &)), edit, TQT_SLOT (slotGatherData (XMPP::Form &)));
+		connect (this, TQ_SIGNAL (gatherData (XMPP::Form &)), edit, TQ_SLOT (slotGatherData (XMPP::Form &)));
 	}
 
 	innerLayout->addStretch ();
diff --git a/kopete/protocols/jabber/jabbergroupchatmanager.cpp b/kopete/protocols/jabber/jabbergroupchatmanager.cpp
index 3687f835..e15d01b3 100644
--- a/kopete/protocols/jabber/jabbergroupchatmanager.cpp
+++ b/kopete/protocols/jabber/jabbergroupchatmanager.cpp
@@ -40,8 +40,8 @@ JabberGroupChatManager::JabberGroupChatManager ( JabberProtocol *protocol, const
 	// make sure Kopete knows about this instance
 	Kopete::ChatSessionManager::self()->registerChatSession ( this );
 
-	connect ( this, TQT_SIGNAL ( messageSent ( Kopete::Message &, Kopete::ChatSession * ) ),
-			  this, TQT_SLOT ( slotMessageSent ( Kopete::Message &, Kopete::ChatSession * ) ) );
+	connect ( this, TQ_SIGNAL ( messageSent ( Kopete::Message &, Kopete::ChatSession * ) ),
+			  this, TQ_SLOT ( slotMessageSent ( Kopete::Message &, Kopete::ChatSession * ) ) );
 
 	updateDisplayName ();
 }
diff --git a/kopete/protocols/jabber/jabbergroupcontact.cpp b/kopete/protocols/jabber/jabbergroupcontact.cpp
index fde5e300..9aa068eb 100644
--- a/kopete/protocols/jabber/jabbergroupcontact.cpp
+++ b/kopete/protocols/jabber/jabbergroupcontact.cpp
@@ -58,10 +58,10 @@ JabberGroupContact::JabberGroupContact (const XMPP::RosterItem &rosterItem, Jabb
 	mManager = new JabberGroupChatManager ( protocol (), mSelfContact,
 											Kopete::ContactPtrList (), XMPP::Jid ( rosterItem.jid().userHost () ) );
 
-	connect ( mManager, TQT_SIGNAL ( closing ( Kopete::ChatSession* ) ), this, TQT_SLOT ( slotChatSessionDeleted () ) );
+	connect ( mManager, TQ_SIGNAL ( closing ( Kopete::ChatSession* ) ), this, TQ_SLOT ( slotChatSessionDeleted () ) );
 	
-	connect ( account->myself() , TQT_SIGNAL(onlineStatusChanged( Kopete::Contact*, const Kopete::OnlineStatus&, const Kopete::OnlineStatus& ) ) ,
-			  this , TQT_SLOT(slotStatusChanged()  ) ) ;
+	connect ( account->myself() , TQ_SIGNAL(onlineStatusChanged( Kopete::Contact*, const Kopete::OnlineStatus&, const Kopete::OnlineStatus& ) ) ,
+			  this , TQ_SLOT(slotStatusChanged()  ) ) ;
 
 	/**
 	 * FIXME: The first contact in the list of the message manager
@@ -113,7 +113,7 @@ TQPtrList<TDEAction> *JabberGroupContact::customContextMenuActions ()
 {
 	TQPtrList<TDEAction> *actionCollection = new TQPtrList<TDEAction>();
 
-	TDEAction *actionSetNick = new TDEAction (i18n ("Change nick name"), 0, 0, this, TQT_SLOT (slotChangeNick()), this, "jabber_changenick");
+	TDEAction *actionSetNick = new TDEAction (i18n ("Change nick name"), 0, 0, this, TQ_SLOT (slotChangeNick()), this, "jabber_changenick");
 	actionCollection->append( actionSetNick );
 
 	return actionCollection;
@@ -129,7 +129,7 @@ Kopete::ChatSession *JabberGroupContact::manager ( Kopete::Contact::CanCreateFla
 
 		mManager->addContact ( this );
 		
-		connect ( mManager, TQT_SIGNAL ( closing ( Kopete::ChatSession* ) ), this, TQT_SLOT ( slotChatSessionDeleted () ) );
+		connect ( mManager, TQ_SIGNAL ( closing ( Kopete::ChatSession* ) ), this, TQ_SLOT ( slotChatSessionDeleted () ) );
 		
 		//if we have to recreate the manager, we probably have to connect again to the chat.
 		slotStatusChanged();
@@ -238,7 +238,7 @@ JabberBaseContact *JabberGroupContact::addSubContact ( const XMPP::RosterItem &r
 	// now, add the contact also to our own list
 	mContactList.append ( subContact );
 	
-	connect(subContact , TQT_SIGNAL(contactDestroyed(Kopete::Contact*)) , this , TQT_SLOT(slotSubContactDestroyed(Kopete::Contact*)));
+	connect(subContact , TQ_SIGNAL(contactDestroyed(Kopete::Contact*)) , this , TQ_SLOT(slotSubContactDestroyed(Kopete::Contact*)));
 
 	return subContact;
 
diff --git a/kopete/protocols/jabber/jabbergroupmembercontact.cpp b/kopete/protocols/jabber/jabbergroupmembercontact.cpp
index 35b06c09..66b4d229 100644
--- a/kopete/protocols/jabber/jabbergroupmembercontact.cpp
+++ b/kopete/protocols/jabber/jabbergroupmembercontact.cpp
@@ -80,7 +80,7 @@ Kopete::ChatSession *JabberGroupMemberContact::manager ( Kopete::Contact::CanCre
 	 *        the global myself() instance for a correct representation.
 	 */
 	mManager = new JabberChatSession ( protocol(), static_cast<JabberBaseContact *>(account()->myself()), chatMembers );
-	connect ( mManager, TQT_SIGNAL ( destroyed ( TQObject * ) ), this, TQT_SLOT ( slotChatSessionDeleted () ) );
+	connect ( mManager, TQ_SIGNAL ( destroyed ( TQObject * ) ), this, TQ_SLOT ( slotChatSessionDeleted () ) );
 
 	return mManager;
 
diff --git a/kopete/protocols/jabber/jabberresource.cpp b/kopete/protocols/jabber/jabberresource.cpp
index a971e1c8..f351e30e 100644
--- a/kopete/protocols/jabber/jabberresource.cpp
+++ b/kopete/protocols/jabber/jabberresource.cpp
@@ -59,10 +59,10 @@ JabberResource::JabberResource ( JabberAccount *account, const XMPP::Jid &jid, c
 
 	if ( account->isConnected () )
 	{
-		TQTimer::singleShot ( account->client()->getPenaltyTime () * 1000, this, TQT_SLOT ( slotGetTimedClientVersion () ) );
+		TQTimer::singleShot ( account->client()->getPenaltyTime () * 1000, this, TQ_SLOT ( slotGetTimedClientVersion () ) );
 		if(!d->capsEnabled)
 		{
-			TQTimer::singleShot ( account->client()->getPenaltyTime () * 1000, this, TQT_SLOT ( slotGetDiscoCapabilties () ) );
+			TQTimer::singleShot ( account->client()->getPenaltyTime () * 1000, this, TQ_SLOT ( slotGetDiscoCapabilties () ) );
 		}
 	}
 }
@@ -123,7 +123,7 @@ void JabberResource::slotGetTimedClientVersion ()
 		// request client version
 		XMPP::JT_ClientVersion *task = new XMPP::JT_ClientVersion ( d->account->client()->rootTask () );
 		// signal to ourselves when the vCard data arrived
-		TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotGotClientVersion () ) );
+		TQObject::connect ( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( slotGotClientVersion () ) );
 		task->get ( d->jid );
 		task->go ( true );
 	}
@@ -150,7 +150,7 @@ void JabberResource:: slotGetDiscoCapabilties ()
 
 		XMPP:: JT_DiscoInfo *task = new XMPP::JT_DiscoInfo ( d->account->client()->rootTask () );
 		// Retrive features when service discovery is done.
-		TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT (slotGotDiscoCapabilities () ) );
+		TQObject::connect ( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT (slotGotDiscoCapabilities () ) );
 		task->get ( d->jid);
 		task->go ( true );
 	}
diff --git a/kopete/protocols/jabber/jabberresourcepool.cpp b/kopete/protocols/jabber/jabberresourcepool.cpp
index 19492790..cbe91f1e 100644
--- a/kopete/protocols/jabber/jabberresourcepool.cpp
+++ b/kopete/protocols/jabber/jabberresourcepool.cpp
@@ -133,8 +133,8 @@ void JabberResourcePool::addResource ( const XMPP::Jid &jid, const XMPP::Resourc
 
 	// create new resource instance and add it to the dictionary
 	JabberResource *newResource = new JabberResource(d->account, jid, resource);
-	connect ( newResource, TQT_SIGNAL ( destroyed (TQObject *) ), this, TQT_SLOT ( slotResourceDestroyed (TQObject *) ) );
-	connect ( newResource, TQT_SIGNAL ( updated (JabberResource *) ), this, TQT_SLOT ( slotResourceUpdated (JabberResource *) ) );
+	connect ( newResource, TQ_SIGNAL ( destroyed (TQObject *) ), this, TQ_SLOT ( slotResourceDestroyed (TQObject *) ) );
+	connect ( newResource, TQ_SIGNAL ( updated (JabberResource *) ), this, TQ_SLOT ( slotResourceUpdated (JabberResource *) ) );
 	d->pool.append ( newResource );
 
 	// send notifications out to the relevant contacts that
diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp
index 6c1d0411..e57363d0 100644
--- a/kopete/protocols/jabber/jabbertransport.cpp
+++ b/kopete/protocols/jabber/jabbertransport.cpp
@@ -83,7 +83,7 @@ JabberTransport::JabberTransport (JabberAccount * parentAccount, const XMPP::Ros
 
 	configGroup()->writeEntry("GatewayJID" , item.jid().full() );
 
-	TQTimer::singleShot(0, this, TQT_SLOT(eatContacts()));
+	TQTimer::singleShot(0, this, TQ_SLOT(eatContacts()));
 	
 	m_status=Normal;
 }
@@ -147,18 +147,18 @@ TDEActionMenu *JabberTransport::actionMenu ()
 	m_actionMenu->popupMenu()->insertSeparator();
 
 	m_actionMenu->insert(new TDEAction (i18n ("Join Groupchat..."), "jabber_group", 0,
-		this, TQT_SLOT (slotJoinNewChat ()), this, "actionJoinChat"));
+		this, TQ_SLOT (slotJoinNewChat ()), this, "actionJoinChat"));
 
 	m_actionMenu->popupMenu()->insertSeparator();
 
 	m_actionMenu->insert ( new TDEAction ( i18n ("Services..."), "jabber_serv_on", 0,
-										 this, TQT_SLOT ( slotGetServices () ), this, "actionJabberServices") );
+										 this, TQ_SLOT ( slotGetServices () ), this, "actionJabberServices") );
 
 	m_actionMenu->insert ( new TDEAction ( i18n ("Send Raw Packet to Server..."), "mail-message-new", 0,
-										 this, TQT_SLOT ( slotSendRaw () ), this, "actionJabberSendRaw") );
+										 this, TQ_SLOT ( slotSendRaw () ), this, "actionJabberSendRaw") );
 
 	m_actionMenu->insert ( new TDEAction ( i18n ("Edit User Info..."), "identity", 0,
-										 this, TQT_SLOT ( slotEditVCard () ), this, "actionEditVCard") );
+										 this, TQ_SLOT ( slotEditVCard () ), this, "actionEditVCard") );
 
 	return m_actionMenu;*/
 }
@@ -263,7 +263,7 @@ bool JabberTransport::removeAccount( )
 	
 	m_status = Removing;
 	XMPP::JT_Register *task = new XMPP::JT_Register ( m_account->client()->rootTask () );
-	TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( removeAllContacts() ) );
+	TQObject::connect ( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( removeAllContacts() ) );
 
 	//JabberContact *my=static_cast<JabberContact*>(myself());
 	task->unreg ( myself()->contactId() );
diff --git a/kopete/protocols/jabber/jingle/DESIGN b/kopete/protocols/jabber/jingle/DESIGN
index 3a3a9636..bfd1cd6c 100644
--- a/kopete/protocols/jabber/jingle/DESIGN
+++ b/kopete/protocols/jabber/jingle/DESIGN
@@ -102,7 +102,7 @@ JingleVoiceSession : public JingleSession
 Define a VoIP voice session between two peers(for the moment).
 Hold the PhoneSessionClient object.
 
-connect(account()->client(),SIGNAL(xmlIncoming(const TQString&)),SLOT(receiveStanza(const TQString&)));
+connect(account()->client(),TQ_SIGNAL(xmlIncoming(const TQString&)),TQ_SLOT(receiveStanza(const TQString&)));
 
 
 private Q_SLOTS:
diff --git a/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp b/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp
index c9979411..66470f09 100644
--- a/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp
+++ b/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp
@@ -108,7 +108,7 @@ JingleSessionManager::JingleSessionManager(JabberAccount *account)
 
 	// Create watch incoming session task.
 	d->watchSessionTask = new JingleWatchSessionTask(account->client()->rootTask());
-	connect(d->watchSessionTask, TQT_SIGNAL(watchSession(const TQString &, const TQString &)), this, TQT_SLOT(slotIncomingSession(const TQString &, const TQString &)));
+	connect(d->watchSessionTask, TQ_SIGNAL(watchSession(const TQString &, const TQString &)), this, TQ_SLOT(slotIncomingSession(const TQString &, const TQString &)));
 
 	// Create global cricket variables common to all sessions.
 	// Seed random generation with the JID of the account.
diff --git a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp
index e25c7c3c..cc417279 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp
+++ b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp
@@ -233,7 +233,7 @@ void JingleVoiceCaller::initialize()
 	new JingleITQResponder(account()->client()->rootTask());
 
 	// Listen to incoming packets
-	connect(account()->client()->client(),TQT_SIGNAL(xmlIncoming(const TQString&)),TQT_SLOT(receiveStanza(const TQString&)));
+	connect(account()->client()->client(),TQ_SIGNAL(xmlIncoming(const TQString&)),TQ_SLOT(receiveStanza(const TQString&)));
 
 	initialized_ = true;
 }
@@ -245,7 +245,7 @@ void JingleVoiceCaller::deinitialize()
 		return;
 
 	// Stop listening to incoming packets
-	disconnect(account()->client(),TQT_SIGNAL(xmlIncoming(const TQString&)),this,TQT_SLOT(receiveStanza(const TQString&)));
+	disconnect(account()->client(),TQ_SIGNAL(xmlIncoming(const TQString&)),this,TQ_SLOT(receiveStanza(const TQString&)));
 
 	// Disconnect signals (is this needed)
 	//phone_client_->SignalCallCreate.disconnect(slots_);
diff --git a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp
index 8a6331d6..a27aac10 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp
+++ b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp
@@ -224,7 +224,7 @@ JingleVoiceSession::JingleVoiceSession(JabberAccount *account, const JidList &pe
 	d->phoneSessionClient->SignalCallCreate.connect(slotsProxy, &JingleVoiceSession::SlotsProxy::OnCallCreated);
 
 	// Listen to incoming packets
-	connect(account->client()->client(), TQT_SIGNAL(xmlIncoming(const TQString&)), this, TQT_SLOT(receiveStanza(const TQString&)));
+	connect(account->client()->client(), TQ_SIGNAL(xmlIncoming(const TQString&)), this, TQ_SLOT(receiveStanza(const TQString&)));
 
 	new JingleITQResponder(account->client()->rootTask());
 }
diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp
index dc2b2c8d..8a55c499 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp
+++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp
@@ -46,21 +46,21 @@ JingleVoiceSessionDialog::JingleVoiceSessionDialog(const Jid &peerJid, VoiceCall
 	TQString contactJid = m_peerJid.full();
 	setCaption( i18n("Voice session with %1").arg(contactJid) );
 
-	connect(buttonAccept, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAcceptClicked()));
-	connect(buttonDecline, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeclineClicked()));
-	connect(buttonTerminate, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotTerminateClicked()));
+	connect(buttonAccept, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAcceptClicked()));
+	connect(buttonDecline, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeclineClicked()));
+	connect(buttonTerminate, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotTerminateClicked()));
 
 // NOTE: Disabled for 0.12
 #if 0
-	connect(m_session, TQT_SIGNAL(sessionStarted()), this, TQT_SLOT(sessionStarted()));
-	connect(m_session, TQT_SIGNAL(accepted()), this, TQT_SLOT(sessionAccepted()));
-	connect(m_session, TQT_SIGNAL(declined()), this, TQT_SLOT(sessionDeclined()));
-	connect(m_session, TQT_SIGNAL(terminated()), this, TQT_SLOT(sessionTerminated()));
+	connect(m_session, TQ_SIGNAL(sessionStarted()), this, TQ_SLOT(sessionStarted()));
+	connect(m_session, TQ_SIGNAL(accepted()), this, TQ_SLOT(sessionAccepted()));
+	connect(m_session, TQ_SIGNAL(declined()), this, TQ_SLOT(sessionDeclined()));
+	connect(m_session, TQ_SIGNAL(terminated()), this, TQ_SLOT(sessionTerminated()));
 #endif
-	connect(m_session, TQT_SIGNAL(accepted( const Jid & )), this, TQT_SLOT( sessionAccepted(const Jid &) ));
-	connect(m_session, TQT_SIGNAL(in_progress( const Jid & )), this, TQT_SLOT( sessionStarted(const Jid &) ));
-	connect(m_session, TQT_SIGNAL(rejected( const Jid& )), this, TQT_SLOT( sessionDeclined(const Jid &) ));
-	connect(m_session, TQT_SIGNAL(terminated( const Jid& )), this, TQT_SLOT( sessionTerminated(const Jid &) ));
+	connect(m_session, TQ_SIGNAL(accepted( const Jid & )), this, TQ_SLOT( sessionAccepted(const Jid &) ));
+	connect(m_session, TQ_SIGNAL(in_progress( const Jid & )), this, TQ_SLOT( sessionStarted(const Jid &) ));
+	connect(m_session, TQ_SIGNAL(rejected( const Jid& )), this, TQ_SLOT( sessionDeclined(const Jid &) ));
+	connect(m_session, TQ_SIGNAL(terminated( const Jid& )), this, TQ_SLOT( sessionTerminated(const Jid &) ));
 
 	// Find JabberContact for the peer and fill this dialog with contact information.
 	JabberContact *peerContact = static_cast<JabberContact*>( m_session->account()->contactPool()->findRelevantRecipient( m_peerJid ) );
@@ -199,10 +199,10 @@ void JingleVoiceSessionDialog::reject()
 
 void JingleVoiceSessionDialog::finalize()
 {
-	disconnect(m_session, TQT_SIGNAL(accepted( const Jid & )), this, TQT_SLOT( sessionAccepted(const Jid &) ));
-	disconnect(m_session, TQT_SIGNAL(in_progress( const Jid & )), this, TQT_SLOT( sessionStarted(const Jid &) ));
-	disconnect(m_session, TQT_SIGNAL(rejected( const Jid& )), this, TQT_SLOT( sessionDeclined(const Jid &) ));
-	disconnect(m_session, TQT_SIGNAL(terminated( const Jid& )), this, TQT_SLOT( sessionTerminated(const Jid &) ));
+	disconnect(m_session, TQ_SIGNAL(accepted( const Jid & )), this, TQ_SLOT( sessionAccepted(const Jid &) ));
+	disconnect(m_session, TQ_SIGNAL(in_progress( const Jid & )), this, TQ_SLOT( sessionStarted(const Jid &) ));
+	disconnect(m_session, TQ_SIGNAL(rejected( const Jid& )), this, TQ_SLOT( sessionDeclined(const Jid &) ));
+	disconnect(m_session, TQ_SIGNAL(terminated( const Jid& )), this, TQ_SLOT( sessionTerminated(const Jid &) ));
 }
 
 #include "jinglevoicesessiondialog.moc"
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp
index cabd62b3..96843678 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp
@@ -63,9 +63,9 @@ BSocket::BSocket(TQObject *parent)
 {
 	d = new Private;
 #ifndef NO_NDNS
-	connect(&d->ndns, TQT_SIGNAL(resultsReady()), TQT_SLOT(ndns_done()));
+	connect(&d->ndns, TQ_SIGNAL(resultsReady()), TQ_SLOT(ndns_done()));
 #endif
-	connect(&d->srv, TQT_SIGNAL(resultsReady()), TQT_SLOT(srv_done()));
+	connect(&d->srv, TQ_SIGNAL(resultsReady()), TQ_SLOT(srv_done()));
 
 	reset();
 }
@@ -110,13 +110,13 @@ void BSocket::ensureSocket()
 	if(!d->qsock) {
 		d->qsock = new TQSocket;
 		d->qsock->setReadBufferSize(READBUFSIZE);
-		connect(d->qsock, TQT_SIGNAL(hostFound()), TQT_SLOT(qs_hostFound()));
-		connect(d->qsock, TQT_SIGNAL(connected()), TQT_SLOT(qs_connected()));
-		connect(d->qsock, TQT_SIGNAL(connectionClosed()), TQT_SLOT(qs_connectionClosed()));
-		connect(d->qsock, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(qs_delayedCloseFinished()));
-		connect(d->qsock, TQT_SIGNAL(readyRead()), TQT_SLOT(qs_readyRead()));
-		connect(d->qsock, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(qs_bytesWritten(int)));
-		connect(d->qsock, TQT_SIGNAL(error(int)), TQT_SLOT(qs_error(int)));
+		connect(d->qsock, TQ_SIGNAL(hostFound()), TQ_SLOT(qs_hostFound()));
+		connect(d->qsock, TQ_SIGNAL(connected()), TQ_SLOT(qs_connected()));
+		connect(d->qsock, TQ_SIGNAL(connectionClosed()), TQ_SLOT(qs_connectionClosed()));
+		connect(d->qsock, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(qs_delayedCloseFinished()));
+		connect(d->qsock, TQ_SIGNAL(readyRead()), TQ_SLOT(qs_readyRead()));
+		connect(d->qsock, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(qs_bytesWritten(int)));
+		connect(d->qsock, TQ_SIGNAL(error(int)), TQ_SLOT(qs_error(int)));
 	}
 }
 
@@ -283,7 +283,7 @@ void BSocket::srv_done()
 	d->host = d->srv.resultAddress().toString();
 	d->port = d->srv.resultPort();
 	do_connect();
-	//TQTimer::singleShot(0, this, TQT_SLOT(do_connect()));
+	//TQTimer::singleShot(0, this, TQ_SLOT(do_connect()));
 	//hostFound();
 }
 
@@ -294,7 +294,7 @@ void BSocket::ndns_done()
 		d->host = d->ndns.resultString();
 		d->state = Connecting;
 		do_connect();
-		//TQTimer::singleShot(0, this, TQT_SLOT(do_connect()));
+		//TQTimer::singleShot(0, this, TQ_SLOT(do_connect()));
 		//hostFound();
 	}
 	else {
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp
index e9cc5781..3c6273d6 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp
@@ -100,12 +100,12 @@ HttpConnect::HttpConnect(TQObject *parent)
 :ByteStream(parent)
 {
 	d = new Private;
-	connect(&d->sock, TQT_SIGNAL(connected()), TQT_SLOT(sock_connected()));
-	connect(&d->sock, TQT_SIGNAL(connectionClosed()), TQT_SLOT(sock_connectionClosed()));
-	connect(&d->sock, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(sock_delayedCloseFinished()));
-	connect(&d->sock, TQT_SIGNAL(readyRead()), TQT_SLOT(sock_readyRead()));
-	connect(&d->sock, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(sock_bytesWritten(int)));
-	connect(&d->sock, TQT_SIGNAL(error(int)), TQT_SLOT(sock_error(int)));
+	connect(&d->sock, TQ_SIGNAL(connected()), TQ_SLOT(sock_connected()));
+	connect(&d->sock, TQ_SIGNAL(connectionClosed()), TQ_SLOT(sock_connectionClosed()));
+	connect(&d->sock, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(sock_delayedCloseFinished()));
+	connect(&d->sock, TQ_SIGNAL(readyRead()), TQ_SLOT(sock_readyRead()));
+	connect(&d->sock, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(sock_bytesWritten(int)));
+	connect(&d->sock, TQ_SIGNAL(error(int)), TQ_SLOT(sock_error(int)));
 
 	reset(true);
 }
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
index ed211ac5..c5192472 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
@@ -89,10 +89,10 @@ HttpPoll::HttpPoll(TQObject *parent)
 
 	d->polltime = 30;
 	d->t = new TQTimer;
-	connect(d->t, TQT_SIGNAL(timeout()), TQT_SLOT(do_sync()));
+	connect(d->t, TQ_SIGNAL(timeout()), TQ_SLOT(do_sync()));
 
-	connect(&d->http, TQT_SIGNAL(result()), TQT_SLOT(http_result()));
-	connect(&d->http, TQT_SIGNAL(error(int)), TQT_SLOT(http_error(int)));
+	connect(&d->http, TQ_SIGNAL(result()), TQ_SLOT(http_result()));
+	connect(&d->http, TQ_SIGNAL(error(int)), TQ_SLOT(http_error(int)));
 
 	reset(true);
 }
@@ -442,10 +442,10 @@ HttpProxyPost::HttpProxyPost(TQObject *parent)
 :TQObject(parent)
 {
 	d = new Private;
-	connect(&d->sock, TQT_SIGNAL(connected()), TQT_SLOT(sock_connected()));
-	connect(&d->sock, TQT_SIGNAL(connectionClosed()), TQT_SLOT(sock_connectionClosed()));
-	connect(&d->sock, TQT_SIGNAL(readyRead()), TQT_SLOT(sock_readyRead()));
-	connect(&d->sock, TQT_SIGNAL(error(int)), TQT_SLOT(sock_error(int)));
+	connect(&d->sock, TQ_SIGNAL(connected()), TQ_SLOT(sock_connected()));
+	connect(&d->sock, TQ_SIGNAL(connectionClosed()), TQ_SLOT(sock_connectionClosed()));
+	connect(&d->sock, TQ_SIGNAL(readyRead()), TQ_SLOT(sock_readyRead()));
+	connect(&d->sock, TQ_SIGNAL(error(int)), TQ_SLOT(sock_error(int)));
 	reset(true);
 }
 
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp
index d36b1fd0..e3527855 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp
@@ -157,7 +157,7 @@ NDnsManager::NDnsManager()
 	d = new Private;
 	d->list.setAutoDelete(true);
 
-	connect(tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(app_aboutToQuit()));
+	connect(tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(app_aboutToQuit()));
 }
 
 NDnsManager::~NDnsManager()
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp
index 9ee26ee5..ce41d7ca 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp
@@ -61,7 +61,7 @@ bool ServSock::listen(TQ_UINT16 port)
 		d->serv = 0;
 		return false;
 	}
-	connect(d->serv, TQT_SIGNAL(connectionReady(int)), TQT_SLOT(sss_connectionReady(int)));
+	connect(d->serv, TQ_SIGNAL(connectionReady(int)), TQ_SLOT(sss_connectionReady(int)));
 
 	return true;
 }
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp
index f314e23e..750abdcb 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp
@@ -169,7 +169,7 @@ SocksUDP::SocksUDP(SocksClient *sc, const TQString &host, int port, const TQHost
 	d->sd = new TQSocketDevice(TQSocketDevice::Datagram);
 	d->sd->setBlocking(false);
 	d->sn = new TQSocketNotifier(d->sd->socket(), TQSocketNotifier::Read);
-	connect(d->sn, TQT_SIGNAL(activated(int)), TQT_SLOT(sn_activated(int)));
+	connect(d->sn, TQ_SIGNAL(activated(int)), TQ_SLOT(sn_activated(int)));
 	d->host = host;
 	d->port = port;
 	d->routeAddr = routeAddr;
@@ -548,12 +548,12 @@ SocksClient::SocksClient(int s, TQObject *parent)
 void SocksClient::init()
 {
 	d = new Private;
-	connect(&d->sock, TQT_SIGNAL(connected()), TQT_SLOT(sock_connected()));
-	connect(&d->sock, TQT_SIGNAL(connectionClosed()), TQT_SLOT(sock_connectionClosed()));
-	connect(&d->sock, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(sock_delayedCloseFinished()));
-	connect(&d->sock, TQT_SIGNAL(readyRead()), TQT_SLOT(sock_readyRead()));
-	connect(&d->sock, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(sock_bytesWritten(int)));
-	connect(&d->sock, TQT_SIGNAL(error(int)), TQT_SLOT(sock_error(int)));
+	connect(&d->sock, TQ_SIGNAL(connected()), TQ_SLOT(sock_connected()));
+	connect(&d->sock, TQ_SIGNAL(connectionClosed()), TQ_SLOT(sock_connectionClosed()));
+	connect(&d->sock, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(sock_delayedCloseFinished()));
+	connect(&d->sock, TQ_SIGNAL(readyRead()), TQ_SLOT(sock_readyRead()));
+	connect(&d->sock, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(sock_bytesWritten(int)));
+	connect(&d->sock, TQ_SIGNAL(error(int)), TQ_SLOT(sock_error(int)));
 
 	reset(true);
 }
@@ -1108,7 +1108,7 @@ SocksServer::SocksServer(TQObject *parent)
 	d = new Private;
 	d->sd = 0;
 	d->sn = 0;
-	connect(&d->serv, TQT_SIGNAL(connectionReady(int)), TQT_SLOT(connectionReady(int)));
+	connect(&d->serv, TQ_SIGNAL(connectionReady(int)), TQ_SLOT(connectionReady(int)));
 }
 
 SocksServer::~SocksServer()
@@ -1139,7 +1139,7 @@ bool SocksServer::listen(TQ_UINT16 port, bool udp)
 			return false;
 		}
 		d->sn = new TQSocketNotifier(d->sd->socket(), TQSocketNotifier::Read);
-		connect(d->sn, TQT_SIGNAL(activated(int)), TQT_SLOT(sn_activated(int)));
+		connect(d->sn, TQ_SIGNAL(activated(int)), TQ_SLOT(sn_activated(int)));
 	}
 	return true;
 }
@@ -1172,10 +1172,10 @@ SocksClient *SocksServer::takeIncoming()
 	d->incomingConns.removeRef(c);
 
 	// we don't care about errors anymore
-	disconnect(c, TQT_SIGNAL(error(int)), this, TQT_SLOT(connectionError()));
+	disconnect(c, TQ_SIGNAL(error(int)), this, TQ_SLOT(connectionError()));
 
 	// don't serve the connection until the event loop, to give the caller a chance to map signals
-	TQTimer::singleShot(0, c, TQT_SLOT(serve()));
+	TQTimer::singleShot(0, c, TQ_SLOT(serve()));
 
 	return c;
 }
@@ -1192,7 +1192,7 @@ void SocksServer::writeUDP(const TQHostAddress &addr, int port, const TQByteArra
 void SocksServer::connectionReady(int s)
 {
 	SocksClient *c = new SocksClient(s, this);
-	connect(c, TQT_SIGNAL(error(int)), this, TQT_SLOT(connectionError()));
+	connect(c, TQ_SIGNAL(error(int)), this, TQ_SLOT(connectionError()));
 	d->incomingConns.append(c);
 	incomingReady();
 }
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp
index 873d6c11..93b5cbfa 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp
@@ -85,9 +85,9 @@ SrvResolver::SrvResolver(TQObject *parent)
 	d->qdns = 0;
 
 #ifndef NO_NDNS
-	connect(&d->ndns, TQT_SIGNAL(resultsReady()), TQT_SLOT(ndns_done()));
+	connect(&d->ndns, TQ_SIGNAL(resultsReady()), TQ_SLOT(ndns_done()));
 #endif
-	connect(&d->t, TQT_SIGNAL(timeout()), TQT_SLOT(t_timeout()));
+	connect(&d->t, TQ_SIGNAL(timeout()), TQ_SLOT(t_timeout()));
 	stop();
 }
 
@@ -106,7 +106,7 @@ void SrvResolver::resolve(const TQString &server, const TQString &type, const TQ
 	d->srv = TQString("_") + type + "._" + proto + '.' + server;
 	d->t.start(15000, true);
 	d->qdns = new TQDns;
-	connect(d->qdns, TQT_SIGNAL(resultsReady()), TQT_SLOT(qdns_done()));
+	connect(d->qdns, TQ_SIGNAL(resultsReady()), TQ_SLOT(qdns_done()));
 	d->qdns->setRecordType(TQDns::Srv);
 	d->qdns->setLabel(d->srv);
 }
@@ -120,7 +120,7 @@ void SrvResolver::resolveSrvOnly(const TQString &server, const TQString &type, c
 	d->srv = TQString("_") + type + "._" + proto + '.' + server;
 	d->t.start(15000, true);
 	d->qdns = new TQDns;
-	connect(d->qdns, TQT_SIGNAL(resultsReady()), TQT_SLOT(qdns_done()));
+	connect(d->qdns, TQ_SIGNAL(resultsReady()), TQ_SLOT(qdns_done()));
 	d->qdns->setRecordType(TQDns::Srv);
 	d->qdns->setLabel(d->srv);
 }
@@ -191,7 +191,7 @@ void SrvResolver::tryNext()
 	d->ndns.resolve(d->servers.first().name);
 #else
 	d->qdns = new TQDns;
-	connect(d->qdns, TQT_SIGNAL(resultsReady()), TQT_SLOT(ndns_done()));
+	connect(d->qdns, TQ_SIGNAL(resultsReady()), TQ_SLOT(ndns_done()));
 	if(d->aaaa)
 		d->qdns->setRecordType(TQDns::Aaaa); // IPv6
 	else
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp
index 7f5dc901..ad9a7381 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp
@@ -91,7 +91,7 @@ SafeDeleteLater::SafeDeleteLater()
 {
 	list.setAutoDelete(true);
 	self = this;
-	TQTimer::singleShot(0, this, TQT_SLOT(explode()));
+	TQTimer::singleShot(0, this, TQ_SLOT(explode()));
 }
 
 SafeDeleteLater::~SafeDeleteLater()
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp
index 7dbb0dd3..9c099ae0 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp
@@ -51,7 +51,7 @@ ShowTextDlg::ShowTextDlg(const TQString &fname, bool rich, TQWidget *parent, con
 	TQHBoxLayout *hb1 = new TQHBoxLayout(vb1);
 	hb1->addStretch(1);
 	TQPushButton *pb = new TQPushButton(tr("&OK"), this);
-	connect(pb, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));
+	connect(pb, TQ_SIGNAL(clicked()), TQ_SLOT(accept()));
 	hb1->addWidget(pb);
 	hb1->addStretch(1);
 
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp
index 107d082b..4b0e35ad 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp
+++ b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp
@@ -115,7 +115,7 @@ void FileTransfer::sendFile(const Jid &to, const TQString &fname, TQ_LLONG size,
 	d->id = d->m->link(this);
 
 	d->ft = new JT_FT(d->m->client()->rootTask());
-	connect(d->ft, TQT_SIGNAL(finished()), TQT_SLOT(ft_finished()));
+	connect(d->ft, TQ_SIGNAL(finished()), TQ_SLOT(ft_finished()));
 	TQStringList list;
 	list += "http://jabber.org/protocol/bytestreams";
 	d->ft->request(to, d->id, fname, size, desc, list);
@@ -228,10 +228,10 @@ void FileTransfer::ft_finished()
 			d->length = d->size - d->rangeOffset;
 		d->streamType = ft->streamType();
 		d->c = d->m->client()->s5bManager()->createConnection();
-		connect(d->c, TQT_SIGNAL(connected()), TQT_SLOT(s5b_connected()));
-		connect(d->c, TQT_SIGNAL(connectionClosed()), TQT_SLOT(s5b_connectionClosed()));
-		connect(d->c, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(s5b_bytesWritten(int)));
-		connect(d->c, TQT_SIGNAL(error(int)), TQT_SLOT(s5b_error(int)));
+		connect(d->c, TQ_SIGNAL(connected()), TQ_SLOT(s5b_connected()));
+		connect(d->c, TQ_SIGNAL(connectionClosed()), TQ_SLOT(s5b_connectionClosed()));
+		connect(d->c, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(s5b_bytesWritten(int)));
+		connect(d->c, TQ_SIGNAL(error(int)), TQ_SLOT(s5b_error(int)));
 
 		if(d->proxy.isValid())
 			d->c->setProxy(d->proxy);
@@ -250,14 +250,14 @@ void FileTransfer::ft_finished()
 void FileTransfer::takeConnection(S5BConnection *c)
 {
 	d->c = c;
-	connect(d->c, TQT_SIGNAL(connected()), TQT_SLOT(s5b_connected()));
-	connect(d->c, TQT_SIGNAL(connectionClosed()), TQT_SLOT(s5b_connectionClosed()));
-	connect(d->c, TQT_SIGNAL(readyRead()), TQT_SLOT(s5b_readyRead()));
-	connect(d->c, TQT_SIGNAL(error(int)), TQT_SLOT(s5b_error(int)));
+	connect(d->c, TQ_SIGNAL(connected()), TQ_SLOT(s5b_connected()));
+	connect(d->c, TQ_SIGNAL(connectionClosed()), TQ_SLOT(s5b_connectionClosed()));
+	connect(d->c, TQ_SIGNAL(readyRead()), TQ_SLOT(s5b_readyRead()));
+	connect(d->c, TQ_SIGNAL(error(int)), TQ_SLOT(s5b_error(int)));
 	if(d->proxy.isValid())
 		d->c->setProxy(d->proxy);
 	accepted();
-	TQTimer::singleShot(0, this, TQT_SLOT(doAccept()));
+	TQTimer::singleShot(0, this, TQ_SLOT(doAccept()));
 }
 
 void FileTransfer::s5b_connected()
@@ -338,7 +338,7 @@ FileTransferManager::FileTransferManager(Client *client)
 	d->client = client;
 
 	d->pft = new JT_PushFT(d->client->rootTask());
-	connect(d->pft, TQT_SIGNAL(incoming(const FTRequest &)), TQT_SLOT(pft_incoming(const FTRequest &)));
+	connect(d->pft, TQ_SIGNAL(incoming(const FTRequest &)), TQ_SLOT(pft_incoming(const FTRequest &)));
 }
 
 FileTransferManager::~FileTransferManager()
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
index 8f2e01b6..971af3a4 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
+++ b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
@@ -394,15 +394,15 @@ void S5BConnection::man_waitForAccept(const S5BRequest &r)
 void S5BConnection::man_clientReady(SocksClient *sc, SocksUDP *sc_udp)
 {
 	d->sc = sc;
-	connect(d->sc, TQT_SIGNAL(connectionClosed()), TQT_SLOT(sc_connectionClosed()));
-	connect(d->sc, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(sc_delayedCloseFinished()));
-	connect(d->sc, TQT_SIGNAL(readyRead()), TQT_SLOT(sc_readyRead()));
-	connect(d->sc, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(sc_bytesWritten(int)));
-	connect(d->sc, TQT_SIGNAL(error(int)), TQT_SLOT(sc_error(int)));
+	connect(d->sc, TQ_SIGNAL(connectionClosed()), TQ_SLOT(sc_connectionClosed()));
+	connect(d->sc, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(sc_delayedCloseFinished()));
+	connect(d->sc, TQ_SIGNAL(readyRead()), TQ_SLOT(sc_readyRead()));
+	connect(d->sc, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(sc_bytesWritten(int)));
+	connect(d->sc, TQ_SIGNAL(error(int)), TQ_SLOT(sc_error(int)));
 
 	if(sc_udp) {
 		d->su = sc_udp;
-		connect(d->su, TQT_SIGNAL(packetReady(const TQByteArray &)), TQT_SLOT(su_packetReady(const TQByteArray &)));
+		connect(d->su, TQ_SIGNAL(packetReady(const TQByteArray &)), TQ_SLOT(su_packetReady(const TQByteArray &)));
 	}
 
 	d->state = Active;
@@ -425,7 +425,7 @@ void S5BConnection::man_clientReady(SocksClient *sc, SocksUDP *sc_udp)
 		d->notifyClose = true;
 	}
 	if(d->notifyRead || d->notifyClose)
-		TQTimer::singleShot(0, this, TQT_SLOT(doPending()));
+		TQTimer::singleShot(0, this, TQ_SLOT(doPending()));
 	connected();
 }
 
@@ -433,7 +433,7 @@ void S5BConnection::doPending()
 {
 	if(d->notifyRead) {
 		if(d->notifyClose)
-			TQTimer::singleShot(0, this, TQT_SLOT(doPending()));
+			TQTimer::singleShot(0, this, TQ_SLOT(doPending()));
 		sc_readyRead();
 	}
 	else if(d->notifyClose)
@@ -588,9 +588,9 @@ S5BManager::S5BManager(Client *parent)
 	d->activeList.setAutoDelete(true);
 
 	d->ps = new JT_PushS5B(d->client->rootTask());
-	connect(d->ps, TQT_SIGNAL(incoming(const S5BRequest &)), TQT_SLOT(ps_incoming(const S5BRequest &)));
-	connect(d->ps, TQT_SIGNAL(incomingUDPSuccess(const Jid &, const TQString &)), TQT_SLOT(ps_incomingUDPSuccess(const Jid &, const TQString &)));
-	connect(d->ps, TQT_SIGNAL(incomingActivate(const Jid &, const TQString &, const Jid &)), TQT_SLOT(ps_incomingActivate(const Jid &, const TQString &, const Jid &)));
+	connect(d->ps, TQ_SIGNAL(incoming(const S5BRequest &)), TQ_SLOT(ps_incoming(const S5BRequest &)));
+	connect(d->ps, TQ_SIGNAL(incomingUDPSuccess(const Jid &, const TQString &)), TQ_SLOT(ps_incomingUDPSuccess(const Jid &, const TQString &)));
+	connect(d->ps, TQ_SIGNAL(incomingActivate(const Jid &, const TQString &, const Jid &)), TQ_SLOT(ps_incomingActivate(const Jid &, const TQString &, const Jid &)));
 }
 
 S5BManager::~S5BManager()
@@ -1008,12 +1008,12 @@ void S5BManager::entryContinue(Entry *e)
 	e->i = new Item(this);
 	e->i->proxy = e->proxyInfo;
 
-	connect(e->i, TQT_SIGNAL(accepted()), TQT_SLOT(item_accepted()));
-	connect(e->i, TQT_SIGNAL(tryingHosts(const StreamHostList &)), TQT_SLOT(item_tryingHosts(const StreamHostList &)));
-	connect(e->i, TQT_SIGNAL(proxyConnect()), TQT_SLOT(item_proxyConnect()));
-	connect(e->i, TQT_SIGNAL(waitingForActivation()), TQT_SLOT(item_waitingForActivation()));
-	connect(e->i, TQT_SIGNAL(connected()), TQT_SLOT(item_connected()));
-	connect(e->i, TQT_SIGNAL(error(int)), TQT_SLOT(item_error(int)));
+	connect(e->i, TQ_SIGNAL(accepted()), TQ_SLOT(item_accepted()));
+	connect(e->i, TQ_SIGNAL(tryingHosts(const StreamHostList &)), TQ_SLOT(item_tryingHosts(const StreamHostList &)));
+	connect(e->i, TQ_SIGNAL(proxyConnect()), TQ_SLOT(item_proxyConnect()));
+	connect(e->i, TQ_SIGNAL(waitingForActivation()), TQ_SLOT(item_waitingForActivation()));
+	connect(e->i, TQ_SIGNAL(connected()), TQ_SLOT(item_connected()));
+	connect(e->i, TQ_SIGNAL(error(int)), TQ_SLOT(item_error(int)));
 
 	if(e->c->isRemote()) {
 		const S5BRequest &req = e->c->d->req;
@@ -1036,7 +1036,7 @@ void S5BManager::queryProxy(Entry *e)
 	printf("querying proxy: [%s]\n", e->c->d->proxy.full().latin1());
 #endif
 	e->query = new JT_S5B(d->client->rootTask());
-	connect(e->query, TQT_SIGNAL(finished()), TQT_SLOT(query_finished()));
+	connect(e->query, TQ_SIGNAL(finished()), TQ_SLOT(query_finished()));
 	e->query->requestProxyInfo(e->c->d->proxy);
 	e->query->go(true);
 }
@@ -1246,7 +1246,7 @@ void S5BManager::Item::doOutgoing()
 	allowIncoming = true;
 
 	task = new JT_S5B(m->client()->rootTask());
-	connect(task, TQT_SIGNAL(finished()), TQT_SLOT(jt_finished()));
+	connect(task, TQ_SIGNAL(finished()), TQ_SLOT(jt_finished()));
 	task->request(peer, sid, hosts, state == Initiator ? wantFast : false, udp);
 	out_id = task->id();
 	task->go(true);
@@ -1292,7 +1292,7 @@ void S5BManager::Item::doIncoming()
 	}
 
 	conn = new S5BConnector;
-	connect(conn, TQT_SIGNAL(result(bool)), TQT_SLOT(conn_result(bool)));
+	connect(conn, TQ_SIGNAL(result(bool)), TQ_SLOT(conn_result(bool)));
 
 	TQGuardedPtr<TQObject> self = this;
 	tryingHosts(list);
@@ -1308,9 +1308,9 @@ void S5BManager::Item::setIncomingClient(SocksClient *sc)
 	printf("S5BManager::Item: %s [%s] successful incoming connection\n", peer.full().latin1(), sid.latin1());
 #endif
 
-	connect(sc, TQT_SIGNAL(readyRead()), TQT_SLOT(sc_readyRead()));
-	connect(sc, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(sc_bytesWritten(int)));
-	connect(sc, TQT_SIGNAL(error(int)), TQT_SLOT(sc_error(int)));
+	connect(sc, TQ_SIGNAL(readyRead()), TQ_SLOT(sc_readyRead()));
+	connect(sc, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(sc_bytesWritten(int)));
+	connect(sc, TQ_SIGNAL(error(int)), TQ_SLOT(sc_error(int)));
 
 	client = sc;
 	allowIncoming = false;
@@ -1388,7 +1388,7 @@ void S5BManager::Item::jt_finished()
 #endif
 			// connect to the proxy
 			proxy_conn = new S5BConnector;
-			connect(proxy_conn, TQT_SIGNAL(result(bool)), TQT_SLOT(proxy_result(bool)));
+			connect(proxy_conn, TQ_SIGNAL(result(bool)), TQ_SLOT(proxy_result(bool)));
 			StreamHostList list;
 			list += proxy;
 
@@ -1442,9 +1442,9 @@ void S5BManager::Item::conn_result(bool b)
 		printf("S5BManager::Item: %s [%s] successful outgoing connection\n", peer.full().latin1(), sid.latin1());
 #endif
 
-		connect(sc, TQT_SIGNAL(readyRead()), TQT_SLOT(sc_readyRead()));
-		connect(sc, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(sc_bytesWritten(int)));
-		connect(sc, TQT_SIGNAL(error(int)), TQT_SLOT(sc_error(int)));
+		connect(sc, TQ_SIGNAL(readyRead()), TQ_SLOT(sc_readyRead()));
+		connect(sc, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(sc_bytesWritten(int)));
+		connect(sc, TQ_SIGNAL(error(int)), TQ_SLOT(sc_error(int)));
 
 		m->doSuccess(peer, in_id, h.jid());
 
@@ -1493,9 +1493,9 @@ void S5BManager::Item::proxy_result(bool b)
 		delete proxy_conn;
 		proxy_conn = 0;
 
-		connect(sc, TQT_SIGNAL(readyRead()), TQT_SLOT(sc_readyRead()));
-		connect(sc, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(sc_bytesWritten(int)));
-		connect(sc, TQT_SIGNAL(error(int)), TQT_SLOT(sc_error(int)));
+		connect(sc, TQ_SIGNAL(readyRead()), TQ_SLOT(sc_readyRead()));
+		connect(sc, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(sc_bytesWritten(int)));
+		connect(sc, TQ_SIGNAL(error(int)), TQ_SLOT(sc_error(int)));
 
 		client = sc;
 		client_udp = sc_udp;
@@ -1505,7 +1505,7 @@ void S5BManager::Item::proxy_result(bool b)
 		printf("activating proxy stream\n");
 #endif
 		proxy_task = new JT_S5B(m->client()->rootTask());
-		connect(proxy_task, TQT_SIGNAL(finished()), TQT_SLOT(proxy_finished()));
+		connect(proxy_task, TQ_SIGNAL(finished()), TQ_SLOT(proxy_finished()));
 		proxy_task->requestActivation(proxy.jid(), sid, peer);
 		proxy_task->go(true);
 	}
@@ -1768,9 +1768,9 @@ public:
 		udp = _udp;
 		client = new SocksClient;
 		client_udp = 0;
-		connect(client, TQT_SIGNAL(connected()), TQT_SLOT(sc_connected()));
-		connect(client, TQT_SIGNAL(error(int)), TQT_SLOT(sc_error(int)));
-		connect(&t, TQT_SIGNAL(timeout()), TQT_SLOT(trySendUDP()));
+		connect(client, TQ_SIGNAL(connected()), TQ_SLOT(sc_connected()));
+		connect(client, TQ_SIGNAL(error(int)), TQ_SLOT(sc_error(int)));
+		connect(&t, TQ_SIGNAL(timeout()), TQ_SLOT(trySendUDP()));
 	}
 
 	~Item()
@@ -1872,7 +1872,7 @@ S5BConnector::S5BConnector(TQObject *parent)
 	d->active = 0;
 	d->active_udp = 0;
 	d->itemList.setAutoDelete(true);
-	connect(&d->t, TQT_SIGNAL(timeout()), TQT_SLOT(t_timeout()));
+	connect(&d->t, TQ_SIGNAL(timeout()), TQ_SLOT(t_timeout()));
 }
 
 S5BConnector::~S5BConnector()
@@ -1900,7 +1900,7 @@ void S5BConnector::start(const Jid &self, const StreamHostList &hosts, const TQS
 #endif
 	for(StreamHostList::ConstIterator it = hosts.begin(); it != hosts.end(); ++it) {
 		Item *i = new Item(self, *it, key, udp);
-		connect(i, TQT_SIGNAL(result(bool)), TQT_SLOT(item_result(bool)));
+		connect(i, TQ_SIGNAL(result(bool)), TQ_SLOT(item_result(bool)));
 		d->itemList.append(i);
 		i->start();
 	}
@@ -1990,11 +1990,11 @@ public:
 	Item(SocksClient *c) : TQObject(0)
 	{
 		client = c;
-		connect(client, TQT_SIGNAL(incomingMethods(int)), TQT_SLOT(sc_incomingMethods(int)));
-		connect(client, TQT_SIGNAL(incomingConnectRequest(const TQString &, int)), TQT_SLOT(sc_incomingConnectRequest(const TQString &, int)));
-		connect(client, TQT_SIGNAL(error(int)), TQT_SLOT(sc_error(int)));
+		connect(client, TQ_SIGNAL(incomingMethods(int)), TQ_SLOT(sc_incomingMethods(int)));
+		connect(client, TQ_SIGNAL(incomingConnectRequest(const TQString &, int)), TQ_SLOT(sc_incomingConnectRequest(const TQString &, int)));
+		connect(client, TQ_SIGNAL(error(int)), TQ_SLOT(sc_error(int)));
 
-		connect(&expire, TQT_SIGNAL(timeout()), TQT_SLOT(doError()));
+		connect(&expire, TQ_SIGNAL(timeout()), TQ_SLOT(doError()));
 		resetExpiration();
 	}
 
@@ -2059,8 +2059,8 @@ S5BServer::S5BServer(TQObject *parent)
 {
 	d = new Private;
 	d->itemList.setAutoDelete(true);
-	connect(&d->serv, TQT_SIGNAL(incomingReady()), TQT_SLOT(ss_incomingReady()));
-	connect(&d->serv, TQT_SIGNAL(incomingUDP(const TQString &, int, const TQHostAddress &, int, const TQByteArray &)), TQT_SLOT(ss_incomingUDP(const TQString &, int, const TQHostAddress &, int, const TQByteArray &)));
+	connect(&d->serv, TQ_SIGNAL(incomingReady()), TQ_SLOT(ss_incomingReady()));
+	connect(&d->serv, TQ_SIGNAL(incomingUDP(const TQString &, int, const TQHostAddress &, int, const TQByteArray &)), TQ_SLOT(ss_incomingUDP(const TQString &, int, const TQHostAddress &, int, const TQByteArray &)));
 }
 
 S5BServer::~S5BServer()
@@ -2106,7 +2106,7 @@ void S5BServer::ss_incomingReady()
 #ifdef S5B_DEBUG
 	printf("S5BServer: incoming connection from %s:%d\n", i->client->peerAddress().toString().latin1(), i->client->peerPort());
 #endif
-	connect(i, TQT_SIGNAL(result(bool)), TQT_SLOT(item_result(bool)));
+	connect(i, TQ_SIGNAL(result(bool)), TQ_SLOT(item_result(bool)));
 	d->itemList.append(i);
 }
 
@@ -2200,7 +2200,7 @@ JT_S5B::JT_S5B(Task *parent)
 {
 	d = new Private;
 	d->mode = -1;
-	connect(&d->t, TQT_SIGNAL(timeout()), TQT_SLOT(t_timeout()));
+	connect(&d->t, TQ_SIGNAL(timeout()), TQ_SLOT(t_timeout()));
 }
 
 JT_S5B::~JT_S5B()
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp
index aaf3e4cd..ed6c44c7 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp
+++ b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp
@@ -110,7 +110,7 @@ void IBBConnection::connectToJid(const Jid &peer, const TQDomElement &comment)
 	d->m->client()->debug(dstr);
 
 	d->j = new JT_IBB(d->m->client()->rootTask());
-	connect(d->j, TQT_SIGNAL(finished()), TQT_SLOT(ibb_finished()));
+	connect(d->j, TQ_SIGNAL(finished()), TQ_SLOT(ibb_finished()));
 	d->j->request(d->peer, comment);
 	d->j->go(true);
 }
@@ -270,7 +270,7 @@ void IBBConnection::ibb_finished()
 			}
 
 			if(!d->sendbuf.isEmpty() || d->closePending)
-				TQTimer::singleShot(IBB_PACKET_DELAY, this, TQT_SLOT(trySend()));
+				TQTimer::singleShot(IBB_PACKET_DELAY, this, TQ_SLOT(trySend()));
 		}
 	}
 	else {
@@ -326,7 +326,7 @@ void IBBConnection::trySend()
 
 	d->blockSize = a.size();
 	d->j = new JT_IBB(d->m->client()->rootTask());
-	connect(d->j, TQT_SIGNAL(finished()), TQT_SLOT(ibb_finished()));
+	connect(d->j, TQ_SIGNAL(finished()), TQ_SLOT(ibb_finished()));
 	d->j->sendData(d->peer, d->sid, a, doClose);
 	d->j->go(true);
 }
@@ -353,8 +353,8 @@ IBBManager::IBBManager(Client *parent)
 	d->client = parent;
 	
 	d->ibb = new JT_IBB(d->client->rootTask(), true);
-	connect(d->ibb, TQT_SIGNAL(incomingRequest(const Jid &, const TQString &, const TQDomElement &)), TQT_SLOT(ibb_incomingRequest(const Jid &, const TQString &, const TQDomElement &)));
-	connect(d->ibb, TQT_SIGNAL(incomingData(const Jid &, const TQString &, const TQString &, const TQByteArray &, bool)), TQT_SLOT(ibb_incomingData(const Jid &, const TQString &, const TQString &, const TQByteArray &, bool)));
+	connect(d->ibb, TQ_SIGNAL(incomingRequest(const Jid &, const TQString &, const TQDomElement &)), TQ_SLOT(ibb_incomingRequest(const Jid &, const TQString &, const TQDomElement &)));
+	connect(d->ibb, TQ_SIGNAL(incomingData(const Jid &, const TQString &, const TQString &, const TQByteArray &, bool)), TQ_SLOT(ibb_incomingData(const Jid &, const TQString &, const TQString &, const TQByteArray &, bool)));
 }
 
 IBBManager::~IBBManager()
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.cpp b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.cpp
index 5139dffd..7cfecda0 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.cpp
+++ b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.cpp
@@ -105,18 +105,18 @@ void JidLink::link()
 {
 	if(d->type == DTCP) {
 		S5BConnection *c = (S5BConnection *)d->bs;
-		connect(c, TQT_SIGNAL(connected()), TQT_SLOT(dtcp_connected()));
-		connect(c, TQT_SIGNAL(accepted()), TQT_SLOT(dtcp_accepted()));
+		connect(c, TQ_SIGNAL(connected()), TQ_SLOT(dtcp_connected()));
+		connect(c, TQ_SIGNAL(accepted()), TQ_SLOT(dtcp_accepted()));
 	}
 	else {
 		IBBConnection *c = (IBBConnection *)d->bs;
-		connect(c, TQT_SIGNAL(connected()), TQT_SLOT(ibb_connected()));
+		connect(c, TQ_SIGNAL(connected()), TQ_SLOT(ibb_connected()));
 	}
 
-	connect(d->bs, TQT_SIGNAL(connectionClosed()), TQT_SLOT(bs_connectionClosed()));
-	connect(d->bs, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int)));
-	connect(d->bs, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(bs_bytesWritten(int)));
-	connect(d->bs, TQT_SIGNAL(readyRead()), TQT_SLOT(bs_readyRead()));
+	connect(d->bs, TQ_SIGNAL(connectionClosed()), TQ_SLOT(bs_connectionClosed()));
+	connect(d->bs, TQ_SIGNAL(error(int)), TQ_SLOT(bs_error(int)));
+	connect(d->bs, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(bs_bytesWritten(int)));
+	connect(d->bs, TQ_SIGNAL(readyRead()), TQ_SLOT(bs_readyRead()));
 }
 
 void JidLink::unlink()
@@ -129,7 +129,7 @@ void JidLink::accept()
 	if(d->state != WaitingForAccept)
 		return;
 
-	TQTimer::singleShot(0, this, TQT_SLOT(doRealAccept()));
+	TQTimer::singleShot(0, this, TQ_SLOT(doRealAccept()));
 }
 
 void JidLink::doRealAccept()
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
index a27811ec..493d887d 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
@@ -231,9 +231,9 @@ AdvancedConnector::AdvancedConnector(TQObject *parent)
 #ifdef NO_NDNS
 	d->qdns = 0;
 #else
-	connect(&d->dns, TQT_SIGNAL(resultsReady()), TQT_SLOT(dns_done()));
+	connect(&d->dns, TQ_SIGNAL(resultsReady()), TQ_SLOT(dns_done()));
 #endif
-	connect(&d->srv, TQT_SIGNAL(resultsReady()), TQT_SLOT(srv_done()));
+	connect(&d->srv, TQ_SIGNAL(resultsReady()), TQ_SLOT(srv_done()));
 	d->opt_probe = false;
 	d->opt_ssl = false;
 	cleanup();
@@ -326,10 +326,10 @@ void AdvancedConnector::connectToServer(const TQString &server)
 
 		HttpPoll *s = new HttpPoll;
 		d->bs = s;
-		connect(s, TQT_SIGNAL(connected()), TQT_SLOT(bs_connected()));
-		connect(s, TQT_SIGNAL(syncStarted()), TQT_SLOT(http_syncStarted()));
-		connect(s, TQT_SIGNAL(syncFinished()), TQT_SLOT(http_syncFinished()));
-		connect(s, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int)));
+		connect(s, TQ_SIGNAL(connected()), TQ_SLOT(bs_connected()));
+		connect(s, TQ_SIGNAL(syncStarted()), TQ_SLOT(http_syncStarted()));
+		connect(s, TQ_SIGNAL(syncFinished()), TQ_SLOT(http_syncFinished()));
+		connect(s, TQ_SIGNAL(error(int)), TQ_SLOT(bs_error(int)));
 		if(!d->proxy.user().isEmpty())
 			s->setAuth(d->proxy.user(), d->proxy.pass());
 		s->setPollInterval(d->proxy.pollInterval());
@@ -389,7 +389,7 @@ void AdvancedConnector::do_resolve()
 #ifdef NO_NDNS
 	printf("resolving (aaaa=%d)\n", d->aaaa);
 	d->qdns = new TQDns;
-	connect(d->qdns, TQT_SIGNAL(resultsReady()), TQT_SLOT(dns_done()));
+	connect(d->qdns, TQ_SIGNAL(resultsReady()), TQ_SLOT(dns_done()));
 	if(d->aaaa)
 		d->qdns->setRecordType(TQDns::Aaaa); // IPv6
 	else
@@ -502,8 +502,8 @@ void AdvancedConnector::do_connect()
 #endif
 		BSocket *s = new BSocket;
 		d->bs = s;
-		connect(s, TQT_SIGNAL(connected()), TQT_SLOT(bs_connected()));
-		connect(s, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int)));
+		connect(s, TQ_SIGNAL(connected()), TQ_SLOT(bs_connected()));
+		connect(s, TQ_SIGNAL(error(int)), TQ_SLOT(bs_error(int)));
 		s->connectToHost(d->host, d->port);
 	}
 	else if(t == Proxy::HttpConnect) {
@@ -512,8 +512,8 @@ void AdvancedConnector::do_connect()
 #endif
 		HttpConnect *s = new HttpConnect;
 		d->bs = s;
-		connect(s, TQT_SIGNAL(connected()), TQT_SLOT(bs_connected()));
-		connect(s, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int)));
+		connect(s, TQ_SIGNAL(connected()), TQ_SLOT(bs_connected()));
+		connect(s, TQ_SIGNAL(error(int)), TQ_SLOT(bs_error(int)));
 		if(!d->proxy.user().isEmpty())
 			s->setAuth(d->proxy.user(), d->proxy.pass());
 		s->connectToHost(d->proxy.host(), d->proxy.port(), d->host, d->port);
@@ -524,8 +524,8 @@ void AdvancedConnector::do_connect()
 #endif
 		SocksClient *s = new SocksClient;
 		d->bs = s;
-		connect(s, TQT_SIGNAL(connected()), TQT_SLOT(bs_connected()));
-		connect(s, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int)));
+		connect(s, TQ_SIGNAL(connected()), TQ_SLOT(bs_connected()));
+		connect(s, TQ_SIGNAL(error(int)), TQ_SLOT(bs_error(int)));
 		if(!d->proxy.user().isEmpty())
 			s->setAuth(d->proxy.user(), d->proxy.pass());
 		s->connectToHost(d->proxy.host(), d->proxy.port(), d->host, d->port);
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp
index 84b387e8..14ff7019 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp
@@ -132,11 +132,11 @@ public:
 		type = TLS;
 		p.tls = t;
 		init();
-		connect(p.tls, TQT_SIGNAL(handshaken()), TQT_SLOT(tls_handshaken()));
-		connect(p.tls, TQT_SIGNAL(readyRead()), TQT_SLOT(tls_readyRead()));
-		connect(p.tls, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(tls_readyReadOutgoing(int)));
-		connect(p.tls, TQT_SIGNAL(closed()), TQT_SLOT(tls_closed()));
-		connect(p.tls, TQT_SIGNAL(error(int)), TQT_SLOT(tls_error(int)));
+		connect(p.tls, TQ_SIGNAL(handshaken()), TQ_SLOT(tls_handshaken()));
+		connect(p.tls, TQ_SIGNAL(readyRead()), TQ_SLOT(tls_readyRead()));
+		connect(p.tls, TQ_SIGNAL(readyReadOutgoing(int)), TQ_SLOT(tls_readyReadOutgoing(int)));
+		connect(p.tls, TQ_SIGNAL(closed()), TQ_SLOT(tls_closed()));
+		connect(p.tls, TQ_SIGNAL(error(int)), TQ_SLOT(tls_error(int)));
 	}
 
 	SecureLayer(TQCA::SASL *s)
@@ -144,9 +144,9 @@ public:
 		type = SASL;
 		p.sasl = s;
 		init();
-		connect(p.sasl, TQT_SIGNAL(readyRead()), TQT_SLOT(sasl_readyRead()));
-		connect(p.sasl, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(sasl_readyReadOutgoing(int)));
-		connect(p.sasl, TQT_SIGNAL(error(int)), TQT_SLOT(sasl_error(int)));
+		connect(p.sasl, TQ_SIGNAL(readyRead()), TQ_SLOT(sasl_readyRead()));
+		connect(p.sasl, TQ_SIGNAL(readyReadOutgoing(int)), TQ_SLOT(sasl_readyReadOutgoing(int)));
+		connect(p.sasl, TQ_SIGNAL(error(int)), TQ_SLOT(sasl_error(int)));
 	}
 
 #ifdef USE_TLSHANDLER
@@ -155,11 +155,11 @@ public:
 		type = TLSH;
 		p.tlsHandler = t;
 		init();
-		connect(p.tlsHandler, TQT_SIGNAL(success()), TQT_SLOT(tlsHandler_success()));
-		connect(p.tlsHandler, TQT_SIGNAL(fail()), TQT_SLOT(tlsHandler_fail()));
-		connect(p.tlsHandler, TQT_SIGNAL(closed()), TQT_SLOT(tlsHandler_closed()));
-		connect(p.tlsHandler, TQT_SIGNAL(readyRead(const TQByteArray &)), TQT_SLOT(tlsHandler_readyRead(const TQByteArray &)));
-		connect(p.tlsHandler, TQT_SIGNAL(readyReadOutgoing(const TQByteArray &, int)), TQT_SLOT(tlsHandler_readyReadOutgoing(const TQByteArray &, int)));
+		connect(p.tlsHandler, TQ_SIGNAL(success()), TQ_SLOT(tlsHandler_success()));
+		connect(p.tlsHandler, TQ_SIGNAL(fail()), TQ_SLOT(tlsHandler_fail()));
+		connect(p.tlsHandler, TQ_SIGNAL(closed()), TQ_SLOT(tlsHandler_closed()));
+		connect(p.tlsHandler, TQ_SIGNAL(readyRead(const TQByteArray &)), TQ_SLOT(tlsHandler_readyRead(const TQByteArray &)));
+		connect(p.tlsHandler, TQ_SIGNAL(readyReadOutgoing(const TQByteArray &, int)), TQ_SLOT(tlsHandler_readyReadOutgoing(const TQByteArray &, int)));
 	}
 #endif
 
@@ -349,8 +349,8 @@ SecureStream::SecureStream(ByteStream *s)
 	d = new Private;
 
 	d->bs = s;
-	connect(d->bs, TQT_SIGNAL(readyRead()), TQT_SLOT(bs_readyRead()));
-	connect(d->bs, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(bs_bytesWritten(int)));
+	connect(d->bs, TQ_SIGNAL(readyRead()), TQ_SLOT(bs_readyRead()));
+	connect(d->bs, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(bs_bytesWritten(int)));
 
 	d->layers.setAutoDelete(true);
 	d->pending = 0;
@@ -365,11 +365,11 @@ SecureStream::~SecureStream()
 
 void SecureStream::linkLayer(TQObject *s)
 {
-	connect(s, TQT_SIGNAL(tlsHandshaken()), TQT_SLOT(layer_tlsHandshaken()));
-	connect(s, TQT_SIGNAL(tlsClosed(const TQByteArray &)), TQT_SLOT(layer_tlsClosed(const TQByteArray &)));
-	connect(s, TQT_SIGNAL(readyRead(const TQByteArray &)), TQT_SLOT(layer_readyRead(const TQByteArray &)));
-	connect(s, TQT_SIGNAL(needWrite(const TQByteArray &)), TQT_SLOT(layer_needWrite(const TQByteArray &)));
-	connect(s, TQT_SIGNAL(error(int)), TQT_SLOT(layer_error(int)));
+	connect(s, TQ_SIGNAL(tlsHandshaken()), TQ_SLOT(layer_tlsHandshaken()));
+	connect(s, TQ_SIGNAL(tlsClosed(const TQByteArray &)), TQ_SLOT(layer_tlsClosed(const TQByteArray &)));
+	connect(s, TQ_SIGNAL(readyRead(const TQByteArray &)), TQ_SLOT(layer_readyRead(const TQByteArray &)));
+	connect(s, TQ_SIGNAL(needWrite(const TQByteArray &)), TQ_SLOT(layer_needWrite(const TQByteArray &)));
+	connect(s, TQ_SIGNAL(error(int)), TQ_SLOT(layer_error(int)));
 }
 
 int SecureStream::calcPrebytes() const
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
index e0d09d8e..18b19688 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
@@ -618,11 +618,11 @@ ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *pa
 	d = new Private;
 	d->mode = Client;
 	d->conn = conn;
-	connect(d->conn, TQT_SIGNAL(connected()), TQT_SLOT(cr_connected()));
-	connect(d->conn, TQT_SIGNAL(error()), TQT_SLOT(cr_error()));
+	connect(d->conn, TQ_SIGNAL(connected()), TQ_SLOT(cr_connected()));
+	connect(d->conn, TQ_SIGNAL(error()), TQ_SLOT(cr_error()));
 
 	d->noop_time = 0;
-	connect(&d->noopTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doNoop()));
+	connect(&d->noopTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doNoop()));
 
 	d->tlsHandler = tlsHandler;
 }
@@ -633,18 +633,18 @@ ClientStream::ClientStream(const TQString &host, const TQString &defRealm, ByteS
 	d = new Private;
 	d->mode = Server;
 	d->bs = bs;
-	connect(d->bs, TQT_SIGNAL(connectionClosed()), TQT_SLOT(bs_connectionClosed()));
-	connect(d->bs, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(bs_delayedCloseFinished()));
-	connect(d->bs, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int)));
+	connect(d->bs, TQ_SIGNAL(connectionClosed()), TQ_SLOT(bs_connectionClosed()));
+	connect(d->bs, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(bs_delayedCloseFinished()));
+	connect(d->bs, TQ_SIGNAL(error(int)), TQ_SLOT(bs_error(int)));
 
 	TQByteArray spare = d->bs->read();
 
 	d->ss = new SecureStream(d->bs);
-	connect(d->ss, TQT_SIGNAL(readyRead()), TQT_SLOT(ss_readyRead()));
-	connect(d->ss, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(ss_bytesWritten(int)));
-	connect(d->ss, TQT_SIGNAL(tlsHandshaken()), TQT_SLOT(ss_tlsHandshaken()));
-	connect(d->ss, TQT_SIGNAL(tlsClosed()), TQT_SLOT(ss_tlsClosed()));
-	connect(d->ss, TQT_SIGNAL(error(int)), TQT_SLOT(ss_error(int)));
+	connect(d->ss, TQ_SIGNAL(readyRead()), TQ_SLOT(ss_readyRead()));
+	connect(d->ss, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(ss_bytesWritten(int)));
+	connect(d->ss, TQ_SIGNAL(tlsHandshaken()), TQ_SLOT(ss_tlsHandshaken()));
+	connect(d->ss, TQ_SIGNAL(tlsClosed()), TQ_SLOT(ss_tlsClosed()));
+	connect(d->ss, TQ_SIGNAL(error(int)), TQ_SLOT(ss_error(int)));
 
 	d->server = host;
 	d->defRealm = defRealm;
@@ -940,17 +940,17 @@ void ClientStream::write(const Stanza &s)
 void ClientStream::cr_connected()
 {
 	d->bs = d->conn->stream();
-	connect(d->bs, TQT_SIGNAL(connectionClosed()), TQT_SLOT(bs_connectionClosed()));
-	connect(d->bs, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(bs_delayedCloseFinished()));
+	connect(d->bs, TQ_SIGNAL(connectionClosed()), TQ_SLOT(bs_connectionClosed()));
+	connect(d->bs, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(bs_delayedCloseFinished()));
 
 	TQByteArray spare = d->bs->read();
 
 	d->ss = new SecureStream(d->bs);
-	connect(d->ss, TQT_SIGNAL(readyRead()), TQT_SLOT(ss_readyRead()));
-	connect(d->ss, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(ss_bytesWritten(int)));
-	connect(d->ss, TQT_SIGNAL(tlsHandshaken()), TQT_SLOT(ss_tlsHandshaken()));
-	connect(d->ss, TQT_SIGNAL(tlsClosed()), TQT_SLOT(ss_tlsClosed()));
-	connect(d->ss, TQT_SIGNAL(error(int)), TQT_SLOT(ss_error(int)));
+	connect(d->ss, TQ_SIGNAL(readyRead()), TQ_SLOT(ss_readyRead()));
+	connect(d->ss, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(ss_bytesWritten(int)));
+	connect(d->ss, TQ_SIGNAL(tlsHandshaken()), TQ_SLOT(ss_tlsHandshaken()));
+	connect(d->ss, TQ_SIGNAL(tlsClosed()), TQ_SLOT(ss_tlsClosed()));
+	connect(d->ss, TQ_SIGNAL(error(int)), TQ_SLOT(ss_error(int)));
 
 	//d->client.startDialbackOut("andbit.net", "im.pyxa.org");
 	//d->client.startServerOut(d->server);
@@ -1163,10 +1163,10 @@ void ClientStream::srvProcessNext()
 			else if(need == CoreProtocol::NSASLMechs) {
 				if(!d->sasl) {
 					d->sasl = new TQCA::SASL;
-					connect(d->sasl, TQT_SIGNAL(authCheck(const TQString &, const TQString &)), TQT_SLOT(sasl_authCheck(const TQString &, const TQString &)));
-					connect(d->sasl, TQT_SIGNAL(nextStep(const TQByteArray &)), TQT_SLOT(sasl_nextStep(const TQByteArray &)));
-					connect(d->sasl, TQT_SIGNAL(authenticated()), TQT_SLOT(sasl_authenticated()));
-					connect(d->sasl, TQT_SIGNAL(error(int)), TQT_SLOT(sasl_error(int)));
+					connect(d->sasl, TQ_SIGNAL(authCheck(const TQString &, const TQString &)), TQ_SLOT(sasl_authCheck(const TQString &, const TQString &)));
+					connect(d->sasl, TQ_SIGNAL(nextStep(const TQByteArray &)), TQ_SLOT(sasl_nextStep(const TQByteArray &)));
+					connect(d->sasl, TQ_SIGNAL(authenticated()), TQ_SLOT(sasl_authenticated()));
+					connect(d->sasl, TQ_SIGNAL(error(int)), TQ_SLOT(sasl_error(int)));
 
 					//d->sasl->setAllowAnonymous(false);
 					//d->sasl->setRequirePassCredentials(true);
@@ -1258,7 +1258,7 @@ void ClientStream::srvProcessNext()
 			}
 			case CoreProtocol::ESASLSuccess: {
 				printf("Break SASL Success\n");
-				disconnect(d->sasl, TQT_SIGNAL(error(int)), this, TQT_SLOT(sasl_error(int)));
+				disconnect(d->sasl, TQ_SIGNAL(error(int)), this, TQ_SLOT(sasl_error(int)));
 				TQByteArray a = d->srv.spare;
 				d->ss->setLayerSASL(d->sasl, a);
 				break;
@@ -1324,7 +1324,7 @@ void ClientStream::processNext()
 			//if(!d->in_rrsig && !d->in.isEmpty()) {
 			if(!d->in.isEmpty()) {
 				//d->in_rrsig = true;
-				TQTimer::singleShot(0, this, TQT_SLOT(doReadyRead()));
+				TQTimer::singleShot(0, this, TQ_SLOT(doReadyRead()));
 			}
 
 			if(cont)
@@ -1480,11 +1480,11 @@ bool ClientStream::handleNeed()
 			}
 
 			d->sasl = new TQCA::SASL;
-			connect(d->sasl, TQT_SIGNAL(clientFirstStep(const TQString &, const TQByteArray *)), TQT_SLOT(sasl_clientFirstStep(const TQString &, const TQByteArray *)));
-			connect(d->sasl, TQT_SIGNAL(nextStep(const TQByteArray &)), TQT_SLOT(sasl_nextStep(const TQByteArray &)));
-			connect(d->sasl, TQT_SIGNAL(needParams(bool, bool, bool, bool)), TQT_SLOT(sasl_needParams(bool, bool, bool, bool)));
-			connect(d->sasl, TQT_SIGNAL(authenticated()), TQT_SLOT(sasl_authenticated()));
-			connect(d->sasl, TQT_SIGNAL(error(int)), TQT_SLOT(sasl_error(int)));
+			connect(d->sasl, TQ_SIGNAL(clientFirstStep(const TQString &, const TQByteArray *)), TQ_SLOT(sasl_clientFirstStep(const TQString &, const TQByteArray *)));
+			connect(d->sasl, TQ_SIGNAL(nextStep(const TQByteArray &)), TQ_SLOT(sasl_nextStep(const TQByteArray &)));
+			connect(d->sasl, TQ_SIGNAL(needParams(bool, bool, bool, bool)), TQ_SLOT(sasl_needParams(bool, bool, bool, bool)));
+			connect(d->sasl, TQ_SIGNAL(authenticated()), TQ_SLOT(sasl_authenticated()));
+			connect(d->sasl, TQ_SIGNAL(error(int)), TQ_SLOT(sasl_error(int)));
 
 			if(d->haveLocalAddr)
 				d->sasl->setLocalAddr(d->localAddr, d->localPort);
@@ -1531,7 +1531,7 @@ bool ClientStream::handleNeed()
 		}
 		case CoreProtocol::NSASLLayer: {
 			// SecureStream will handle the errors from this point
-			disconnect(d->sasl, TQT_SIGNAL(error(int)), this, TQT_SLOT(sasl_error(int)));
+			disconnect(d->sasl, TQ_SIGNAL(error(int)), this, TQ_SLOT(sasl_error(int)));
 			d->ss->setLayerSASL(d->sasl, d->client.spare);
 			if(d->sasl_ssf > 0) {
 				TQGuardedPtr<TQObject> self = this;
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp
index 86092bad..51e75bbf 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp
@@ -53,11 +53,11 @@ TQCATLSHandler::TQCATLSHandler(TQCA::TLS *parent)
 {
 	d = new Private;
 	d->tls = parent;
-	connect(d->tls, TQT_SIGNAL(handshaken()), TQT_SLOT(tls_handshaken()));
-	connect(d->tls, TQT_SIGNAL(readyRead()), TQT_SLOT(tls_readyRead()));
-	connect(d->tls, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(tls_readyReadOutgoing(int)));
-	connect(d->tls, TQT_SIGNAL(closed()), TQT_SLOT(tls_closed()));
-	connect(d->tls, TQT_SIGNAL(error(int)), TQT_SLOT(tls_error(int)));
+	connect(d->tls, TQ_SIGNAL(handshaken()), TQ_SLOT(tls_handshaken()));
+	connect(d->tls, TQ_SIGNAL(readyRead()), TQ_SLOT(tls_readyRead()));
+	connect(d->tls, TQ_SIGNAL(readyReadOutgoing(int)), TQ_SLOT(tls_readyReadOutgoing(int)));
+	connect(d->tls, TQ_SIGNAL(closed()), TQ_SLOT(tls_closed()));
+	connect(d->tls, TQ_SIGNAL(error(int)), TQ_SLOT(tls_error(int)));
 	d->state = 0;
 	d->err = -1;
 }
@@ -88,7 +88,7 @@ void TQCATLSHandler::startClient(const TQString &host)
 	d->state = 0;
 	d->err = -1;
 	if(!d->tls->startClient(host))
-		TQTimer::singleShot(0, this, TQT_SIGNAL(fail()));
+		TQTimer::singleShot(0, this, TQ_SIGNAL(fail()));
 }
 
 void TQCATLSHandler::write(const TQByteArray &a)
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
index 08c5c415..f03ab71b 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
@@ -50,8 +50,8 @@
 //!  Session::Session()
 //!  {
 //!    client = new Client;
-//!    connect(client, TQT_SIGNAL(handshaken()), TQT_SLOT(clientHandshaken()));
-//!    connect(client, TQT_SIGNAL(authFinished(bool, int, const TQString &)), TQT_SLOT(authFinished(bool, int, const TQString &)));
+//!    connect(client, TQ_SIGNAL(handshaken()), TQ_SLOT(clientHandshaken()));
+//!    connect(client, TQ_SIGNAL(authFinished(bool, int, const TQString &)), TQ_SLOT(authFinished(bool, int, const TQString &)));
 //!    client->connectToHost("jabber.org");
 //!  }
 //!
@@ -162,10 +162,10 @@ Client::Client(TQObject *par)
 	d->stream = 0;
 
 	d->s5bman = new S5BManager(this);
-	connect(d->s5bman, TQT_SIGNAL(incomingReady()), TQT_SLOT(s5b_incomingReady()));
+	connect(d->s5bman, TQ_SIGNAL(incomingReady()), TQ_SLOT(s5b_incomingReady()));
 
 	d->ibbman = new IBBManager(this);
-	connect(d->ibbman, TQT_SIGNAL(incomingReady()), TQT_SLOT(ibb_incomingReady()));
+	connect(d->ibbman, TQ_SIGNAL(incomingReady()), TQ_SLOT(ibb_incomingReady()));
 
 	d->jlman = new JidLinkManager(this);
 
@@ -188,14 +188,14 @@ Client::~Client()
 void Client::connectToServer(ClientStream *s, const Jid &j, bool auth)
 {
 	d->stream = s;
-	//connect(d->stream, TQT_SIGNAL(connected()), TQT_SLOT(streamConnected()));
-	//connect(d->stream, TQT_SIGNAL(handshaken()), TQT_SLOT(streamHandshaken()));
-	connect(d->stream, TQT_SIGNAL(error(int)), TQT_SLOT(streamError(int)));
-	//connect(d->stream, TQT_SIGNAL(sslCertificateReady(const TQSSLCert &)), TQT_SLOT(streamSSLCertificateReady(const TQSSLCert &)));
-	connect(d->stream, TQT_SIGNAL(readyRead()), TQT_SLOT(streamReadyRead()));
-	//connect(d->stream, TQT_SIGNAL(closeFinished()), TQT_SLOT(streamCloseFinished()));
-	connect(d->stream, TQT_SIGNAL(incomingXml(const TQString &)), TQT_SLOT(streamIncomingXml(const TQString &)));
-	connect(d->stream, TQT_SIGNAL(outgoingXml(const TQString &)), TQT_SLOT(streamOutgoingXml(const TQString &)));
+	//connect(d->stream, TQ_SIGNAL(connected()), TQ_SLOT(streamConnected()));
+	//connect(d->stream, TQ_SIGNAL(handshaken()), TQ_SLOT(streamHandshaken()));
+	connect(d->stream, TQ_SIGNAL(error(int)), TQ_SLOT(streamError(int)));
+	//connect(d->stream, TQ_SIGNAL(sslCertificateReady(const TQSSLCert &)), TQ_SLOT(streamSSLCertificateReady(const TQSSLCert &)));
+	connect(d->stream, TQ_SIGNAL(readyRead()), TQ_SLOT(streamReadyRead()));
+	//connect(d->stream, TQ_SIGNAL(closeFinished()), TQ_SLOT(streamCloseFinished()));
+	connect(d->stream, TQ_SIGNAL(incomingXml(const TQString &)), TQ_SLOT(streamIncomingXml(const TQString &)));
+	connect(d->stream, TQ_SIGNAL(outgoingXml(const TQString &)), TQ_SLOT(streamOutgoingXml(const TQString &)));
 
 	d->stream->connectToServer(j, auth);
 }
@@ -213,14 +213,14 @@ void Client::start(const TQString &host, const TQString &user, const TQString &p
 	d->resourceList += Resource(resource(), stat);
 
 	JT_PushPresence *pp = new JT_PushPresence(rootTask());
-	connect(pp, TQT_SIGNAL(subscription(const Jid &, const TQString &)), TQT_SLOT(ppSubscription(const Jid &, const TQString &)));
-	connect(pp, TQT_SIGNAL(presence(const Jid &, const Status &)), TQT_SLOT(ppPresence(const Jid &, const Status &)));
+	connect(pp, TQ_SIGNAL(subscription(const Jid &, const TQString &)), TQ_SLOT(ppSubscription(const Jid &, const TQString &)));
+	connect(pp, TQ_SIGNAL(presence(const Jid &, const Status &)), TQ_SLOT(ppPresence(const Jid &, const Status &)));
 
 	JT_PushMessage *pm = new JT_PushMessage(rootTask());
-	connect(pm, TQT_SIGNAL(message(const Message &)), TQT_SLOT(pmMessage(const Message &)));
+	connect(pm, TQ_SIGNAL(message(const Message &)), TQ_SLOT(pmMessage(const Message &)));
 
 	JT_PushRoster *pr = new JT_PushRoster(rootTask());
-	connect(pr, TQT_SIGNAL(roster(const Roster &)), TQT_SLOT(prRoster(const Roster &)));
+	connect(pr, TQ_SIGNAL(roster(const Roster &)), TQ_SLOT(prRoster(const Roster &)));
 
 	new JT_ServInfo(rootTask());
 	new PongServer(rootTask());
@@ -884,7 +884,7 @@ void Client::rosterRequest()
 		return;
 
 	JT_Roster *r = new JT_Roster(rootTask());
-	connect(r, TQT_SIGNAL(finished()), TQT_SLOT(slotRosterRequestFinished()));
+	connect(r, TQ_SIGNAL(finished()), TQ_SLOT(slotRosterRequestFinished()));
 	r->get();
 	d->roster.flagAllForDelete(); // mod_groups patch
 	r->go(true);
@@ -1163,7 +1163,7 @@ Task::Task(Task *parent)
 
 	d->client = parent->client();
 	d->id = client()->genUniqueId();
-	connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected()));
+	connect(d->client, TQ_SIGNAL(disconnected()), TQ_SLOT(clientDisconnected()));
 }
 
 Task::Task(Client *parent, bool)
@@ -1172,7 +1172,7 @@ Task::Task(Client *parent, bool)
 	init();
 
 	d->client = parent;
-	connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected()));
+	connect(d->client, TQ_SIGNAL(disconnected()), TQ_SLOT(clientDisconnected()));
 }
 
 Task::~Task()
@@ -1276,7 +1276,7 @@ void Task::onDisconnect()
 		d->statusString = tr("Disconnected");
 
 		// delay this so that tasks that react don't block the shutdown
-		TQTimer::singleShot(0, this, TQT_SLOT(done()));
+		TQTimer::singleShot(0, this, TQ_SLOT(done()));
 	}
 }
 
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
index c331e123..e7e929ab 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
@@ -270,7 +270,7 @@ void JT_UnRegister::onGo()
 
 	d->jt_reg = new JT_Register(this);
 	d->jt_reg->getForm(d->j);
-	connect(d->jt_reg, TQT_SIGNAL(finished()), TQT_SLOT(getFormFinished()));
+	connect(d->jt_reg, TQ_SIGNAL(finished()), TQ_SLOT(getFormFinished()));
 	d->jt_reg->go(false);
 }
 
@@ -279,7 +279,7 @@ void JT_UnRegister::getFormFinished()
 	disconnect(d->jt_reg, 0, this, 0);
 
 	d->jt_reg->unreg(d->j);
-	connect(d->jt_reg, TQT_SIGNAL(finished()), TQT_SLOT(unregFinished()));
+	connect(d->jt_reg, TQ_SIGNAL(finished()), TQ_SLOT(unregFinished()));
 	d->jt_reg->go(false);
 }
 
diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp
index 470a9f2e..709255a7 100644
--- a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp
+++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp
@@ -76,14 +76,14 @@ void JabberDiscoProtocol::openConnection ()
 	{
 		m_jabberClient = new JabberClient;
 	
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( csDisconnected () ), this, TQT_SLOT ( slotCSDisconnected () ) );
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( csError ( int ) ), this, TQT_SLOT ( slotCSError ( int ) ) );
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( tlsWarning ( int ) ), this, TQT_SLOT ( slotHandleTLSWarning ( int ) ) );
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) );
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( error ( JabberClient::ErrorCode ) ), this, TQT_SLOT ( slotClientError ( JabberClient::ErrorCode ) ) );
-
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( debugMessage ( const TQString & ) ),
-				   this, TQT_SLOT ( slotClientDebugMessage ( const TQString & ) ) );
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( csDisconnected () ), this, TQ_SLOT ( slotCSDisconnected () ) );
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( csError ( int ) ), this, TQ_SLOT ( slotCSError ( int ) ) );
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( tlsWarning ( int ) ), this, TQ_SLOT ( slotHandleTLSWarning ( int ) ) );
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( connected () ), this, TQ_SLOT ( slotConnected () ) );
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( error ( JabberClient::ErrorCode ) ), this, TQ_SLOT ( slotClientError ( JabberClient::ErrorCode ) ) );
+
+		TQObject::connect ( m_jabberClient, TQ_SIGNAL ( debugMessage ( const TQString & ) ),
+				   this, TQ_SLOT ( slotClientDebugMessage ( const TQString & ) ) );
 	}
 	else
 	{
@@ -232,7 +232,7 @@ void JabberDiscoProtocol::slotConnected ()
 		case ListDir:	// list a directory
 						kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Listing directory..." << endl;
 						discoTask = new XMPP::JT_DiscoItems ( m_jabberClient->rootTask () );
-						connect ( discoTask, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotQueryFinished () ) );
+						connect ( discoTask, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( slotQueryFinished () ) );
 						discoTask->get ( m_host );
 						discoTask->go ( true );
 						break;
diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp
index 10c11b0f..64970573 100644
--- a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp
@@ -45,7 +45,7 @@ dlgJabberBrowse::dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid,
 
 	XMPP::JT_Search * task = new XMPP::JT_Search (m_account->client()->rootTask ());
 
-	connect (task, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotGotForm ()));
+	connect (task, TQ_SIGNAL (finished ()), this, TQ_SLOT (slotGotForm ()));
 
 	task->get (jid);
 	task->go (true);
@@ -83,7 +83,7 @@ void dlgJabberBrowse::slotGotForm ()
 		tblResults->setColumnStretchable (i, true);
 	}
 
-	connect (btnSearch, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotSendForm ()));
+	connect (btnSearch, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotSendForm ()));
 
 }
 
@@ -92,7 +92,7 @@ void dlgJabberBrowse::slotSendForm ()
 
 	XMPP::JT_Search * task = new XMPP::JT_Search (m_account->client()->rootTask ());
 
-	connect (task, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotSentForm ()));
+	connect (task, TQ_SIGNAL (finished ()), this, TQ_SLOT (slotSentForm ()));
 
 	task->set (translator->resultData ());
 	task->go (true);
diff --git a/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp b/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp
index c890b158..dd2ffd62 100644
--- a/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp
@@ -80,7 +80,7 @@ void DlgJabberChangePassword::slotOk ()
 										  i18n ( "Your account needs to be connected before the password can be changed. Do you want to try to connect now?" ),
 										  i18n ( "Jabber Password Change" ), i18n("Connect"), i18n("Stay Offline") ) == KMessageBox::Yes )
 		{
-			connect ( m_account, TQT_SIGNAL ( isConnectedChanged () ), this, TQT_SLOT ( slotChangePassword () ) );
+			connect ( m_account, TQ_SIGNAL ( isConnectedChanged () ), this, TQ_SLOT ( slotChangePassword () ) );
 			m_account->connect ();
 		}
 	}
@@ -102,7 +102,7 @@ void DlgJabberChangePassword::slotChangePassword ()
 {
 
 	XMPP::JT_Register *task = new XMPP::JT_Register ( m_account->client()->rootTask () );
-	TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotChangePasswordDone () ) );
+	TQObject::connect ( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( slotChangePasswordDone () ) );
 
 	task->changepw ( m_mainWidget->peNewPassword1->password () );
 	task->go ( true );
diff --git a/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp b/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp
index 46071122..5988c712 100644
--- a/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp
@@ -77,7 +77,7 @@ void dlgJabberChatJoin::slotBowse()
 void dlgJabberChatJoin::checkDefaultChatroomServer()
 {
 	XMPP::JT_GetServices *serviceTask = new XMPP::JT_GetServices(m_account->client()->rootTask());
-	connect(serviceTask, TQT_SIGNAL (finished()), this, TQT_SLOT (slotQueryFinished()));
+	connect(serviceTask, TQ_SIGNAL (finished()), this, TQ_SLOT (slotQueryFinished()));
 
 	serviceTask->get(m_account->server());
 	serviceTask->go(true);
@@ -97,7 +97,7 @@ void dlgJabberChatJoin::slotQueryFinished()
 	for (XMPP::AgentList::const_iterator it = task->agents().begin(); it != task->agents().end(); ++it)
 	{
 		XMPP::JT_DiscoInfo *discoTask = new XMPP::JT_DiscoInfo(m_account->client()->rootTask());
-		connect(discoTask, TQT_SIGNAL (finished()), this, TQT_SLOT (slotDiscoFinished()));
+		connect(discoTask, TQ_SIGNAL (finished()), this, TQ_SLOT (slotDiscoFinished()));
 
 		discoTask->get((*it).jid().full());
 		discoTask->go(true);
diff --git a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp
index 3afea298..4fec5b7f 100644
--- a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp
@@ -74,7 +74,7 @@ void dlgJabberChatRoomsList::slotQuery()
 	tblChatRoomsList->setNumRows(0);
 
 	XMPP::JT_DiscoItems *discoTask = new XMPP::JT_DiscoItems(m_account->client()->rootTask());
-	connect (discoTask, TQT_SIGNAL(finished()), this, TQT_SLOT(slotQueryFinished()));
+	connect (discoTask, TQ_SIGNAL(finished()), this, TQ_SLOT(slotQueryFinished()));
 
 	m_chatServer = leServer->text();
 	discoTask->get(leServer->text());
diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.cpp b/kopete/protocols/jabber/ui/dlgjabberregister.cpp
index 0f6f55f4..5d46695b 100644
--- a/kopete/protocols/jabber/ui/dlgjabberregister.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberregister.cpp
@@ -32,7 +32,7 @@ dlgJabberRegister::dlgJabberRegister (JabberAccount *account, const XMPP::Jid &
 
 	XMPP::JT_Register * task = new XMPP::JT_Register(m_account->client()->rootTask ());
 
-	connect (task, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotGotForm ()));
+	connect (task, TQ_SIGNAL (finished ()), this, TQ_SLOT (slotGotForm ()));
 
 	task->getForm (jid);
 	task->go (true);
@@ -66,7 +66,7 @@ void dlgJabberRegister::slotGotForm ()
 	// enable the send button
 	btnRegister->setEnabled (true);
 
-	connect (btnRegister, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotSendForm ()));
+	connect (btnRegister, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotSendForm ()));
 
 }
 
@@ -76,7 +76,7 @@ void dlgJabberRegister::slotSendForm ()
 		return;
 	XMPP::JT_Register * task = new XMPP::JT_Register (m_account->client()->rootTask ());
 
-	connect (task, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotSentForm ()));
+	connect (task, TQ_SIGNAL (finished ()), this, TQ_SLOT (slotSentForm ()));
 
 	task->setForm (translator->resultData ());
 	task->go (true);
diff --git a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp
index 499eb2b7..c665847c 100644
--- a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp
@@ -28,10 +28,10 @@ dlgJabberSendRaw::dlgJabberSendRaw ( JabberClient *client, TQWidget *parent, con
 	: DlgSendRaw (parent, name)
 {
 	// Connect the GUI elements to things that do stuff
-	connect (btnSend, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotSend ()));
-	connect (btnClose, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotCancel ()));
-	connect (btnClear, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotClear ()));
-	connect (inputWidget, TQT_SIGNAL (activated (int)), this, TQT_SLOT (slotCreateMessage (int)));
+	connect (btnSend, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotSend ()));
+	connect (btnClose, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotCancel ()));
+	connect (btnClear, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotClear ()));
+	connect (inputWidget, TQ_SIGNAL (activated (int)), this, TQ_SLOT (slotCreateMessage (int)));
 
 	m_client = client;
 
diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.cpp b/kopete/protocols/jabber/ui/dlgjabberservices.cpp
index bf0eaa27..11839b79 100644
--- a/kopete/protocols/jabber/ui/dlgjabberservices.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberservices.cpp
@@ -63,12 +63,12 @@ dlgJabberServices::dlgJabberServices (JabberAccount *account, TQWidget *parent,
 	//tblServices->horizontalHeader ()->setLabel (0, i18n ("Name"));
 	//tblServices->horizontalHeader ()->setLabel (1, i18n ("Address"));
 
-	connect (btnQuery, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotDisco ()));
-	//connect (tblServices, TQT_SIGNAL (clicked (int, int, int, const TQPoint &)), this, TQT_SLOT (slotSetSelection (int, int, int, const TQPoint &)));
-	connect (lvServices, TQT_SIGNAL (selectionChanged (TQListViewItem *)), this, TQT_SLOT (slotSetSelection (TQListViewItem *)));
+	connect (btnQuery, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotDisco ()));
+	//connect (tblServices, TQ_SIGNAL (clicked (int, int, int, const TQPoint &)), this, TQ_SLOT (slotSetSelection (int, int, int, const TQPoint &)));
+	connect (lvServices, TQ_SIGNAL (selectionChanged (TQListViewItem *)), this, TQ_SLOT (slotSetSelection (TQListViewItem *)));
 
-	connect (btnRegister, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotRegister ()));
-	connect (btnBrowse, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotBrowse ()));
+	connect (btnRegister, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotRegister ()));
+	connect (btnBrowse, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotBrowse ()));
 
 }
 
@@ -99,7 +99,7 @@ void dlgJabberServices::slotService ()
 	}
 	
 	XMPP::JT_GetServices *serviceTask = new XMPP::JT_GetServices (m_account->client()->rootTask ());
-	connect (serviceTask, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotServiceFinished ()));
+	connect (serviceTask, TQ_SIGNAL (finished ()), this, TQ_SLOT (slotServiceFinished ()));
 
 	/* populate server field if it is empty */
 	if(leServer->text().isEmpty())
@@ -148,7 +148,7 @@ void dlgJabberServices::slotDisco()
 	}
 	
 	JT_DiscoItems *jt = new JT_DiscoItems(m_account->client()->rootTask());
-	connect(jt, TQT_SIGNAL(finished()), this, TQT_SLOT(slotDiscoFinished()));
+	connect(jt, TQ_SIGNAL(finished()), this, TQ_SLOT(slotDiscoFinished()));
 	
 	/* populate server field if it is empty */
 	if(leServer->text().isEmpty())
@@ -214,7 +214,7 @@ dlgJabberServices::~dlgJabberServices ()
 void dlgJabberServies_item::updateInfo( const XMPP::Jid & jid , const TQString & node , JabberAccount *account )
 {
 	XMPP::JT_DiscoInfo *jt = new XMPP::JT_DiscoInfo(account->client()->rootTask());
-	connect(jt, TQT_SIGNAL(finished()),this, TQT_SLOT(slotDiscoFinished()));
+	connect(jt, TQ_SIGNAL(finished()),this, TQ_SLOT(slotDiscoFinished()));
 	jt->get(jid, node);
 	jt->go(true);
 
diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
index 3f12b2f5..6dbc4456 100644
--- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
@@ -70,14 +70,14 @@ dlgJabberVCard::dlgJabberVCard (JabberAccount *account, JabberBaseContact *conta
 	m_mainWidget = new dlgVCard(this);
 	setMainWidget(m_mainWidget);
 
-	connect (this, TQT_SIGNAL (user1Clicked()), this, TQT_SLOT (slotSaveVCard ()));
-	connect (this, TQT_SIGNAL( user2Clicked()), this, TQT_SLOT (slotGetVCard ()));
+	connect (this, TQ_SIGNAL (user1Clicked()), this, TQ_SLOT (slotSaveVCard ()));
+	connect (this, TQ_SIGNAL( user2Clicked()), this, TQ_SLOT (slotGetVCard ()));
 
-	connect (m_mainWidget->btnSelectPhoto, TQT_SIGNAL (clicked()), this, TQT_SLOT (slotSelectPhoto()));
-	connect (m_mainWidget->btnClearPhoto, TQT_SIGNAL (clicked()), this, TQT_SLOT (slotClearPhoto()));
-	connect (m_mainWidget->urlHomeEmail, TQT_SIGNAL (leftClickedURL(const TQString &)), this, TQT_SLOT (slotOpenURL (const TQString &)));
-	connect (m_mainWidget->urlWorkEmail, TQT_SIGNAL (leftClickedURL(const TQString &)), this, TQT_SLOT (slotOpenURL (const TQString &)));
-	connect (m_mainWidget->urlHomepage, TQT_SIGNAL (leftClickedURL(const TQString &)), this, TQT_SLOT (slotOpenURL (const TQString &)));
+	connect (m_mainWidget->btnSelectPhoto, TQ_SIGNAL (clicked()), this, TQ_SLOT (slotSelectPhoto()));
+	connect (m_mainWidget->btnClearPhoto, TQ_SIGNAL (clicked()), this, TQ_SLOT (slotClearPhoto()));
+	connect (m_mainWidget->urlHomeEmail, TQ_SIGNAL (leftClickedURL(const TQString &)), this, TQ_SLOT (slotOpenURL (const TQString &)));
+	connect (m_mainWidget->urlWorkEmail, TQ_SIGNAL (leftClickedURL(const TQString &)), this, TQ_SLOT (slotOpenURL (const TQString &)));
+	connect (m_mainWidget->urlHomepage, TQ_SIGNAL (leftClickedURL(const TQString &)), this, TQ_SLOT (slotOpenURL (const TQString &)));
 
 	assignContactProperties();
 
@@ -407,7 +407,7 @@ void dlgJabberVCard::slotSaveVCard()
 
 	XMPP::JT_VCard *task = new XMPP::JT_VCard( m_account->client()->rootTask() );
 	// signal to ourselves when the vCard data arrived
-	TQObject::connect(task, TQT_SIGNAL(finished()), this, TQT_SLOT(slotVCardSaved()));
+	TQObject::connect(task, TQ_SIGNAL(finished()), this, TQ_SLOT(slotVCardSaved()));
 	task->set(vCard);
 	task->go(true);
 }
@@ -438,7 +438,7 @@ void dlgJabberVCard::slotGetVCard()
 
 	XMPP::JT_VCard *task = new XMPP::JT_VCard ( m_account->client()->rootTask() );
 	// signal to ourselves when the vCard data arrived
-	TQObject::connect( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotGotVCard () ) );
+	TQObject::connect( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( slotGotVCard () ) );
 	task->get ( m_contact->rosterItem().jid().full() );
 	task->go ( true );	
 }
diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp
index 0fc940c9..2379f261 100644
--- a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp
+++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp
@@ -51,7 +51,7 @@ JabberAddContactPage::JabberAddContactPage (Kopete::Account * owner, TQWidget *
 		{
 			jabData->textLabel1->setText( i18n("Loading instruction from gateway...") );
 			XMPP::JT_Gateway * gatewayTask = new XMPP::JT_Gateway ( jaccount->client()->rootTask () );
-			TQObject::connect (gatewayTask, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotPromtReceived()));
+			TQObject::connect (gatewayTask, TQ_SIGNAL (finished ()), this, TQ_SLOT (slotPromtReceived()));
 			gatewayTask->get ( transport->myself()->contactId() );
 			gatewayTask->go ( true );
 		}
@@ -91,7 +91,7 @@ bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact
 			XMPP::JT_Gateway * gatewayTask = new XMPP::JT_Gateway ( jaccount->client()->rootTask () );
 			JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND *workaround = 
 					new JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( transport , parentContact , gatewayTask );
-			TQObject::connect (gatewayTask, TQT_SIGNAL (finished ()), workaround, TQT_SLOT (slotJidReceived()));
+			TQObject::connect (gatewayTask, TQ_SIGNAL (finished ()), workaround, TQ_SLOT (slotJidReceived()));
 			gatewayTask->set ( transport->myself()->contactId() , contactId );
 			gatewayTask->go ( true );
 			return true;
diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.cpp b/kopete/protocols/jabber/ui/jabberchooseserver.cpp
index 9221b2c4..47721e55 100644
--- a/kopete/protocols/jabber/ui/jabberchooseserver.cpp
+++ b/kopete/protocols/jabber/ui/jabberchooseserver.cpp
@@ -48,11 +48,11 @@ JabberChooseServer::JabberChooseServer ( JabberRegisterAccount *parent, const ch
 	// retrieve server list
 	mTransferJob = TDEIO::get ( "http://www.jabber.org/servers.xml" );
 
-	connect ( mTransferJob, TQT_SIGNAL ( result ( TDEIO::Job* ) ), this, TQT_SLOT ( slotTransferResult ( TDEIO::Job* ) ) );
-	connect ( mTransferJob, TQT_SIGNAL ( data ( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT ( slotTransferData ( TDEIO::Job*, const TQByteArray& ) ) );
+	connect ( mTransferJob, TQ_SIGNAL ( result ( TDEIO::Job* ) ), this, TQ_SLOT ( slotTransferResult ( TDEIO::Job* ) ) );
+	connect ( mTransferJob, TQ_SIGNAL ( data ( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT ( slotTransferData ( TDEIO::Job*, const TQByteArray& ) ) );
 
-	connect ( mMainWidget->listServers, TQT_SIGNAL ( pressed ( int, int, int, const TQPoint & ) ), this, TQT_SLOT ( slotSetSelection ( int ) ) );
-	connect ( mMainWidget->listServers, TQT_SIGNAL ( doubleClicked ( int, int, int, const TQPoint & ) ), this, TQT_SLOT ( slotOk () ) );
+	connect ( mMainWidget->listServers, TQ_SIGNAL ( pressed ( int, int, int, const TQPoint & ) ), this, TQ_SLOT ( slotSetSelection ( int ) ) );
+	connect ( mMainWidget->listServers, TQ_SIGNAL ( doubleClicked ( int, int, int, const TQPoint & ) ), this, TQ_SLOT ( slotOk () ) );
 
 	enableButtonOK ( false );
 
diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
index 6db53bff..e951b0ac 100644
--- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
+++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
@@ -46,12 +46,12 @@ JabberEditAccountWidget::JabberEditAccountWidget (JabberProtocol * proto, Jabber
 
 	m_protocol = proto;
 
-	connect (mID, TQT_SIGNAL (textChanged (const TQString &)), this, TQT_SLOT (updateServerField ()));
-	connect (cbCustomServer, TQT_SIGNAL (toggled (bool)), this, TQT_SLOT (updateServerField ()));
+	connect (mID, TQ_SIGNAL (textChanged (const TQString &)), this, TQ_SLOT (updateServerField ()));
+	connect (cbCustomServer, TQ_SIGNAL (toggled (bool)), this, TQ_SLOT (updateServerField ()));
 
-	connect (cbUseSSL, TQT_SIGNAL (toggled (bool)), this, TQT_SLOT (sslToggled (bool)));
+	connect (cbUseSSL, TQ_SIGNAL (toggled (bool)), this, TQ_SLOT (sslToggled (bool)));
 
-	connect (btnChangePassword, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( slotChangePasswordClicked () ));
+	connect (btnChangePassword, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( slotChangePasswordClicked () ));
 
 	if (account())
 	{
@@ -63,7 +63,7 @@ JabberEditAccountWidget::JabberEditAccountWidget (JabberProtocol * proto, Jabber
 	{
 		// this is a new account
 		btnChangePassword->setEnabled ( false );
-		connect (btnRegister, TQT_SIGNAL (clicked ()), this, TQT_SLOT (registerClicked ()));
+		connect (btnRegister, TQ_SIGNAL (clicked ()), this, TQ_SLOT (registerClicked ()));
 	}
 }
 
@@ -264,7 +264,7 @@ void JabberEditAccountWidget::slotChangePasswordClicked ()
 
 	DlgJabberChangePassword *passwordDlg = new DlgJabberChangePassword ( account (), this );
 
-	connect ( passwordDlg, TQT_SIGNAL ( destroyed () ), this, TQT_SLOT ( slotChangePasswordFinished () ) );
+	connect ( passwordDlg, TQ_SIGNAL ( destroyed () ), this, TQ_SLOT ( slotChangePasswordFinished () ) );
 
 	passwordDlg->show ();
 
diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
index a75e206e..ca7f0723 100644
--- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
+++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
@@ -68,9 +68,9 @@ JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *parent,
 	// clear variables
 	jabberClient = new JabberClient ();
 
-	connect ( jabberClient, TQT_SIGNAL ( csError ( int ) ), this, TQT_SLOT ( slotCSError ( int ) ) );
-	connect ( jabberClient, TQT_SIGNAL ( tlsWarning ( int ) ), this, TQT_SLOT ( slotHandleTLSWarning ( int ) ) );
-	connect ( jabberClient, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) );
+	connect ( jabberClient, TQ_SIGNAL ( csError ( int ) ), this, TQ_SLOT ( slotCSError ( int ) ) );
+	connect ( jabberClient, TQ_SIGNAL ( tlsWarning ( int ) ), this, TQ_SLOT ( slotHandleTLSWarning ( int ) ) );
+	connect ( jabberClient, TQ_SIGNAL ( connected () ), this, TQ_SLOT ( slotConnected () ) );
 	
 	jidRegExp.setPattern ( "[\\w\\d.+_-]{1,}@[\\w\\d.-]{1,}" );
 	hintPixmap = TDEGlobal::iconLoader()->loadIcon ( "jabber_online", TDEIcon::Small );
@@ -86,16 +86,16 @@ JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *parent,
 	mMainWidget->cbUseSSL->setChecked ( parent->cbUseSSL->isChecked () );
 
 	// connect buttons to slots, ok is already connected by default
-	connect ( this, TQT_SIGNAL ( cancelClicked () ), this, TQT_SLOT ( slotDeleteDialog () ) );
-	connect ( mMainWidget->btnChooseServer, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotChooseServer () ) );
-	connect ( mMainWidget->leServer, TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( slotJIDInformation () ) );
-	connect ( mMainWidget->leJID, TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( slotJIDInformation () ) );
-	connect ( mMainWidget->cbUseSSL, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( slotSSLToggled () ) );
+	connect ( this, TQ_SIGNAL ( cancelClicked () ), this, TQ_SLOT ( slotDeleteDialog () ) );
+	connect ( mMainWidget->btnChooseServer, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotChooseServer () ) );
+	connect ( mMainWidget->leServer, TQ_SIGNAL ( textChanged ( const TQString & ) ), this, TQ_SLOT ( slotJIDInformation () ) );
+	connect ( mMainWidget->leJID, TQ_SIGNAL ( textChanged ( const TQString & ) ), this, TQ_SLOT ( slotJIDInformation () ) );
+	connect ( mMainWidget->cbUseSSL, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( slotSSLToggled () ) );
 
-	connect ( mMainWidget->leServer, TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( validateData () ) );
-	connect ( mMainWidget->leJID, TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( validateData () ) );
-	connect ( mMainWidget->lePassword, TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( validateData () ) );
-	connect ( mMainWidget->lePasswordVerify, TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( validateData () ) );
+	connect ( mMainWidget->leServer, TQ_SIGNAL ( textChanged ( const TQString & ) ), this, TQ_SLOT ( validateData () ) );
+	connect ( mMainWidget->leJID, TQ_SIGNAL ( textChanged ( const TQString & ) ), this, TQ_SLOT ( validateData () ) );
+	connect ( mMainWidget->lePassword, TQ_SIGNAL ( textChanged ( const TQString & ) ), this, TQ_SLOT ( validateData () ) );
+	connect ( mMainWidget->lePasswordVerify, TQ_SIGNAL ( textChanged ( const TQString & ) ), this, TQ_SLOT ( validateData () ) );
 
 	// display JID info now
 	slotJIDInformation ();
@@ -329,7 +329,7 @@ void JabberRegisterAccount::slotConnected ()
 	mMainWidget->lblStatusMessage->setText ( i18n ( "Connected successfully, registering new account..." ) );
 
 	XMPP::JT_Register * task = new XMPP::JT_Register (jabberClient->rootTask ());
-	TQObject::connect (task, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotRegisterUserDone ()));
+	TQObject::connect (task, TQ_SIGNAL (finished ()), this, TQ_SLOT (slotRegisterUserDone ()));
 	task->reg (mMainWidget->leJID->text().section("@", 0, 0), mMainWidget->lePassword->password ());
 	task->go (true);
 
@@ -371,7 +371,7 @@ void JabberRegisterAccount::slotRegisterUserDone ()
 		// rewire buttons
 		enableButtonOK ( false );
 		setButtonCancel ( KStdGuiItem::close () );
-		connect ( this, TQT_SIGNAL ( closeClicked () ), this, TQT_SLOT ( slotDeleteDialog () ) );
+		connect ( this, TQ_SIGNAL ( closeClicked () ), this, TQ_SLOT ( slotDeleteDialog () ) );
 	}
 	else
 	{
@@ -384,7 +384,7 @@ void JabberRegisterAccount::slotRegisterUserDone ()
 
 	// FIXME: this is required because Iris crashes if we try
 	//        to disconnect here. Hopefully Justin can fix this.
-	TQTimer::singleShot(0, this, TQT_SLOT(disconnect ()));
+	TQTimer::singleShot(0, this, TQ_SLOT(disconnect ()));
 
 }