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, 26 insertions, 26 deletions

diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp
index 03936d5f..167d7a22 100644
--- a/kopete/protocols/irc/libkirc/kircengine.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine.cpp
@@ -51,10 +51,10 @@ using namespace KIRC;
 /* Please note that the regular expression "[\\r\\n]*$" is used in a TQString::replace statement many times.
  * This gets rid of trailing \r\n, \r, \n, and \n\r characters.
  */
-const TQRegExp Engine::m_RemoveLinefeeds( TQString::fromLatin1("[\\r\\n]*$") );
+const TQRegExp Engine::m_RemoveLinefeeds( TQString::tqfromLatin1("[\\r\\n]*$") );
 
-Engine::Engine(TQObject *parent, const char *name)
-	: TQObject(parent, TQString::fromLatin1("[KIRC::Engine]%1").arg(name).latin1()),
+Engine::Engine(TQObject *tqparent, const char *name)
+	: TQObject(tqparent, TQString::tqfromLatin1("[KIRC::Engine]%1").tqarg(name).latin1()),
 	  m_status(Idle),
 	  m_FailedNickOnLogin(false),
 	  m_useSSL(false),
@@ -64,7 +64,7 @@ Engine::Engine(TQObject *parent, const char *name)
 	  m_ctcpReplies(17, false),
 	  codecs(577,false)
 {
-	setUserName(TQString::null);
+	setUserName(TQString());
 
 	m_commands.setAutoDelete(true);
 	m_ctcpQueries.setAutoDelete(true);
@@ -74,9 +74,9 @@ Engine::Engine(TQObject *parent, const char *name)
 	bindNumericReplies();
 	bindCtcp();
 
-	m_VersionString = TQString::fromLatin1("Anonymous client using the KIRC engine.");
-	m_UserString = TQString::fromLatin1("Response not supplied by user.");
-	m_SourceString = TQString::fromLatin1("Unknown client, known source.");
+	m_VersionString = TQString::tqfromLatin1("Anonymous client using the KIRC engine.");
+	m_UserString = TQString::tqfromLatin1("Response not supplied by user.");
+	m_SourceString = TQString::tqfromLatin1("Unknown client, known source.");
 
 	defaultCodec = TQTextCodec::codecForMib(106); // UTF8 mib is 106
 	kdDebug(14120) << "Setting default engine codec, " << defaultCodec->name() << endl;
@@ -133,14 +133,14 @@ void Engine::setUseSSL( bool useSSL )
 	}
 }
 
-void Engine::setStatus(Engine::Status status)
+void Engine::settqStatus(Engine::tqStatus status)
 {
 	kdDebug(14120) << k_funcinfo << status << endl;
 
 	if (m_status == status)
 		return;
 
-//	Engine::Status oldStatus = m_status;
+//	Engine::tqStatus oldtqStatus = m_status;
 	m_status = status;
 	emit statusChanged(status);
 
@@ -169,21 +169,21 @@ void Engine::setStatus(Engine::Status status)
 	case Closing:
 		m_sock->close();
 		m_sock->reset();
-		setStatus(Idle);
+		settqStatus(Idle);
 		break;
 	case AuthentifyingFailed:
-		setStatus(Closing);
+		settqStatus(Closing);
 		break;
 	case Timeout:
-		setStatus(Closing);
+		settqStatus(Closing);
 		break;
 	case Disconnected:
-		setStatus(Closing);
+		settqStatus(Closing);
 		break;
 	}
 }
 
-void Engine::connectToServer(const TQString &host, Q_UINT16 port, const TQString &nickname, bool useSSL )
+void Engine::connectToServer(const TQString &host, TQ_UINT16 port, const TQString &nickname, bool useSSL )
 {
 	setUseSSL(useSSL);
 
@@ -195,28 +195,28 @@ void Engine::connectToServer(const TQString &host, Q_UINT16 port, const TQString
 	kdDebug(14120) << "Sock status: " << m_sock->socketStatus() << endl;
 
 	if( !m_sock->setAddress(m_Host, m_Port) )
-		kdDebug(14120) << k_funcinfo << "setAddress failed. Status:  " << m_sock->socketStatus() << endl;
+		kdDebug(14120) << k_funcinfo << "setAddress failed. tqStatus:  " << m_sock->socketStatus() << endl;
 
 	if( m_sock->startAsyncConnect() == 0 )
 	{
-		kdDebug(14120) << k_funcinfo << "Success!. Status: " << m_sock->socketStatus() << endl;
-		setStatus(Connecting);
+		kdDebug(14120) << k_funcinfo << "Success!. tqStatus: " << m_sock->socketStatus() << endl;
+		settqStatus(Connecting);
 	}
 	else
 	{
-		kdDebug(14120) << k_funcinfo << "Failed. Status: " << m_sock->socketStatus() << endl;
-		setStatus(Disconnected);
+		kdDebug(14120) << k_funcinfo << "Failed. tqStatus: " << m_sock->socketStatus() << endl;
+		settqStatus(Disconnected);
 	}
 }
 
 void Engine::slotConnected()
 {
-	setStatus(Authentifying);
+	settqStatus(Authentifying);
 }
 
 void Engine::slotConnectionClosed()
 {
-	setStatus(Disconnected);
+	settqStatus(Disconnected);
 }
 
 void Engine::error(int errCode)
@@ -225,7 +225,7 @@ void Engine::error(int errCode)
 	if (m_sock->socketStatus () != KExtendedSocket::connecting)
 	{
 		// Connection in progress.. This is a signal fired wrong
-		setStatus(Disconnected);
+		settqStatus(Disconnected);
 	}
 }
 
@@ -250,7 +250,7 @@ void Engine::setSourceString(const TQString &newString)
 void Engine::setUserName(const TQString &newName)
 {
 	if(newName.isEmpty())
-		m_Username = TQString::fromLatin1(getpwuid(getuid())->pw_name);
+		m_Username = TQString::tqfromLatin1(getpwuid(getuid())->pw_name);
 	else
 		m_Username = newName;
 	m_Username.remove(m_RemoveLinefeeds);
@@ -259,7 +259,7 @@ void Engine::setUserName(const TQString &newName)
 void Engine::setRealName(const TQString &newName)
 {
 	if(newName.isEmpty())
-		m_realName = TQString::fromLatin1(getpwuid(getuid())->pw_gecos);
+		m_realName = TQString::tqfromLatin1(getpwuid(getuid())->pw_gecos);
 	else
 		m_realName = newName;
 	m_realName.remove(m_RemoveLinefeeds);
@@ -277,7 +277,7 @@ bool Engine::_bind(TQDict<KIRC::MessageRedirector> &dict,
 	if (!mr)
 	{
 		mr = new MessageRedirector(this, minArgs, maxArgs, helpMessage);
-		dict.replace(command, mr);
+		dict.tqreplace(command, mr);
 	}
 
 	return mr->connect(object, member);
@@ -443,7 +443,7 @@ bool Engine::invokeCtcpCommandOfMessage(const TQDict<MessageRedirector> &map, Me
 
 			kdDebug(14120) << "Method error for line:" << ctcpMsg.raw() << endl;
 			writeCtcpErrorMessage(msg.prefix(), msg.ctcpRaw(),
-				TQString::fromLatin1("%1 internal error(s)").arg(errors.size()));
+				TQString::tqfromLatin1("%1 internal error(s)").tqarg(errors.size()));
 		}
 		else
 		{