Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

10 files changed, 31 insertions, 31 deletions

diff --git a/libkcddb/asynccddbplookup.cpp b/libkcddb/asynccddbplookup.cpp
index e4642dbe..f5dcf64d 100644
--- a/libkcddb/asynccddbplookup.cpp
+++ b/libkcddb/asynccddbplookup.cpp
@@ -48,12 +48,12 @@ namespace KCDDB
     
     socket_->setBlocking( false );
 
-    connect (socket_, TQT_SIGNAL(gotError(int)), TQT_SLOT(slotGotError(int)));
+    connect (socket_, TQ_SIGNAL(gotError(int)), TQ_SLOT(slotGotError(int)));
 
-    connect (socket_, TQT_SIGNAL( connected(const KResolverEntry &) ),
-      TQT_SLOT( slotConnectionSuccess() ) );
+    connect (socket_, TQ_SIGNAL( connected(const KResolverEntry &) ),
+      TQ_SLOT( slotConnectionSuccess() ) );
 
-    connect (socket_, TQT_SIGNAL( readyRead() ), TQT_SLOT( slotReadyRead() ) );
+    connect (socket_, TQ_SIGNAL( readyRead() ), TQ_SLOT( slotReadyRead() ) );
 
     if ( trackOffsetList.count() < 3 )
       return UnknownError;
diff --git a/libkcddb/asynchttplookup.cpp b/libkcddb/asynchttplookup.cpp
index b6f26051..3e988f2b 100644
--- a/libkcddb/asynchttplookup.cpp
+++ b/libkcddb/asynchttplookup.cpp
@@ -52,8 +52,8 @@ namespace KCDDB
 
     trackOffsetList_ = trackOffsetList;
 
-    connect( this, TQT_SIGNAL( queryReady() ), TQT_SLOT( slotQueryReady() ) );
-    connect( this, TQT_SIGNAL( readReady() ), TQT_SLOT( requestCDInfoForMatch() ) );
+    connect( this, TQ_SIGNAL( queryReady() ), TQ_SLOT( slotQueryReady() ) );
+    connect( this, TQ_SIGNAL( readReady() ), TQ_SLOT( requestCDInfoForMatch() ) );
 
     initURL( hostName, port );
 
@@ -144,10 +144,10 @@ namespace KCDDB
     if ( 0 == job )
       return ServerError;
 
-    connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
-          TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-          TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+    connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+          TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+          TQ_SLOT( slotResult( TDEIO::Job * ) ) );
 
     return Success;
   }
diff --git a/libkcddb/asynchttpsubmit.cpp b/libkcddb/asynchttpsubmit.cpp
index 246e5804..6201e886 100644
--- a/libkcddb/asynchttpsubmit.cpp
+++ b/libkcddb/asynchttpsubmit.cpp
@@ -36,7 +36,7 @@ namespace KCDDB
   
   CDDB::Result AsyncHTTPSubmit::runJob(TDEIO::Job* job)
   {
-    connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotFinished(TDEIO::Job *)));
+    connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotFinished(TDEIO::Job *)));
 
     return CDDB::Success;
   }
diff --git a/libkcddb/asyncsmtpsubmit.cpp b/libkcddb/asyncsmtpsubmit.cpp
index 1214e951..305f9ce9 100644
--- a/libkcddb/asyncsmtpsubmit.cpp
+++ b/libkcddb/asyncsmtpsubmit.cpp
@@ -38,8 +38,8 @@ namespace KCDDB
 
   CDDB::Result AsyncSMTPSubmit::runJob(TDEIO::Job* job)
   {
-    connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-               this, TQT_SLOT(slotDone( TDEIO::Job* ) ) ); 
+    connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+               this, TQ_SLOT(slotDone( TDEIO::Job* ) ) ); 
 
     return Success;
   }
diff --git a/libkcddb/cdinfoencodingwidget.cpp b/libkcddb/cdinfoencodingwidget.cpp
index f2a7e578..6714c56b 100644
--- a/libkcddb/cdinfoencodingwidget.cpp
+++ b/libkcddb/cdinfoencodingwidget.cpp
@@ -37,8 +37,8 @@ namespace KCDDB
 
     slotEncodingChanged(encodingCombo->currentText());
 
-    connect(encodingCombo,TQT_SIGNAL(activated(const TQString&)),
-        this,TQT_SLOT(slotEncodingChanged(const TQString&)));
+    connect(encodingCombo,TQ_SIGNAL(activated(const TQString&)),
+        this,TQ_SLOT(slotEncodingChanged(const TQString&)));
   }
 
   TQString CDInfoEncodingWidget::selectedEncoding()
diff --git a/libkcddb/client.cpp b/libkcddb/client.cpp
index c1a0102a..38ba5aea 100644
--- a/libkcddb/client.cpp
+++ b/libkcddb/client.cpp
@@ -177,16 +177,16 @@ namespace KCDDB
         cdInfoLookup = new AsyncCDDBPLookup();
 
         connect( static_cast<AsyncCDDBPLookup *>( cdInfoLookup ),
-                  TQT_SIGNAL( finished( CDDB::Result ) ),
-                  TQT_SLOT( slotFinished( CDDB::Result ) ) );
+                  TQ_SIGNAL( finished( CDDB::Result ) ),
+                  TQ_SLOT( slotFinished( CDDB::Result ) ) );
       }
       else
       {
         cdInfoLookup = new AsyncHTTPLookup();
 
         connect( static_cast<AsyncHTTPLookup *>( cdInfoLookup ),
-                  TQT_SIGNAL( finished( CDDB::Result ) ),
-                  TQT_SLOT( slotFinished( CDDB::Result ) ) );
+                  TQ_SIGNAL( finished( CDDB::Result ) ),
+                  TQ_SLOT( slotFinished( CDDB::Result ) ) );
       }
 
       r = cdInfoLookup->lookup( d->config.hostname(),
@@ -267,8 +267,8 @@ namespace KCDDB
         {
           cdInfoSubmit = new AsyncHTTPSubmit(from, hostname, port);
           connect( static_cast<AsyncHTTPSubmit *>( cdInfoSubmit ),
-                  TQT_SIGNAL(finished( CDDB::Result ) ),
-                  TQT_SLOT( slotSubmitFinished( CDDB::Result ) ) );
+                  TQ_SIGNAL(finished( CDDB::Result ) ),
+                  TQ_SLOT( slotSubmitFinished( CDDB::Result ) ) );
         }
         
         break;
@@ -285,8 +285,8 @@ namespace KCDDB
         {
           cdInfoSubmit = new AsyncSMTPSubmit( hostname, port, username, from, d->config.submitAddress() );
           connect( static_cast<AsyncSMTPSubmit *>( cdInfoSubmit ),
-                  TQT_SIGNAL( finished( CDDB::Result ) ),
-                  TQT_SLOT( slotSubmitFinished( CDDB::Result ) ) );
+                  TQ_SIGNAL( finished( CDDB::Result ) ),
+                  TQ_SLOT( slotSubmitFinished( CDDB::Result ) ) );
         }
         break;
       }
diff --git a/libkcddb/test/asynccddblookuptest.cpp b/libkcddb/test/asynccddblookuptest.cpp
index e9100c40..1910527b 100644
--- a/libkcddb/test/asynccddblookuptest.cpp
+++ b/libkcddb/test/asynccddblookuptest.cpp
@@ -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;
diff --git a/libkcddb/test/asynchttplookuptest.cpp b/libkcddb/test/asynchttplookuptest.cpp
index 045e6b15..a86d4a66 100644
--- a/libkcddb/test/asynchttplookuptest.cpp
+++ b/libkcddb/test/asynchttplookuptest.cpp
@@ -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;
diff --git a/libkcddb/test/asynchttpsubmittest.cpp b/libkcddb/test/asynchttpsubmittest.cpp
index 0dd0766e..ace90808 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);
diff --git a/libkcddb/test/asyncsmtpsubmittest.cpp b/libkcddb/test/asyncsmtpsubmittest.cpp
index 72ee0adc..90f6fddd 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);