Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 38 insertions, 38 deletions

diff --git a/src/convert.cpp b/src/convert.cpp
index f86d31b..40ef75c 100644
--- a/src/convert.cpp
+++ b/src/convert.cpp
@@ -47,26 +47,26 @@ Convert::Convert( Config* _config, TagEngine* _tagEngine, CDManager* _cdManager,
     tagEngine = _tagEngine;
     cdManager = _cdManager;
     fileList = _fileList;
-    connect( fileList, TQT_SIGNAL(convertItem(FileListItem*)),
-               this, TQT_SLOT(add(FileListItem*))
+    connect( fileList, TQ_SIGNAL(convertItem(FileListItem*)),
+               this, TQ_SLOT(add(FileListItem*))
              );
-    connect( fileList, TQT_SIGNAL(stopItem(FileListItem*)),
-               this, TQT_SLOT(stop(FileListItem*))
+    connect( fileList, TQ_SIGNAL(stopItem(FileListItem*)),
+               this, TQ_SLOT(stop(FileListItem*))
              );
-    connect( this, TQT_SIGNAL(finished(FileListItem*,int)),
-               fileList, TQT_SLOT(itemFinished(FileListItem*,int))
+    connect( this, TQ_SIGNAL(finished(FileListItem*,int)),
+               fileList, TQ_SLOT(itemFinished(FileListItem*,int))
              );
-    connect( this, TQT_SIGNAL(rippingFinished(const TQString&)),
-               fileList, TQT_SLOT(rippingFinished(const TQString&))
+    connect( this, TQ_SIGNAL(rippingFinished(const TQString&)),
+               fileList, TQ_SLOT(rippingFinished(const TQString&))
              );
     logger = _logger;
-    connect( this, TQT_SIGNAL(finishedProcess(int,int)),
-               logger, TQT_SLOT(processCompleted(int,int))
+    connect( this, TQ_SIGNAL(finishedProcess(int,int)),
+               logger, TQ_SLOT(processCompleted(int,int))
              );
 
     tUpdateProgressIndicator = new TQTimer( this, "tUpdateProgressIndicator" );
-    connect( tUpdateProgressIndicator, TQT_SIGNAL(timeout()),
-               this, TQT_SLOT(updateProgressIndicator())
+    connect( tUpdateProgressIndicator, TQ_SIGNAL(timeout()),
+               this, TQ_SLOT(updateProgressIndicator())
              );
 }
 
@@ -102,11 +102,11 @@ void Convert::get( ConvertItem* item )
     }
     else {
         item->moveJob = new TDEIO::FileCopyJob( source, destination, -1, false, true, false, false );
-        connect( item->moveJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)),
-                this, TQT_SLOT(moveProgress(TDEIO::Job*,unsigned long))
+        connect( item->moveJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)),
+                this, TQ_SLOT(moveProgress(TDEIO::Job*,unsigned long))
                 );
-        connect( item->moveJob, TQT_SIGNAL(result(TDEIO::Job*)),
-                this, TQT_SLOT(moveFinished(TDEIO::Job*))
+        connect( item->moveJob, TQ_SIGNAL(result(TDEIO::Job*)),
+                this, TQ_SLOT(moveFinished(TDEIO::Job*))
                 );
     }
 }
@@ -143,11 +143,11 @@ void Convert::getCorrection( ConvertItem* item )
     }
     else {
         item->moveJob = new TDEIO::FileCopyJob( source, destination, -1, false, true, false, false );
-        connect( item->moveJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)),
-                this, TQT_SLOT(moveProgress(TDEIO::Job*,unsigned long))
+        connect( item->moveJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)),
+                this, TQ_SLOT(moveProgress(TDEIO::Job*,unsigned long))
                 );
-        connect( item->moveJob, TQT_SIGNAL(result(TDEIO::Job*)),
-                this, TQT_SLOT(moveFinished(TDEIO::Job*))
+        connect( item->moveJob, TQ_SIGNAL(result(TDEIO::Job*)),
+                this, TQ_SLOT(moveFinished(TDEIO::Job*))
                 );
     }
 }
@@ -193,11 +193,11 @@ void Convert::rip( ConvertItem* item )
         item->fileListItem->ripping = true;
 
         item->moveJob = new TDEIO::FileCopyJob( source, dest, -1, false, true, false, false );
-        connect( item->moveJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)),
-                   this, TQT_SLOT(moveProgress(TDEIO::Job*,unsigned long))
+        connect( item->moveJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)),
+                   this, TQ_SLOT(moveProgress(TDEIO::Job*,unsigned long))
                  );
-        connect( item->moveJob, TQT_SIGNAL(result(TDEIO::Job*)),
-                   this, TQT_SLOT(moveFinished(TDEIO::Job*))
+        connect( item->moveJob, TQ_SIGNAL(result(TDEIO::Job*)),
+                   this, TQ_SLOT(moveFinished(TDEIO::Job*))
                  );
     }
     else {
@@ -637,11 +637,11 @@ void Convert::put( ConvertItem* item )
     }
     else {
         item->moveJob = new TDEIO::FileCopyJob( source, destination, -1, false, false, false, false );
-        connect( item->moveJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)),
-                this, TQT_SLOT(moveProgress(TDEIO::Job*,unsigned long))
+        connect( item->moveJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)),
+                this, TQ_SLOT(moveProgress(TDEIO::Job*,unsigned long))
                 );
-        connect( item->moveJob, TQT_SIGNAL(result(TDEIO::Job*)),
-                this, TQT_SLOT(moveFinished(TDEIO::Job*))
+        connect( item->moveJob, TQ_SIGNAL(result(TDEIO::Job*)),
+                this, TQ_SLOT(moveFinished(TDEIO::Job*))
                 );
     }
 }
@@ -676,11 +676,11 @@ void Convert::putCorrection( ConvertItem* item )
     }
     else {
         item->moveJob = new TDEIO::FileCopyJob( source, destination, -1, false, false, false, false );
-        connect( item->moveJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)),
-                this, TQT_SLOT(moveProgress(TDEIO::Job*,unsigned long))
+        connect( item->moveJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)),
+                this, TQ_SLOT(moveProgress(TDEIO::Job*,unsigned long))
                 );
-        connect( item->moveJob, TQT_SIGNAL(result(TDEIO::Job*)),
-                this, TQT_SLOT(moveFinished(TDEIO::Job*))
+        connect( item->moveJob, TQ_SIGNAL(result(TDEIO::Job*)),
+                this, TQ_SLOT(moveFinished(TDEIO::Job*))
                 );
     }
 }
@@ -1319,14 +1319,14 @@ void Convert::add( FileListItem* item )
 
     // connect convertProcess of our new item with the slots of Convert
     (*newItem)->convertProcess = new TDEProcess();
-    connect( (*newItem)->convertProcess, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
-               this, TQT_SLOT(processOutput(TDEProcess*,char*,int))
+    connect( (*newItem)->convertProcess, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+               this, TQ_SLOT(processOutput(TDEProcess*,char*,int))
              );
-    connect( (*newItem)->convertProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
-               this, TQT_SLOT(processOutput(TDEProcess*,char*,int))
+    connect( (*newItem)->convertProcess, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+               this, TQ_SLOT(processOutput(TDEProcess*,char*,int))
              );
-    connect( (*newItem)->convertProcess, TQT_SIGNAL(processExited(TDEProcess*)),
-               this, TQT_SLOT(processExit(TDEProcess*))
+    connect( (*newItem)->convertProcess, TQ_SIGNAL(processExited(TDEProcess*)),
+               this, TQ_SLOT(processExit(TDEProcess*))
              );
 
     // NOTE the tempInFile is also created if the file is a audio cd track