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

diff --git a/kopete/protocols/jabber/libiris/qca/src/qca.cpp b/kopete/protocols/jabber/libiris/qca/src/qca.cpp
index 4a197527..ee51335f 100644
--- a/kopete/protocols/jabber/libiris/qca/src/qca.cpp
+++ b/kopete/protocols/jabber/libiris/qca/src/qca.cpp
@@ -1,5 +1,5 @@
 /*
- * qca.cpp - Qt Cryptographic Architecture
+ * qca.cpp - TQt Cryptographic Architecture
  * Copyright (C) 2003  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
@@ -586,7 +586,7 @@ TQString RSAKey::toPEM(bool publicOnly) const
 	TQCString cs;
 	cs.resize(out.size()+1);
 	memcpy(cs.data(), out.data(), out.size());
-	return TQString::fromLatin1(cs);
+	return TQString::tqfromLatin1(cs);
 }
 
 bool RSAKey::fromPEM(const TQString &str)
@@ -794,7 +794,7 @@ TQString Cert::toPEM() const
 	TQCString cs;
 	cs.resize(out.size()+1);
 	memcpy(cs.data(), out.data(), out.size());
-	return TQString::fromLatin1(cs);
+	return TQString::tqfromLatin1(cs);
 }
 
 bool Cert::fromPEM(const TQString &str)
@@ -859,8 +859,8 @@ public:
 	TQPtrList<QCA_CertContext> store;
 };
 
-TLS::TLS(TQObject *parent)
-:TQObject(parent)
+TLS::TLS(TQObject *tqparent)
+:TQObject(tqparent)
 {
 	d = new Private;
 }
@@ -1127,8 +1127,8 @@ public:
 	TQByteArray inbuf, outbuf;
 };
 
-SASL::SASL(TQObject *parent)
-:TQObject(parent)
+SASL::SASL(TQObject *tqparent)
+:TQObject(tqparent)
 {
 	d = new Private;
 	reset();
@@ -1227,13 +1227,13 @@ void SASL::setExternalSSF(int x)
 	d->ext_ssf = x;
 }
 
-void SASL::setLocalAddr(const TQHostAddress &addr, Q_UINT16 port)
+void SASL::setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port)
 {
 	d->localAddr = addr;
 	d->localPort = port;
 }
 
-void SASL::setRemoteAddr(const TQHostAddress &addr, Q_UINT16 port)
+void SASL::setRemoteAddr(const TQHostAddress &addr, TQ_UINT16 port)
 {
 	d->remoteAddr = addr;
 	d->remotePort = port;