10 files changed, 20 insertions, 20 deletions
diff --git a/libkcddb/test/asynccddblookuptest.cpp b/libkcddb/test/asynccddblookuptest.cpp
index 9699f54f..6a43b0ca 100644
--- a/libkcddb/test/asynccddblookuptest.cpp
+++ b/libkcddb/test/asynccddblookuptest.cpp
@@ -13,7 +13,7 @@ AsyncCDDBLookupTest::AsyncCDDBLookupTest()
   using namespace KCDDB;
 
   client_ = new Client;
-  client_->config().setHostname("freedb.freedb.org");
+  client_->config().setHostname("gnudb.gnudb.org");
   client_->config().setPort(8880);
   client_->config().setCachePolicy(Cache::Ignore);
   client_->config().setLookupTransport(Lookup::CDDBP);
@@ -22,8 +22,8 @@ AsyncCDDBLookupTest::AsyncCDDBLookupTest()
   connect
     (
       client_,
-      TQT_SIGNAL(finished(CDDB::Result)),
-      TQT_SLOT(slotFinished(CDDB::Result))
+      TQ_SIGNAL(finished(CDDB::Result)),
+      TQ_SLOT(slotFinished(CDDB::Result))
     );
 
   TrackOffsetList list;
@@ -96,7 +96,7 @@ AsyncCDDBLookupTest::slotFinished(CDDB::Result r)
   kdDebug() << "Best CDInfo had title: " << i.title << endl;
   kdDebug() << "and revision: " << i.revision << endl;
 
-  kapp->quit();
+  tdeApp->quit();
 }
 
 int main(int argc, char ** argv)
diff --git a/libkcddb/test/asynccddblookuptest.h b/libkcddb/test/asynccddblookuptest.h
index 459799e5..db139bc7 100644
--- a/libkcddb/test/asynccddblookuptest.h
+++ b/libkcddb/test/asynccddblookuptest.h
@@ -8,7 +8,7 @@ using namespace KCDDB;
 
 class AsyncCDDBLookupTest : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/libkcddb/test/asynchttplookuptest.cpp b/libkcddb/test/asynchttplookuptest.cpp
index 3cba7d7b..f614b468 100644
--- a/libkcddb/test/asynchttplookuptest.cpp
+++ b/libkcddb/test/asynchttplookuptest.cpp
@@ -12,7 +12,7 @@ AsyncHTTPLookupTest::AsyncHTTPLookupTest()
   using namespace KCDDB;
 
   client_ = new Client;
-  client_->config().setHostname("freedb.freedb.org");
+  client_->config().setHostname("gnudb.gnudb.org");
   client_->config().setPort(80);
   client_->config().setCachePolicy(Cache::Ignore);
   client_->config().setLookupTransport(Lookup::HTTP);
@@ -21,8 +21,8 @@ AsyncHTTPLookupTest::AsyncHTTPLookupTest()
   connect
     (
       client_,
-      TQT_SIGNAL(finished(CDDB::Result)),
-      TQT_SLOT(slotFinished(CDDB::Result))
+      TQ_SIGNAL(finished(CDDB::Result)),
+      TQ_SLOT(slotFinished(CDDB::Result))
     );
 
   TrackOffsetList list;
@@ -94,7 +94,7 @@ AsyncHTTPLookupTest::slotFinished(CDDB::Result r)
   kdDebug() << "Best CDInfo had title: " << i.title << endl;
   kdDebug() << "and revision: " << i.revision << endl;
 
-  kapp->quit();
+  tdeApp->quit();
 }
 
 int main(int argc, char ** argv)
diff --git a/libkcddb/test/asynchttplookuptest.h b/libkcddb/test/asynchttplookuptest.h
index b11c3893..4756b909 100644
--- a/libkcddb/test/asynchttplookuptest.h
+++ b/libkcddb/test/asynchttplookuptest.h
@@ -8,7 +8,7 @@ using namespace KCDDB;
 
 class AsyncHTTPLookupTest : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/libkcddb/test/asynchttpsubmittest.cpp b/libkcddb/test/asynchttpsubmittest.cpp
index 0dd0766e..425f5873 100644
--- a/libkcddb/test/asynchttpsubmittest.cpp
+++ b/libkcddb/test/asynchttpsubmittest.cpp
@@ -51,8 +51,8 @@ AsyncHTTPSubmitTest::AsyncHTTPSubmitTest()
   connect
     (
       client_,
-      TQT_SIGNAL(finished(CDDB::Result)),
-      TQT_SLOT(slotFinished(CDDB::Result))
+      TQ_SIGNAL(finished(CDDB::Result)),
+      TQ_SLOT(slotFinished(CDDB::Result))
     );
 
   client_->submit(cdInfo, list);
@@ -63,7 +63,7 @@ AsyncHTTPSubmitTest::slotFinished(CDDB::Result r)
 {
   kdDebug() << "AsyncHTTPSubmitTest::slotFinished: Got " << KCDDB::CDDB::resultToString(r) << endl;
 
-  kapp->quit();
+  tdeApp->quit();
 }
 
 int main(int argc, char ** argv)
diff --git a/libkcddb/test/asynchttpsubmittest.h b/libkcddb/test/asynchttpsubmittest.h
index bbcf8059..270483e0 100644
--- a/libkcddb/test/asynchttpsubmittest.h
+++ b/libkcddb/test/asynchttpsubmittest.h
@@ -8,7 +8,7 @@ using namespace KCDDB;
 
 class AsyncHTTPSubmitTest : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/libkcddb/test/asyncsmtpsubmittest.cpp b/libkcddb/test/asyncsmtpsubmittest.cpp
index 72ee0adc..a146bb11 100644
--- a/libkcddb/test/asyncsmtpsubmittest.cpp
+++ b/libkcddb/test/asyncsmtpsubmittest.cpp
@@ -52,8 +52,8 @@ AsyncSMTPSubmitTest::AsyncSMTPSubmitTest()
   connect
     (
       client_,
-      TQT_SIGNAL(finished(CDDB::Result)),
-      TQT_SLOT(slotFinished(CDDB::Result))
+      TQ_SIGNAL(finished(CDDB::Result)),
+      TQ_SLOT(slotFinished(CDDB::Result))
     );
 
   client_->submit(cdInfo, list);
@@ -64,7 +64,7 @@ AsyncSMTPSubmitTest::slotFinished(CDDB::Result r)
 {
   kdDebug() << "AsyncSMTPSubmitTest::slotFinished: Got " << KCDDB::CDDB::resultToString(r) << endl;
 
-  kapp->quit();
+  tdeApp->quit();
 }
 
 int main(int argc, char ** argv)
diff --git a/libkcddb/test/asyncsmtpsubmittest.h b/libkcddb/test/asyncsmtpsubmittest.h
index d3b68bfc..77eba500 100644
--- a/libkcddb/test/asyncsmtpsubmittest.h
+++ b/libkcddb/test/asyncsmtpsubmittest.h
@@ -8,7 +8,7 @@ using namespace KCDDB;
 
 class AsyncSMTPSubmitTest : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/libkcddb/test/synccddblookuptest.cpp b/libkcddb/test/synccddblookuptest.cpp
index c2c86618..b308cbef 100644
--- a/libkcddb/test/synccddblookuptest.cpp
+++ b/libkcddb/test/synccddblookuptest.cpp
@@ -17,7 +17,7 @@ main(int argc, char ** argv)
   using namespace KCDDB;
 
   Client c;
-  c.config().setHostname("freedb.freedb.org");
+  c.config().setHostname("gnudb.gnudb.org");
   c.config().setPort(8880);
   c.config().setCachePolicy(Cache::Ignore);
   c.config().setLookupTransport(Lookup::CDDBP);
diff --git a/libkcddb/test/synchttplookuptest.cpp b/libkcddb/test/synchttplookuptest.cpp
index 15e76ee8..74ec6bb3 100644
--- a/libkcddb/test/synchttplookuptest.cpp
+++ b/libkcddb/test/synchttplookuptest.cpp
@@ -16,7 +16,7 @@ main(int argc, char ** argv)
   using namespace KCDDB;
 
   Client c;
-  c.config().setHostname("freedb.freedb.org");
+  c.config().setHostname("gnudb.gnudb.org");
   c.config().setPort(80);
   c.config().setCachePolicy(Cache::Ignore);
   c.config().setLookupTransport(Lookup::HTTP);