TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


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

1 files changed, 13 insertions, 13 deletions

diff --git a/kopete/protocols/irc/libkirc/kircengine_commands.cpp b/kopete/protocols/irc/libkirc/kircengine_commands.cpp
index 21a90676..f8c3dcca 100644
--- a/kopete/protocols/irc/libkirc/kircengine_commands.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine_commands.cpp
@@ -37,8 +37,8 @@ void Engine::bindCommands()
 	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("TQUIT",	this, TQT_SLOT(quit(KIRC::Message &)),	0, 0);
+//	bind("STQUIT",	this, TQT_SLOT(squit(KIRC::Message &)),	1, 1);
 	bind("TOPIC",	this, TQT_SLOT(topic(KIRC::Message &)),	1, 1);
 }
 
@@ -46,30 +46,30 @@ void Engine::away(bool isAway, const TQString &awayMessage)
 {
 	if(isAway)
 		if( !awayMessage.isEmpty() )
-			writeMessage("AWAY", TQString::null, awayMessage);
+			writeMessage("AWAY", TQString(), awayMessage);
 	else
-		writeMessage("AWAY", TQString::null, TQString::fromLatin1("I'm away."));
+		writeMessage("AWAY", TQString(), TQString::tqfromLatin1("I'm away."));
 	else
-		writeMessage("AWAY", TQString::null);
+		writeMessage("AWAY", TQString());
 }
 
 // FIXME: Really handle this message
 void Engine::error(Message &)
 {
-	setStatus(Closing);
+	settqStatus(Closing);
 }
 
 void Engine::ison(const TQStringList &nickList)
 {
 	if (!nickList.isEmpty())
 	{
-		TQString statement = TQString::fromLatin1("ISON");
+		TQString statement = TQString::tqfromLatin1("ISON");
 		for (TQStringList::ConstIterator it = nickList.begin(); it != nickList.end(); ++it)
 		{
 			if ((statement.length()+(*it).length())>509) // 512(max buf)-2("\r\n")-1(<space separator>)
 			{
 				writeMessage(statement);
-				statement = TQString::fromLatin1("ISON ") +  (*it);
+				statement = TQString::tqfromLatin1("ISON ") +  (*it);
 			}
 			else
 				statement.append(TQChar(' ') + (*it));
@@ -199,9 +199,9 @@ void Engine::quit(const TQString &reason, bool /*now*/)
 		return;
 
 	if (isConnected())
-		writeMessage("QUIT", TQString::null, reason);
+		writeMessage("TQUIT", TQString(), reason);
 
-	setStatus(Closing);
+	settqStatus(Closing);
 }
 
 void Engine::quit(Message &msg)
@@ -224,10 +224,10 @@ void Engine::user(const TQString &newUserName, const TQString &hostname, const T
 	writeMessage("USER", TQStringList(m_Username) << hostname << m_Host, m_realName);
 }
 
-void Engine::user(const TQString &newUserName, Q_UINT8 mode, const TQString &newRealName)
+void Engine::user(const TQString &newUserName, TQ_UINT8 mode, const TQString &newRealName)
 {
 	/* RFC2812: "<user> <mode> <unused> <realname>"
-	* mode is a numeric value (from a bit mask).
+	* mode is a numeric value (from a bit tqmask).
 	* 0x00 normal
 	* 0x04 request +w
 	* 0x08 request +i */
@@ -252,7 +252,7 @@ void Engine::topic(Message &msg)
 
 void Engine::list()
 {
-	writeMessage("LIST", TQString::null);
+	writeMessage("LIST", TQString());
 }
 
 void Engine::motd(const TQString &server)