Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

3 files changed, 42 insertions, 42 deletions

diff --git a/libk3b/core/k3bcore.cpp b/libk3b/core/k3bcore.cpp
index 293d74f..a17225c 100644
--- a/libk3b/core/k3bcore.cpp
+++ b/libk3b/core/k3bcore.cpp
@@ -202,10 +202,10 @@ void K3bCore::init()
 
   externalBinManager()->search();
 
-  connect( K3bDevice::Connection::instance(), TQT_SIGNAL(deviceAdded(const TQString&)),
-	   deviceManager(), TQT_SLOT(addDevice(const TQString&)) );
-  connect( K3bDevice::Connection::instance(), TQT_SIGNAL(deviceRemoved(const TQString&)),
-	   deviceManager(), TQT_SLOT(removeDevice(const TQString&)) );
+  connect( K3bDevice::Connection::instance(), TQ_SIGNAL(deviceAdded(const TQString&)),
+	   deviceManager(), TQ_SLOT(addDevice(const TQString&)) );
+  connect( K3bDevice::Connection::instance(), TQ_SIGNAL(deviceRemoved(const TQString&)),
+	   deviceManager(), TQ_SLOT(removeDevice(const TQString&)) );
   TQStringList devList = K3bDevice::Connection::instance()->devices();
   if( devList.isEmpty() )
     deviceManager()->scanBus();
diff --git a/libk3b/core/k3bjob.cpp b/libk3b/core/k3bjob.cpp
index 0e169b1..1f6bbaa 100644
--- a/libk3b/core/k3bjob.cpp
+++ b/libk3b/core/k3bjob.cpp
@@ -40,8 +40,8 @@ K3bJob::K3bJob( K3bJobHandler* handler, TQObject* parent, const char* name )
     m_canceled(false),
     m_active(false)
 {
-  connect( this, TQT_SIGNAL(canceled()),
-	   this, TQT_SLOT(slotCanceled()) );
+  connect( this, TQ_SIGNAL(canceled()),
+	   this, TQ_SLOT(slotCanceled()) );
 }
 
 K3bJob::~K3bJob()
@@ -128,23 +128,23 @@ void K3bJob::connectSubJob( K3bJob* subJob,
 			    const char* processedSizeSlot,
 			    const char* processedSubSizeSlot )
 {
-  connect( subJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) );
-  connect( subJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SLOT(slotNewSubTask(const TQString&)) );
-  connect( subJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
-	   this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
-  connect( subJob, TQT_SIGNAL(infoMessage(const TQString&, int)),
-	   this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
-  connect( subJob, TQT_SIGNAL(finished(bool)), this, finishedSlot );
+  connect( subJob, TQ_SIGNAL(newTask(const TQString&)), this, TQ_SIGNAL(newSubTask(const TQString&)) );
+  connect( subJob, TQ_SIGNAL(newSubTask(const TQString&)), this, TQ_SLOT(slotNewSubTask(const TQString&)) );
+  connect( subJob, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+	   this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
+  connect( subJob, TQ_SIGNAL(infoMessage(const TQString&, int)),
+	   this, TQ_SIGNAL(infoMessage(const TQString&, int)) );
+  connect( subJob, TQ_SIGNAL(finished(bool)), this, finishedSlot );
 
   if( connectProgress ) {
-    connect( subJob, TQT_SIGNAL(percent(int)), 
-	       this, progressSlot != 0 ? progressSlot : TQT_SIGNAL(subPercent(int)) );
+    connect( subJob, TQ_SIGNAL(percent(int)), 
+	       this, progressSlot != 0 ? progressSlot : TQ_SIGNAL(subPercent(int)) );
     if( subProgressSlot )
-      connect( subJob, TQT_SIGNAL(subPercent(int)), this, subProgressSlot );
-    connect( subJob, TQT_SIGNAL(processedSize(int, int)), 
-	     this, processedSizeSlot != 0 ? processedSizeSlot : TQT_SIGNAL(processedSubSize(int, int)) );
+      connect( subJob, TQ_SIGNAL(subPercent(int)), this, subProgressSlot );
+    connect( subJob, TQ_SIGNAL(processedSize(int, int)), 
+	     this, processedSizeSlot != 0 ? processedSizeSlot : TQ_SIGNAL(processedSubSize(int, int)) );
     if( processedSubSizeSlot )
-      connect( subJob, TQT_SIGNAL(processedSubSize(int, int)), this, processedSubSizeSlot );
+      connect( subJob, TQ_SIGNAL(processedSubSize(int, int)), this, processedSubSizeSlot );
   }
 }
 
@@ -159,42 +159,42 @@ void K3bJob::connectSubJob( K3bJob* subJob,
 			    const char* processedSubSizeSlot )
 {
   // standard connections
-  connect( subJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
-	   this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
-  connect( subJob, TQT_SIGNAL(infoMessage(const TQString&, int)),
-	   this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
+  connect( subJob, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+	   this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
+  connect( subJob, TQ_SIGNAL(infoMessage(const TQString&, int)),
+	   this, TQ_SIGNAL(infoMessage(const TQString&, int)) );
 
   // task connections
   if( newTaskSlot == DEFAULT_SIGNAL_CONNECTION )
-    connect( subJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) );
+    connect( subJob, TQ_SIGNAL(newTask(const TQString&)), this, TQ_SIGNAL(newSubTask(const TQString&)) );
   else if( newTaskSlot )
-    connect( subJob, TQT_SIGNAL(newTask(const TQString&)), this, newTaskSlot );
+    connect( subJob, TQ_SIGNAL(newTask(const TQString&)), this, newTaskSlot );
 
   if( newSubTaskSlot == DEFAULT_SIGNAL_CONNECTION )
-    connect( subJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SLOT(slotNewSubTask(const TQString&)) );
+    connect( subJob, TQ_SIGNAL(newSubTask(const TQString&)), this, TQ_SLOT(slotNewSubTask(const TQString&)) );
   else if( newSubTaskSlot )
-    connect( subJob, TQT_SIGNAL(newSubTask(const TQString&)), this, newSubTaskSlot );
+    connect( subJob, TQ_SIGNAL(newSubTask(const TQString&)), this, newSubTaskSlot );
 
   if( finishedSlot && finishedSlot != DEFAULT_SIGNAL_CONNECTION )
-    connect( subJob, TQT_SIGNAL(finished(bool)), this, finishedSlot );
+    connect( subJob, TQ_SIGNAL(finished(bool)), this, finishedSlot );
 
   // progress
   if( progressSlot == DEFAULT_SIGNAL_CONNECTION )
-    connect( subJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(subPercent(int)) );
+    connect( subJob, TQ_SIGNAL(percent(int)), this, TQ_SIGNAL(subPercent(int)) );
   else if( progressSlot )
-    connect( subJob, TQT_SIGNAL(percent(int)), this, progressSlot );
+    connect( subJob, TQ_SIGNAL(percent(int)), this, progressSlot );
 
   if( subProgressSlot && subProgressSlot != DEFAULT_SIGNAL_CONNECTION )
-    connect( subJob, TQT_SIGNAL(subPercent(int)), this, subProgressSlot );
+    connect( subJob, TQ_SIGNAL(subPercent(int)), this, subProgressSlot );
 
   // processed size
   if( processedSizeSlot == DEFAULT_SIGNAL_CONNECTION )
-    connect( subJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
+    connect( subJob, TQ_SIGNAL(processedSize(int, int)), this, TQ_SIGNAL(processedSubSize(int, int)) );
   else if( processedSizeSlot )
-    connect( subJob, TQT_SIGNAL(processedSize(int, int)), this, processedSizeSlot );
+    connect( subJob, TQ_SIGNAL(processedSize(int, int)), this, processedSizeSlot );
 
   if( processedSubSizeSlot && processedSubSizeSlot != DEFAULT_SIGNAL_CONNECTION )
-    connect( subJob, TQT_SIGNAL(processedSubSize(int, int)), this, processedSubSizeSlot );
+    connect( subJob, TQ_SIGNAL(processedSubSize(int, int)), this, processedSubSizeSlot );
 }
 
 
diff --git a/libk3b/core/k3bprocess.cpp b/libk3b/core/k3bprocess.cpp
index 304c0f5..31ca4ae 100644
--- a/libk3b/core/k3bprocess.cpp
+++ b/libk3b/core/k3bprocess.cpp
@@ -104,12 +104,12 @@ K3bProcess& K3bProcess::operator<<( const TQStringList& args )
 bool K3bProcess::start( RunMode run, Communication com )
 {
   if( com & Stderr ) {
-    connect( this, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
-	     this, TQT_SLOT(slotSplitStderr(TDEProcess*, char*, int)) );
+    connect( this, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+	     this, TQ_SLOT(slotSplitStderr(TDEProcess*, char*, int)) );
   }
   if( com & Stdout ) {
-    connect( this, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
-	     this, TQT_SLOT(slotSplitStdout(TDEProcess*, char*, int)) );
+    connect( this, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+	     this, TQ_SLOT(slotSplitStdout(TDEProcess*, char*, int)) );
   }
 
   return TDEProcess::start( run, com );
@@ -425,10 +425,10 @@ void K3bProcessOutputCollector::setProcess( TDEProcess* p )
 
   m_process = p;
   if( p ) {
-    connect( p, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), 
-	     this, TQT_SLOT(slotGatherStdout(TDEProcess*, char*, int)) );
-    connect( p, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), 
-	     this, TQT_SLOT(slotGatherStderr(TDEProcess*, char*, int)) );
+    connect( p, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), 
+	     this, TQ_SLOT(slotGatherStdout(TDEProcess*, char*, int)) );
+    connect( p, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), 
+	     this, TQ_SLOT(slotGatherStderr(TDEProcess*, char*, int)) );
   }
 
   m_gatheredOutput.truncate( 0 );