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

2 files changed, 5 insertions, 4 deletions

diff --git a/kopete/plugins/smpppdcs/unittest/clienttest.cpp b/kopete/plugins/smpppdcs/unittest/clienttest.cpp
index f668135f..7e19290d 100644
--- a/kopete/plugins/smpppdcs/unittest/clienttest.cpp
+++ b/kopete/plugins/smpppdcs/unittest/clienttest.cpp
@@ -53,12 +53,12 @@ void ClientTest::testCommunicationBeforeConnect() {
 
 void ClientTest::testServerIDBeforeConnect() {
     SMPPPD::Client c;
-    CHECK(c.serverID(), TQString::null);
+    CHECK(c.serverID(), TQString());
 }
 
 void ClientTest::testServerVersionBeforeConnect() {
     SMPPPD::Client c;
-    CHECK(c.serverVersion(), TQString::null);
+    CHECK(c.serverVersion(), TQString());
 }
 
 void ClientTest::testCommunicationAfterConnect() {
@@ -102,7 +102,7 @@ void ClientTest::testServerIDAfterDisconnect() {
     SMPPPD::Client c;
     if(c.connect("warwar", 3185)) {
         c.disconnect();
-        CHECK(c.serverID(), TQString::null);
+        CHECK(c.serverID(), TQString());
     } else {
         SKIP("Test skipped because no smpppd at warwar:3185");
     }
@@ -112,7 +112,7 @@ void ClientTest::testServerVersionAfterDisconnect() {
     SMPPPD::Client c;
     if(c.connect("warwar", 3185)) {
         c.disconnect();
-        CHECK(c.serverVersion(), TQString::null);
+        CHECK(c.serverVersion(), TQString());
     } else {
         SKIP("Test skipped because no smpppd at warwar:3185");
     }
diff --git a/kopete/plugins/smpppdcs/unittest/clienttest.h b/kopete/plugins/smpppdcs/unittest/clienttest.h
index 5db7ef7b..0da9d71e 100644
--- a/kopete/plugins/smpppdcs/unittest/clienttest.h
+++ b/kopete/plugins/smpppdcs/unittest/clienttest.h
@@ -24,6 +24,7 @@
 */
 class ClientTest : public KUnitTest::SlotTester {
     Q_OBJECT
+  TQ_OBJECT
 
     ClientTest(const ClientTest&);
     ClientTest& operator=(const ClientTest&);