Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 61b79fc39298cb8646cee439dc032d5bf0169063)

5 files changed, 35 insertions, 35 deletions

diff --git a/libk3b/cddb/k3bcddb.cpp b/libk3b/cddb/k3bcddb.cpp
index a97b9aa..6b01866 100644
--- a/libk3b/cddb/k3bcddb.cpp
+++ b/libk3b/cddb/k3bcddb.cpp
@@ -98,14 +98,14 @@ void K3bCddb::query( const K3bDevice::Toc& toc )
 
   if( m_bLocalCddbQuery ) {
     m_iCurrentQueriedLocalDir = 0;
-    TQTimer::singleShot( 0, this, TQT_SLOT(localQuery()) );
+    TQTimer::singleShot( 0, this, TQ_SLOT(localQuery()) );
   }
   else if( m_bRemoteCddbQuery ) {
     m_iCurrentQueriedServer = 0;
-    TQTimer::singleShot( 0, this, TQT_SLOT(remoteQuery()) );
+    TQTimer::singleShot( 0, this, TQ_SLOT(remoteQuery()) );
   }
   else {
-    TQTimer::singleShot( 0, this, TQT_SLOT(slotNoEntry()) );
+    TQTimer::singleShot( 0, this, TQ_SLOT(slotNoEntry()) );
   }
 }
 
@@ -178,12 +178,12 @@ K3bCddbQuery* K3bCddb::getQuery( const TQString& s )
   if( s.startsWith("Http") ) {
     if( !m_httpQuery ) {
       m_httpQuery = new K3bCddbHttpQuery( this );
-      connect( m_httpQuery, TQT_SIGNAL(infoMessage(const TQString&)),
-	       this, TQT_SIGNAL(infoMessage(const TQString&)) );
-      connect( m_httpQuery, TQT_SIGNAL(queryFinished(K3bCddbQuery*)),
-	       this, TQT_SLOT(slotQueryFinished(K3bCddbQuery*)) );
-      connect( m_httpQuery, TQT_SIGNAL(inexactMatches(K3bCddbQuery*)),
-	       this, TQT_SLOT(slotMultibleMatches(K3bCddbQuery*)) );
+      connect( m_httpQuery, TQ_SIGNAL(infoMessage(const TQString&)),
+	       this, TQ_SIGNAL(infoMessage(const TQString&)) );
+      connect( m_httpQuery, TQ_SIGNAL(queryFinished(K3bCddbQuery*)),
+	       this, TQ_SLOT(slotQueryFinished(K3bCddbQuery*)) );
+      connect( m_httpQuery, TQ_SIGNAL(inexactMatches(K3bCddbQuery*)),
+	       this, TQ_SLOT(slotMultibleMatches(K3bCddbQuery*)) );
     }
 
     m_httpQuery->setServer( server, port );
@@ -194,12 +194,12 @@ K3bCddbQuery* K3bCddb::getQuery( const TQString& s )
   else {
     if( !m_cddbpQuery ) {
       m_cddbpQuery = new K3bCddbpQuery( this );
-      connect( m_cddbpQuery, TQT_SIGNAL(infoMessage(const TQString&)),
-	       this, TQT_SIGNAL(infoMessage(const TQString&)) );
-      connect( m_cddbpQuery, TQT_SIGNAL(queryFinished(K3bCddbQuery*)),
-	       this, TQT_SLOT(slotQueryFinished(K3bCddbQuery*)) );
-      connect( m_cddbpQuery, TQT_SIGNAL(inexactMatches(K3bCddbQuery*)),
-	       this, TQT_SLOT(slotMultibleMatches(K3bCddbQuery*)) );
+      connect( m_cddbpQuery, TQ_SIGNAL(infoMessage(const TQString&)),
+	       this, TQ_SIGNAL(infoMessage(const TQString&)) );
+      connect( m_cddbpQuery, TQ_SIGNAL(queryFinished(K3bCddbQuery*)),
+	       this, TQ_SLOT(slotQueryFinished(K3bCddbQuery*)) );
+      connect( m_cddbpQuery, TQ_SIGNAL(inexactMatches(K3bCddbQuery*)),
+	       this, TQ_SLOT(slotMultibleMatches(K3bCddbQuery*)) );
     }
 
     m_cddbpQuery->setServer( server, port );
@@ -213,12 +213,12 @@ void K3bCddb::localQuery()
 {
   if( !m_localQuery ) {
     m_localQuery = new K3bCddbLocalQuery( this );
-    connect( m_localQuery, TQT_SIGNAL(infoMessage(const TQString&)),
-	     this, TQT_SIGNAL(infoMessage(const TQString&)) );
-    connect( m_localQuery, TQT_SIGNAL(queryFinished(K3bCddbQuery*)),
-	     this, TQT_SLOT(slotQueryFinished(K3bCddbQuery*)) );
-    connect( m_localQuery, TQT_SIGNAL(inexactMatches(K3bCddbQuery*)),
-	     this, TQT_SLOT(slotMultibleMatches(K3bCddbQuery*)) );
+    connect( m_localQuery, TQ_SIGNAL(infoMessage(const TQString&)),
+	     this, TQ_SIGNAL(infoMessage(const TQString&)) );
+    connect( m_localQuery, TQ_SIGNAL(queryFinished(K3bCddbQuery*)),
+	     this, TQ_SLOT(slotQueryFinished(K3bCddbQuery*)) );
+    connect( m_localQuery, TQ_SIGNAL(inexactMatches(K3bCddbQuery*)),
+	     this, TQ_SLOT(slotMultibleMatches(K3bCddbQuery*)) );
   }
   
   m_localQuery->setCddbDir( m_localCddbDirs[m_iCurrentQueriedLocalDir] );
@@ -261,8 +261,8 @@ void K3bCddb::saveEntry( const K3bCddbResultEntry& entry )
 {
   if( !m_localSubmit ) {
     m_localSubmit = new K3bCddbLocalSubmit( this );
-    connect( m_localSubmit, TQT_SIGNAL(submitFinished(K3bCddbSubmit*)),
-	     this, TQT_SLOT(slotSubmitFinished(K3bCddbSubmit*)) );
+    connect( m_localSubmit, TQ_SIGNAL(submitFinished(K3bCddbSubmit*)),
+	     this, TQ_SLOT(slotSubmitFinished(K3bCddbSubmit*)) );
   }
   
   m_localSubmit->setCddbDir( m_localCddbDirs[0] );
diff --git a/libk3b/cddb/k3bcddbhttpquery.cpp b/libk3b/cddb/k3bcddbhttpquery.cpp
index 1808584..b86797f 100644
--- a/libk3b/cddb/k3bcddbhttpquery.cpp
+++ b/libk3b/cddb/k3bcddbhttpquery.cpp
@@ -87,10 +87,10 @@ void K3bCddbHttpQuery::performCommand( const TQString& cmd )
     return;
   }
 
-  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*)) );
 }
 
 
diff --git a/libk3b/cddb/k3bcddbpquery.cpp b/libk3b/cddb/k3bcddbpquery.cpp
index ed3a8f9..35a7a9b 100644
--- a/libk3b/cddb/k3bcddbpquery.cpp
+++ b/libk3b/cddb/k3bcddbpquery.cpp
@@ -32,11 +32,11 @@ K3bCddbpQuery::K3bCddbpQuery( TQObject* parent, const char* name )
   m_stream.setDevice( m_socket );
   m_stream.setEncoding( TQTextStream::UnicodeUTF8 );
 
-  connect( m_socket, TQT_SIGNAL(connected()), this, TQT_SLOT(slotConnected()) );
-  connect( m_socket, TQT_SIGNAL(hostFound()), this, TQT_SLOT(slotHostFound()) );
-  connect( m_socket, TQT_SIGNAL(connectionClosed()), this, TQT_SLOT(slotConnectionClosed()) );
-  connect( m_socket, TQT_SIGNAL(error(int)), this, TQT_SLOT(slotError(int)) );
-  connect( m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead()) );
+  connect( m_socket, TQ_SIGNAL(connected()), this, TQ_SLOT(slotConnected()) );
+  connect( m_socket, TQ_SIGNAL(hostFound()), this, TQ_SLOT(slotHostFound()) );
+  connect( m_socket, TQ_SIGNAL(connectionClosed()), this, TQ_SLOT(slotConnectionClosed()) );
+  connect( m_socket, TQ_SIGNAL(error(int)), this, TQ_SLOT(slotError(int)) );
+  connect( m_socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotReadyRead()) );
 }
 
 
diff --git a/libk3b/cddb/k3bcddbquery.cpp b/libk3b/cddb/k3bcddbquery.cpp
index d6d65d1..facf224 100644
--- a/libk3b/cddb/k3bcddbquery.cpp
+++ b/libk3b/cddb/k3bcddbquery.cpp
@@ -53,7 +53,7 @@ void K3bCddbQuery::query( const K3bDevice::Toc& toc )
   m_toc = toc;
   m_inexactMatches.clear();
 
-  TQTimer::singleShot( 0, this, TQT_SLOT(doQuery()) );
+  TQTimer::singleShot( 0, this, TQ_SLOT(doQuery()) );
 }
 
 
@@ -64,7 +64,7 @@ void K3bCddbQuery::queryMatch( const K3bCddbResultHeader& header )
   m_result.category = header.category;
   m_result.discid = header.discid;
 
-  TQTimer::singleShot( 0, this, TQT_SLOT(doMatchQuery()) );
+  TQTimer::singleShot( 0, this, TQ_SLOT(doMatchQuery()) );
 }
 
 
diff --git a/libk3b/cddb/k3bcddbsubmit.cpp b/libk3b/cddb/k3bcddbsubmit.cpp
index 06e123f..45abc06 100644
--- a/libk3b/cddb/k3bcddbsubmit.cpp
+++ b/libk3b/cddb/k3bcddbsubmit.cpp
@@ -37,7 +37,7 @@ void K3bCddbSubmit::submit( const K3bCddbResultEntry& entry )
   if( m_resultEntry.rawData.isEmpty() )
     createDataStream( m_resultEntry );
 
-  TQTimer::singleShot( 0, this, TQT_SLOT(doSubmit()) );
+  TQTimer::singleShot( 0, this, TQ_SLOT(doSubmit()) );
 }