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

3 files changed, 7 insertions, 7 deletions

diff --git a/kopete/plugins/smpppdcs/libsmpppdclient/smpppdclient.cpp b/kopete/plugins/smpppdcs/libsmpppdclient/smpppdclient.cpp
index 5ff1654b..2ba2b740 100644
--- a/kopete/plugins/smpppdcs/libsmpppdclient/smpppdclient.cpp
+++ b/kopete/plugins/smpppdcs/libsmpppdclient/smpppdclient.cpp
@@ -22,7 +22,7 @@
 using namespace SMPPPD;
 
 Client::Client()
-        : m_state(NULL), m_sock(NULL), m_serverID(TQString::null), m_serverVer(TQString::null), m_password(TQString::null) {
+        : m_state(NULL), m_sock(NULL), m_serverID(TQString()), m_serverVer(TQString()), m_password(TQString()) {
     changeState(Unsettled::instance());
 }
 
diff --git a/kopete/plugins/smpppdcs/libsmpppdclient/smpppdready.cpp b/kopete/plugins/smpppdcs/libsmpppdclient/smpppdready.cpp
index f51aa301..668496ef 100644
--- a/kopete/plugins/smpppdcs/libsmpppdclient/smpppdready.cpp
+++ b/kopete/plugins/smpppdcs/libsmpppdclient/smpppdready.cpp
@@ -48,8 +48,8 @@ void Ready::disconnect(Client * client) {
         delete socket(client);
         setSocket(client, NULL);
 
-        setServerID(client, TQString::null);
-        setServerVersion(client, TQString::null);
+        setServerID(client, TQString());
+        setServerVersion(client, TQString());
     }
 
     changeState(client, Unsettled::instance());
diff --git a/kopete/plugins/smpppdcs/libsmpppdclient/smpppdunsettled.cpp b/kopete/plugins/smpppdcs/libsmpppdclient/smpppdunsettled.cpp
index 3d1f8a79..ef29d992 100644
--- a/kopete/plugins/smpppdcs/libsmpppdclient/smpppdunsettled.cpp
+++ b/kopete/plugins/smpppdcs/libsmpppdclient/smpppdunsettled.cpp
@@ -86,17 +86,17 @@ bool Unsettled::connect(Client * client, const TQString& server, uint port) {
 
             TQString response = read(client)[0];
 
-            if(response != TQString::null &&
+            if(response != TQString() &&
                     ver.exactMatch(response)) {
 				setServerID(client, response);
 				setServerVersion(client, ver.cap(1));
                 changeState(client, Ready::instance());
                 return true;
-            } else if(response != TQString::null &&
+            } else if(response != TQString() &&
                       clg.exactMatch(response)) {
-				if(password(client) != TQString::null) {
+				if(password(client) != TQString()) {
                     // we are challenged, ok, respond
-					write(client, TQString("response = %1\n").arg(make_response(clg.cap(1).stripWhiteSpace(), password(client))).latin1());
+					write(client, TQString("response = %1\n").tqarg(make_response(clg.cap(1).stripWhiteSpace(), password(client))).latin1());
                     response = read(client)[0];
                     if(ver.exactMatch(response)) {
 						setServerID(client, response);