Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 1329ec6abbcb7b79cd960e0ca138f16598d5f11f)

9 files changed, 143 insertions, 143 deletions

diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp
index d2f35f72..464e8883 100644
--- a/kopete/protocols/irc/libkirc/kircengine.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine.cpp
@@ -110,9 +110,9 @@ void Engine::setUseSSL( bool useSSL )
 			m_sock = new KSSLSocket;
 			m_sock->setSocketFlags( KExtendedSocket::inetSocket );
 
-			connect(m_sock, TQT_SIGNAL(certificateAccepted()), TQT_SLOT(slotConnected()));
-			connect(m_sock, TQT_SIGNAL(certificateRejected()), TQT_SLOT(slotConnectionClosed()));
-			connect(m_sock, TQT_SIGNAL(sslFailure()),          TQT_SLOT(slotConnectionClosed()));
+			connect(m_sock, TQ_SIGNAL(certificateAccepted()), TQ_SLOT(slotConnected()));
+			connect(m_sock, TQ_SIGNAL(certificateRejected()), TQ_SLOT(slotConnectionClosed()));
+			connect(m_sock, TQ_SIGNAL(sslFailure()),          TQ_SLOT(slotConnectionClosed()));
 		}
 		else
 		#else
@@ -124,12 +124,12 @@ void Engine::setUseSSL( bool useSSL )
 			m_sock = new KExtendedSocket;
 			m_sock->setSocketFlags( KExtendedSocket::inputBufferedSocket | KExtendedSocket::inetSocket );
 
-			connect(m_sock, TQT_SIGNAL(connectionSuccess()),   TQT_SLOT(slotConnected()));
-			connect(m_sock, TQT_SIGNAL(connectionFailed(int)), TQT_SLOT(error(int)));
+			connect(m_sock, TQ_SIGNAL(connectionSuccess()),   TQ_SLOT(slotConnected()));
+			connect(m_sock, TQ_SIGNAL(connectionFailed(int)), TQ_SLOT(error(int)));
 		}
 
-		connect(m_sock, TQT_SIGNAL(closed(int)), TQT_SLOT(slotConnectionClosed()));
-		connect(m_sock, TQT_SIGNAL(readyRead()), TQT_SLOT(slotReadyRead()));
+		connect(m_sock, TQ_SIGNAL(closed(int)), TQ_SLOT(slotConnectionClosed()));
+		connect(m_sock, TQ_SIGNAL(readyRead()), TQ_SLOT(slotReadyRead()));
 	}
 }
 
@@ -393,7 +393,7 @@ void Engine::slotReadyRead()
 			emit internalError(ParsingFailed, msg);
 		}
 
-		TQTimer::singleShot( 0, this, TQT_SLOT( slotReadyRead() ) );
+		TQTimer::singleShot( 0, this, TQ_SLOT( slotReadyRead() ) );
 	}
 
 	if(m_sock->socketStatus() != KExtendedSocket::connected)
@@ -474,7 +474,7 @@ EntityPtr Engine::getEntity(const TQString &name)
 		m_entities.append(entity);
 	}
 
-	connect(entity, TQT_SIGNAL(destroyed(KIRC::Entity *)), TQT_SLOT(destroyed(KIRC::Entity *)));
+	connect(entity, TQ_SIGNAL(destroyed(KIRC::Entity *)), TQ_SLOT(destroyed(KIRC::Entity *)));
 	return EntityPtr(entity);
 }
 
diff --git a/kopete/protocols/irc/libkirc/kircengine_commands.cpp b/kopete/protocols/irc/libkirc/kircengine_commands.cpp
index 8aa5916e..7044bebc 100644
--- a/kopete/protocols/irc/libkirc/kircengine_commands.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine_commands.cpp
@@ -27,19 +27,19 @@ using namespace KIRC;
 
 void Engine::bindCommands()
 {
-	bind("ERROR",	this, TQT_SLOT(error(KIRC::Message &)),	0, 0);
-	bind("JOIN",	this, TQT_SLOT(join(KIRC::Message &)),	0, 1);
-	bind("KICK",	this, TQT_SLOT(kick(KIRC::Message &)),	2, 2);
-	bind("NICK",	this, TQT_SLOT(nick(KIRC::Message &)),	0, 0);
-	bind("MODE",	this, TQT_SLOT(mode(KIRC::Message &)),	1, 1);
-	bind("NOTICE",	this, TQT_SLOT(notice(KIRC::Message &)),	1, 1);
-	bind("PART",	this, TQT_SLOT(part(KIRC::Message &)),	1, 1);
-	bind("PING",	this, TQT_SLOT(ping(KIRC::Message &)),	0, 0);
-	bind("PONG",	this, TQT_SLOT(pong(KIRC::Message &)),	0, 0);
-	bind("PRIVMSG",	this, TQT_SLOT(privmsg(KIRC::Message &)),	1, 1);
-	bind("QUIT",	this, TQT_SLOT(quit(KIRC::Message &)),	0, 0);
-//	bind("SQUIT",	this, TQT_SLOT(squit(KIRC::Message &)),	1, 1);
-	bind("TOPIC",	this, TQT_SLOT(topic(KIRC::Message &)),	1, 1);
+	bind("ERROR",	this, TQ_SLOT(error(KIRC::Message &)),	0, 0);
+	bind("JOIN",	this, TQ_SLOT(join(KIRC::Message &)),	0, 1);
+	bind("KICK",	this, TQ_SLOT(kick(KIRC::Message &)),	2, 2);
+	bind("NICK",	this, TQ_SLOT(nick(KIRC::Message &)),	0, 0);
+	bind("MODE",	this, TQ_SLOT(mode(KIRC::Message &)),	1, 1);
+	bind("NOTICE",	this, TQ_SLOT(notice(KIRC::Message &)),	1, 1);
+	bind("PART",	this, TQ_SLOT(part(KIRC::Message &)),	1, 1);
+	bind("PING",	this, TQ_SLOT(ping(KIRC::Message &)),	0, 0);
+	bind("PONG",	this, TQ_SLOT(pong(KIRC::Message &)),	0, 0);
+	bind("PRIVMSG",	this, TQ_SLOT(privmsg(KIRC::Message &)),	1, 1);
+	bind("QUIT",	this, TQ_SLOT(quit(KIRC::Message &)),	0, 0);
+//	bind("SQUIT",	this, TQ_SLOT(squit(KIRC::Message &)),	1, 1);
+	bind("TOPIC",	this, TQ_SLOT(topic(KIRC::Message &)),	1, 1);
 }
 
 void Engine::away(bool isAway, const TQString &awayMessage)
diff --git a/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp b/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp
index 0159f790..14462f1b 100644
--- a/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp
@@ -35,30 +35,30 @@ using namespace KIRC;
 
 void Engine::bindCtcp()
 {
-	bindCtcpQuery("ACTION",		this, TQT_SLOT(CtcpQuery_action(KIRC::Message &)),
+	bindCtcpQuery("ACTION",		this, TQ_SLOT(CtcpQuery_action(KIRC::Message &)),
 		-1,	-1);
-	bindCtcpQuery("CLIENTINFO",	this, TQT_SLOT(CtcpQuery_clientinfo(KIRC::Message &)),
+	bindCtcpQuery("CLIENTINFO",	this, TQ_SLOT(CtcpQuery_clientinfo(KIRC::Message &)),
 		-1,	1);
-	bindCtcpQuery("DCC",		this, TQT_SLOT(CtcpQuery_dcc(KIRC::Message &)),
+	bindCtcpQuery("DCC",		this, TQ_SLOT(CtcpQuery_dcc(KIRC::Message &)),
 		4,	5);
-	bindCtcpQuery("FINGER",		this, TQT_SLOT(CtcpQuery_finger(KIRC::Message &)),
+	bindCtcpQuery("FINGER",		this, TQ_SLOT(CtcpQuery_finger(KIRC::Message &)),
 		-1,	0);
-	bindCtcpQuery("PING",		this, TQT_SLOT(CtcpQuery_ping(KIRC::Message &)),
+	bindCtcpQuery("PING",		this, TQ_SLOT(CtcpQuery_ping(KIRC::Message &)),
 		1,	1);
-	bindCtcpQuery("SOURCE",		this, TQT_SLOT(CtcpQuery_source(KIRC::Message &)),
+	bindCtcpQuery("SOURCE",		this, TQ_SLOT(CtcpQuery_source(KIRC::Message &)),
 		-1,	0);
-	bindCtcpQuery("TIME",		this, TQT_SLOT(CtcpQuery_time(KIRC::Message &)),
+	bindCtcpQuery("TIME",		this, TQ_SLOT(CtcpQuery_time(KIRC::Message &)),
 		-1,	0);
-	bindCtcpQuery("USERINFO",	this, TQT_SLOT(CtcpQuery_userinfo(KIRC::Message &)),
+	bindCtcpQuery("USERINFO",	this, TQ_SLOT(CtcpQuery_userinfo(KIRC::Message &)),
 		-1,	0);
-	bindCtcpQuery("VERSION",	this, TQT_SLOT(CtcpQuery_version(KIRC::Message &)),
+	bindCtcpQuery("VERSION",	this, TQ_SLOT(CtcpQuery_version(KIRC::Message &)),
 		-1,	0);
 
-	bindCtcpReply("ERRMSG",		this, TQT_SLOT(CtcpReply_errmsg(KIRC::Message &)),
+	bindCtcpReply("ERRMSG",		this, TQ_SLOT(CtcpReply_errmsg(KIRC::Message &)),
 		1,	-1);
-	bindCtcpReply("PING",		this, TQT_SLOT(CtcpReply_ping(KIRC::Message &)),
+	bindCtcpReply("PING",		this, TQ_SLOT(CtcpReply_ping(KIRC::Message &)),
 		1,	1,	"");
-	bindCtcpReply("VERSION",	this, TQT_SLOT(CtcpReply_version(KIRC::Message &)),
+	bindCtcpReply("VERSION",	this, TQ_SLOT(CtcpReply_version(KIRC::Message &)),
 		-1,	-1,	"");
 }
 
diff --git a/kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp b/kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp
index 67d3a842..4118fe23 100644
--- a/kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp
@@ -31,69 +31,69 @@ using namespace KIRC;
 
 void Engine::bindNumericReplies()
 {
-	bind(1, this, TQT_SLOT(numericReply_001(KIRC::Message &)), 1, 1);
-	bind(2, this, TQT_SLOT(numericReply_002(KIRC::Message &)), 1, 1);
-	bind(3, this, TQT_SLOT(numericReply_003(KIRC::Message &)), 1, 1);
-	bind(4, this, TQT_SLOT(numericReply_004(KIRC::Message &)), 5, 5);
-	bind(5, this, TQT_SLOT(numericReply_004(KIRC::Message &)), 1, 1);
-
-	bind(250, this, TQT_SLOT(numericReply_250(KIRC::Message &)));
-	bind(251, this, TQT_SLOT(numericReply_251(KIRC::Message &)));
-	bind(252, this, TQT_SLOT(numericReply_252(KIRC::Message &)), 2, 2);
-	bind(253, this, TQT_SLOT(numericReply_253(KIRC::Message &)), 2, 2);
-	bind(254, this, TQT_SLOT(numericReply_254(KIRC::Message &)), 2, 2);
-	bind(255, this, TQT_SLOT(numericReply_255(KIRC::Message &)), 1, 1); // incomingConnectString
-
-	bind(263, this, TQT_SLOT(numericReply_263(KIRC::Message &))); // incomingServerLoadTooHigh
-	bind(265, this, TQT_SLOT(numericReply_265(KIRC::Message &)));
-	bind(266, this, TQT_SLOT(numericReply_266(KIRC::Message &)));
-
-	bind(301, this, TQT_SLOT(numericReply_301(KIRC::Message &)), 2, 2);
-	bind(303, this, TQT_SLOT(numericReply_303(KIRC::Message &)), 1, 1);
-	bind(305, this, TQT_SLOT(ignoreMessage(KIRC::Message &)), 0, 0 ); // You are no longer marked as away
-	bind(306, this, TQT_SLOT(ignoreMessage(KIRC::Message &)), 0, 0 ); // You are marked as away
-	bind(307, this, TQT_SLOT(numericReply_307(KIRC::Message &)), 1, 1);
-	bind(311, this, TQT_SLOT(numericReply_311(KIRC::Message &)), 5, 5);
-	bind(312, this, TQT_SLOT(numericReply_312(KIRC::Message &)), 3, 3);
-	bind(313, this, TQT_SLOT(numericReply_313(KIRC::Message &)), 2, 2);
-	bind(314, this, TQT_SLOT(numericReply_314(KIRC::Message &)), 5, 5);
-	bind(315, this, TQT_SLOT(numericReply_315(KIRC::Message &)), 2, 2);
-	bind(317, this, TQT_SLOT(numericReply_317(KIRC::Message &)), 3, 4);
-	bind(318, this, TQT_SLOT(numericReply_318(KIRC::Message &)), 2, 2);
-	bind(319, this, TQT_SLOT(numericReply_319(KIRC::Message &)), 2, 2);
-	bind(320, this, TQT_SLOT(numericReply_320(KIRC::Message &)), 2, 2);
-	bind(321, this, TQT_SLOT(ignoreMessage(KIRC::Message &)), 0, 0 );
-	bind(322, this, TQT_SLOT(numericReply_322(KIRC::Message &)), 3, 3);
-	bind(323, this, TQT_SLOT(numericReply_323(KIRC::Message &)), 1, 1);
-	bind(324, this, TQT_SLOT(numericReply_324(KIRC::Message &)), 2, 4);
-	bind(328, this, TQT_SLOT(numericReply_328(KIRC::Message &)), 2, 2);
-	bind(329, this, TQT_SLOT(numericReply_329(KIRC::Message &)), 3, 3);
-	bind(330, this, TQT_SLOT(ignoreMessage(KIRC::Message &)), 0, 0); // ???
-	bind(331, this, TQT_SLOT(numericReply_331(KIRC::Message &)), 2, 2);
-	bind(332, this, TQT_SLOT(numericReply_332(KIRC::Message &)), 2, 2);
-	bind(333, this, TQT_SLOT(numericReply_333(KIRC::Message &)), 4, 4);
-	bind(352, this, TQT_SLOT(numericReply_352(KIRC::Message &)), 5, 10);
-	bind(353, this, TQT_SLOT(numericReply_353(KIRC::Message &)), 3, 3);
-	bind(366, this, TQT_SLOT(numericReply_366(KIRC::Message &)), 2, 2);
-	bind(369, this, TQT_SLOT(numericReply_369(KIRC::Message &)), 2, 2);
-	bind(372, this, TQT_SLOT(numericReply_372(KIRC::Message &)), 1, 1);
-	bind(375, this, TQT_SLOT(ignoreMessage(KIRC::Message&)), 0, 0 );
-	bind(376, this, TQT_SLOT(ignoreMessage(KIRC::Message&)), 0, 0 );
-
-	bind(401, this, TQT_SLOT(numericReply_401(KIRC::Message &)), 2, 2); // incomingNoNickChan
-//	bind(404, this, TQT_SLOT(numericReply_404(KIRC::Message &)), 2, 2); // incomingCannotSendToChannel
-	bind(406, this, TQT_SLOT(numericReply_406(KIRC::Message &)), 2, 2); // incomingWasNoNick
-	bind(422, this, TQT_SLOT(numericReply_422(KIRC::Message &)), 1, 1);
-	bind(433, this, TQT_SLOT(numericReply_433(KIRC::Message &)), 2, 2);
-//	bind(442, this, TQT_SLOT(numericReply_442(KIRC::Message &)), 2, 2); // incomingCannotSendToChannel
-	bind(464, this, TQT_SLOT(numericReply_464(KIRC::Message &)), 1, 1);
-	bind(471, this, TQT_SLOT(numericReply_471(KIRC::Message &)), 2, 2);
-	bind(473, this, TQT_SLOT(numericReply_473(KIRC::Message &)), 2, 2);
-	bind(474, this, TQT_SLOT(numericReply_474(KIRC::Message &)), 2, 2);
-	bind(475, this, TQT_SLOT(numericReply_475(KIRC::Message &)), 2, 2);
+	bind(1, this, TQ_SLOT(numericReply_001(KIRC::Message &)), 1, 1);
+	bind(2, this, TQ_SLOT(numericReply_002(KIRC::Message &)), 1, 1);
+	bind(3, this, TQ_SLOT(numericReply_003(KIRC::Message &)), 1, 1);
+	bind(4, this, TQ_SLOT(numericReply_004(KIRC::Message &)), 5, 5);
+	bind(5, this, TQ_SLOT(numericReply_004(KIRC::Message &)), 1, 1);
+
+	bind(250, this, TQ_SLOT(numericReply_250(KIRC::Message &)));
+	bind(251, this, TQ_SLOT(numericReply_251(KIRC::Message &)));
+	bind(252, this, TQ_SLOT(numericReply_252(KIRC::Message &)), 2, 2);
+	bind(253, this, TQ_SLOT(numericReply_253(KIRC::Message &)), 2, 2);
+	bind(254, this, TQ_SLOT(numericReply_254(KIRC::Message &)), 2, 2);
+	bind(255, this, TQ_SLOT(numericReply_255(KIRC::Message &)), 1, 1); // incomingConnectString
+
+	bind(263, this, TQ_SLOT(numericReply_263(KIRC::Message &))); // incomingServerLoadTooHigh
+	bind(265, this, TQ_SLOT(numericReply_265(KIRC::Message &)));
+	bind(266, this, TQ_SLOT(numericReply_266(KIRC::Message &)));
+
+	bind(301, this, TQ_SLOT(numericReply_301(KIRC::Message &)), 2, 2);
+	bind(303, this, TQ_SLOT(numericReply_303(KIRC::Message &)), 1, 1);
+	bind(305, this, TQ_SLOT(ignoreMessage(KIRC::Message &)), 0, 0 ); // You are no longer marked as away
+	bind(306, this, TQ_SLOT(ignoreMessage(KIRC::Message &)), 0, 0 ); // You are marked as away
+	bind(307, this, TQ_SLOT(numericReply_307(KIRC::Message &)), 1, 1);
+	bind(311, this, TQ_SLOT(numericReply_311(KIRC::Message &)), 5, 5);
+	bind(312, this, TQ_SLOT(numericReply_312(KIRC::Message &)), 3, 3);
+	bind(313, this, TQ_SLOT(numericReply_313(KIRC::Message &)), 2, 2);
+	bind(314, this, TQ_SLOT(numericReply_314(KIRC::Message &)), 5, 5);
+	bind(315, this, TQ_SLOT(numericReply_315(KIRC::Message &)), 2, 2);
+	bind(317, this, TQ_SLOT(numericReply_317(KIRC::Message &)), 3, 4);
+	bind(318, this, TQ_SLOT(numericReply_318(KIRC::Message &)), 2, 2);
+	bind(319, this, TQ_SLOT(numericReply_319(KIRC::Message &)), 2, 2);
+	bind(320, this, TQ_SLOT(numericReply_320(KIRC::Message &)), 2, 2);
+	bind(321, this, TQ_SLOT(ignoreMessage(KIRC::Message &)), 0, 0 );
+	bind(322, this, TQ_SLOT(numericReply_322(KIRC::Message &)), 3, 3);
+	bind(323, this, TQ_SLOT(numericReply_323(KIRC::Message &)), 1, 1);
+	bind(324, this, TQ_SLOT(numericReply_324(KIRC::Message &)), 2, 4);
+	bind(328, this, TQ_SLOT(numericReply_328(KIRC::Message &)), 2, 2);
+	bind(329, this, TQ_SLOT(numericReply_329(KIRC::Message &)), 3, 3);
+	bind(330, this, TQ_SLOT(ignoreMessage(KIRC::Message &)), 0, 0); // ???
+	bind(331, this, TQ_SLOT(numericReply_331(KIRC::Message &)), 2, 2);
+	bind(332, this, TQ_SLOT(numericReply_332(KIRC::Message &)), 2, 2);
+	bind(333, this, TQ_SLOT(numericReply_333(KIRC::Message &)), 4, 4);
+	bind(352, this, TQ_SLOT(numericReply_352(KIRC::Message &)), 5, 10);
+	bind(353, this, TQ_SLOT(numericReply_353(KIRC::Message &)), 3, 3);
+	bind(366, this, TQ_SLOT(numericReply_366(KIRC::Message &)), 2, 2);
+	bind(369, this, TQ_SLOT(numericReply_369(KIRC::Message &)), 2, 2);
+	bind(372, this, TQ_SLOT(numericReply_372(KIRC::Message &)), 1, 1);
+	bind(375, this, TQ_SLOT(ignoreMessage(KIRC::Message&)), 0, 0 );
+	bind(376, this, TQ_SLOT(ignoreMessage(KIRC::Message&)), 0, 0 );
+
+	bind(401, this, TQ_SLOT(numericReply_401(KIRC::Message &)), 2, 2); // incomingNoNickChan
+//	bind(404, this, TQ_SLOT(numericReply_404(KIRC::Message &)), 2, 2); // incomingCannotSendToChannel
+	bind(406, this, TQ_SLOT(numericReply_406(KIRC::Message &)), 2, 2); // incomingWasNoNick
+	bind(422, this, TQ_SLOT(numericReply_422(KIRC::Message &)), 1, 1);
+	bind(433, this, TQ_SLOT(numericReply_433(KIRC::Message &)), 2, 2);
+//	bind(442, this, TQ_SLOT(numericReply_442(KIRC::Message &)), 2, 2); // incomingCannotSendToChannel
+	bind(464, this, TQ_SLOT(numericReply_464(KIRC::Message &)), 1, 1);
+	bind(471, this, TQ_SLOT(numericReply_471(KIRC::Message &)), 2, 2);
+	bind(473, this, TQ_SLOT(numericReply_473(KIRC::Message &)), 2, 2);
+	bind(474, this, TQ_SLOT(numericReply_474(KIRC::Message &)), 2, 2);
+	bind(475, this, TQ_SLOT(numericReply_475(KIRC::Message &)), 2, 2);
 
 	//Freenode seems to use this for a non-RFC compliant purpose, as does Unreal
-	bind(477, this, TQT_SLOT(emitSuffix(KIRC::Message&)),0,0);
+	bind(477, this, TQ_SLOT(emitSuffix(KIRC::Message&)),0,0);
 }
 
 /* 001: "Welcome to the Internet Relay Network <nick>!<user>@<host>"
diff --git a/kopete/protocols/irc/libkirc/kircmessageredirector.cpp b/kopete/protocols/irc/libkirc/kircmessageredirector.cpp
index 2e1d0b4c..4eecdd6c 100644
--- a/kopete/protocols/irc/libkirc/kircmessageredirector.cpp
+++ b/kopete/protocols/irc/libkirc/kircmessageredirector.cpp
@@ -32,7 +32,7 @@ MessageRedirector::MessageRedirector(KIRC::Engine *engine,
 
 bool MessageRedirector::connect(TQObject *object, const char *member)
 {
-	return TQObject::connect(this, TQT_SIGNAL(redirect(KIRC::Message &)),
+	return TQObject::connect(this, TQ_SIGNAL(redirect(KIRC::Message &)),
 					object, member);
 }
 
diff --git a/kopete/protocols/irc/libkirc/kircmessageredirector.h b/kopete/protocols/irc/libkirc/kircmessageredirector.h
index 2c3f9e37..489ab412 100644
--- a/kopete/protocols/irc/libkirc/kircmessageredirector.h
+++ b/kopete/protocols/irc/libkirc/kircmessageredirector.h
@@ -48,9 +48,9 @@ public:
 	/**
 	 * Connects the given object member signal/slot to this message redirector.
 	 * The member signal slot should be looking like:
-	 * TQT_SIGNAL(mysignal(KIRC::Message &msg))
+	 * TQ_SIGNAL(mysignal(KIRC::Message &msg))
 	 * or
-	 * TQT_SIGNAL(myslot(KIRC::Message &msg))
+	 * TQ_SIGNAL(myslot(KIRC::Message &msg))
 	 */
 	bool connect(TQObject *object, const char *member);
 
diff --git a/kopete/protocols/irc/libkirc/kirctransfer.cpp b/kopete/protocols/irc/libkirc/kirctransfer.cpp
index cbcb6682..50e96ce8 100644
--- a/kopete/protocols/irc/libkirc/kirctransfer.cpp
+++ b/kopete/protocols/irc/libkirc/kirctransfer.cpp
@@ -81,11 +81,11 @@ Transfer::Transfer(	Engine *engine, TQString nick,// TQString nick_peer_adress
 	else if(!properites["hostAddress"].isNull() && !properites["hostPort"].isNull())
 		setSocket(new KExtendedSocket(properites["hostAddress"], properites["hostPort"]));
 
-	connect(this, TQT_SIGNAL(complete()),
-		this, TQT_SLOT(closeSocket()));
+	connect(this, TQ_SIGNAL(complete()),
+		this, TQ_SLOT(closeSocket()));
 
-	connect(this, TQT_SIGNAL(abort(TQString)),
-		this, TQT_SLOT(closeSocket()));
+	connect(this, TQ_SIGNAL(abort(TQString)),
+		this, TQ_SLOT(closeSocket()));
 }
 */
 Transfer::~Transfer()
@@ -134,39 +134,39 @@ bool Transfer::initiate()
 
 	m_file.setName(m_fileName);
 
-	connect(this, TQT_SIGNAL(complete()),
-		this, TQT_SLOT(closeSocket()));
-	connect(this, TQT_SIGNAL(abort(TQString)),
-		this, TQT_SLOT(closeSocket()));
+	connect(this, TQ_SIGNAL(complete()),
+		this, TQ_SLOT(closeSocket()));
+	connect(this, TQ_SIGNAL(abort(TQString)),
+		this, TQ_SLOT(closeSocket()));
 
-//	connect(m_socket, TQT_SIGNAL(connectionClosed()),
-//		this, TQT_SLOT(slotConnectionClosed()));
-//	connect(m_socket, TQT_SIGNAL(delayedCloseFinished()),
-//		this, TQT_SLOT(slotConnectionClosed()));
-	connect(m_socket, TQT_SIGNAL(error(int)), // FIXME: connection failed: No such signal KExtendedSocket::error(int)
-		this, TQT_SLOT(slotError(int)));
+//	connect(m_socket, TQ_SIGNAL(connectionClosed()),
+//		this, TQ_SLOT(slotConnectionClosed()));
+//	connect(m_socket, TQ_SIGNAL(delayedCloseFinished()),
+//		this, TQ_SLOT(slotConnectionClosed()));
+	connect(m_socket, TQ_SIGNAL(error(int)), // FIXME: connection failed: No such signal KExtendedSocket::error(int)
+		this, TQ_SLOT(slotError(int)));
 
 	switch( m_type )
 	{
 	case Chat:
 		kdDebug(14121) << k_funcinfo << "Stting up a chat." << endl;
-		connect(m_socket, TQT_SIGNAL(readyRead()),
-			this, TQT_SLOT(readyReadFileIncoming()));
+		connect(m_socket, TQ_SIGNAL(readyRead()),
+			this, TQ_SLOT(readyReadFileIncoming()));
 		break;
 	case FileIncoming:
 		kdDebug(14121) << k_funcinfo << "Stting up an incoming file transfer." << endl;
 		m_file.open(IO_WriteOnly);
-		connect(m_socket, TQT_SIGNAL(readyRead()),
-			this, TQT_SLOT(readyReadFileIncoming()));
+		connect(m_socket, TQ_SIGNAL(readyRead()),
+			this, TQ_SLOT(readyReadFileIncoming()));
 		break;
 	case FileOutgoing:
 		kdDebug(14121) << k_funcinfo << "Stting up an outgoing file transfer." << endl;
 		m_file.open(IO_ReadOnly);
-		connect(m_socket, TQT_SIGNAL(readyRead()),
-			this, TQT_SLOT(readyReadFileOutgoing()));
+		connect(m_socket, TQ_SIGNAL(readyRead()),
+			this, TQ_SLOT(readyReadFileOutgoing()));
 //		timer = new TQTimer(this);
-//		connect(timer, TQT_SIGNAL(timeout()),
-//			this, TQT_SLOT(writeFileOutgoing()));
+//		connect(timer, TQ_SIGNAL(timeout()),
+//			this, TQ_SLOT(writeFileOutgoing()));
 //		timer->start(1000, false);
 		writeFileOutgoing(); // send a first packet.
 		break;
@@ -190,8 +190,8 @@ bool Transfer::initiate()
 	// As far as I understand, buffer (socket buffer at least) should be flushed while event-looping.
 	// But I'm not really sure of this, so I force the flush.
 	timer = new TQTimer(this);
-	connect(timer, TQT_SIGNAL(timeout()),
-		this, TQT_SLOT(flush()));
+	connect(timer, TQ_SIGNAL(timeout()),
+		this, TQ_SLOT(flush()));
 	timer->start(1000, FALSE); // flush the streams at every seconds
 
 	return true;
diff --git a/kopete/protocols/irc/libkirc/kirctransferserver.cpp b/kopete/protocols/irc/libkirc/kirctransferserver.cpp
index 25b41ff9..b7c0917d 100644
--- a/kopete/protocols/irc/libkirc/kirctransferserver.cpp
+++ b/kopete/protocols/irc/libkirc/kirctransferserver.cpp
@@ -68,8 +68,8 @@ bool TransferServer::initServer()
 {
 	if (!m_socket)
 	{
-		TQObject::connect(this, TQT_SIGNAL(incomingNewTransfer(Transfer *)),
-				TransferHandler::self(), TQT_SIGNAL(transferCreated(Transfer *)));
+		TQObject::connect(this, TQ_SIGNAL(incomingNewTransfer(Transfer *)),
+				TransferHandler::self(), TQ_SIGNAL(transferCreated(Transfer *)));
 
 		m_socket = new KExtendedSocket();
 
@@ -83,10 +83,10 @@ bool TransferServer::initServer()
 		if (!m_socket->setTimeout(2*60)) // FIXME: allow configuration of this.
 			kdDebug(14120) << k_funcinfo << "Failed to set timeout." << endl;
 
-		TQObject::connect(m_socket, TQT_SIGNAL(readyAccept()),
-				this, TQT_SLOT(readyAccept()));
-		TQObject::connect(m_socket, TQT_SIGNAL(connectionFailed(int)),
-				this, TQT_SLOT(connectionFailed(int)));
+		TQObject::connect(m_socket, TQ_SIGNAL(readyAccept()),
+				this, TQ_SLOT(readyAccept()));
+		TQObject::connect(m_socket, TQ_SIGNAL(connectionFailed(int)),
+				this, TQ_SLOT(connectionFailed(int)));
 
 		m_socket->listen(m_backlog);
 		m_socket->setBlockingMode(true);
@@ -137,14 +137,14 @@ void Transfer::initClient()
 {
 	if(!m_socket)
 	{
-		connect(m_socket, TQT_SIGNAL(connectionClosed()),
-			this, TQT_SLOT(slotConnectionClosed()));
-		connect(m_socket, TQT_SIGNAL(delayedCloseFinished()),
-			this, TQT_SLOT(slotConnectionClosed()));
-		connect(m_socket, TQT_SIGNAL(error(int)),
-			this, TQT_SLOT(slotError(int)));
-		connect(m_socket, TQT_SIGNAL(readyRead()),
-			this, TQT_SLOT(readyReadFileOut));
+		connect(m_socket, TQ_SIGNAL(connectionClosed()),
+			this, TQ_SLOT(slotConnectionClosed()));
+		connect(m_socket, TQ_SIGNAL(delayedCloseFinished()),
+			this, TQ_SLOT(slotConnectionClosed()));
+		connect(m_socket, TQ_SIGNAL(error(int)),
+			this, TQ_SLOT(slotError(int)));
+		connect(m_socket, TQ_SIGNAL(readyRead()),
+			this, TQ_SLOT(readyReadFileOut));
 
 		m_socket->enableRead( true );
 		m_socket->enableWrite( true );
diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp
index a1781c24..82440bbb 100644
--- a/kopete/protocols/irc/libkirc/ksslsocket.cpp
+++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp
@@ -52,9 +52,9 @@ KSSLSocket::KSSLSocket() : KExtendedSocket()
 	setBlockingMode(false);
 
 	//Connect internal slots
-	TQObject::connect( this, TQT_SIGNAL(connectionSuccess()), this, TQT_SLOT(slotConnected()) );
-	TQObject::connect( this, TQT_SIGNAL(closed(int)), this, TQT_SLOT(slotDisconnected()) );
-	TQObject::connect( this, TQT_SIGNAL(connectionFailed(int)), this, TQT_SLOT(slotDisconnected()));
+	TQObject::connect( this, TQ_SIGNAL(connectionSuccess()), this, TQ_SLOT(slotConnected()) );
+	TQObject::connect( this, TQ_SIGNAL(closed(int)), this, TQ_SLOT(slotDisconnected()) );
+	TQObject::connect( this, TQ_SIGNAL(connectionFailed(int)), this, TQ_SLOT(slotDisconnected()));
 }
 
 KSSLSocket::~KSSLSocket()
@@ -148,11 +148,11 @@ void KSSLSocket::slotConnected()
 	}
 
 	//Disconnect the KExtSocket notifier slot, we use our own
-	TQObject::disconnect( readNotifier(), TQT_SIGNAL(activated( int )),
-			this, TQT_SLOT(socketActivityRead()) );
+	TQObject::disconnect( readNotifier(), TQ_SIGNAL(activated( int )),
+			this, TQ_SLOT(socketActivityRead()) );
 
-	TQObject::connect( readNotifier(), TQT_SIGNAL(activated( int )),
-			this, TQT_SLOT(slotReadData()) );
+	TQObject::connect( readNotifier(), TQ_SIGNAL(activated( int )),
+			this, TQ_SLOT(slotReadData()) );
 
 	readNotifier()->setEnabled(true);