Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit af0b8f5d1e5e00b1f3b48658d89876c2df28e71c)

1 files changed, 56 insertions, 56 deletions

diff --git a/ark/tar.cpp b/ark/tar.cpp
index 52e8adb..0cef2dc 100644
--- a/ark/tar.cpp
+++ b/ark/tar.cpp
@@ -156,13 +156,13 @@ void TarArch::updateArch()
           *kp << "cat" << tmpfile;
 
 
-      connect(kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
-              this, TQT_SLOT(updateProgress( TDEProcess *, char *, int )));
-      connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
-               (Arch *)this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
+      connect(kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+              this, TQ_SLOT(updateProgress( TDEProcess *, char *, int )));
+      connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+               (Arch *)this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
 
-      connect(kp, TQT_SIGNAL(processExited(TDEProcess *)),
-               this, TQT_SLOT(updateFinished(TDEProcess *)) );
+      connect(kp, TQ_SIGNAL(processExited(TDEProcess *)),
+               this, TQ_SLOT(updateFinished(TDEProcess *)) );
 
       if ( !fd || kp->start(TDEProcess::NotifyOnExit, flag) == false)
         {
@@ -269,12 +269,12 @@ void TarArch::open()
     m_header_removed = false;
     m_finished = false;
 
-    connect(kp, TQT_SIGNAL(processExited(TDEProcess *)),
-            this, TQT_SLOT(slotListingDone(TDEProcess *)));
-    connect(kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
-        this, TQT_SLOT(slotReceivedOutput( TDEProcess *, char *, int )));
-    connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
-        this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
+    connect(kp, TQ_SIGNAL(processExited(TDEProcess *)),
+            this, TQ_SLOT(slotListingDone(TDEProcess *)));
+    connect(kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+        this, TQ_SLOT(slotReceivedOutput( TDEProcess *, char *, int )));
+    connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+        this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
 
     if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false)
     {
@@ -291,7 +291,7 @@ void TarArch::open()
     }
     else
     {
-        connect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( openFirstCreateTempDone() ) );
+        connect( this, TQ_SIGNAL( createTempDone() ), this, TQ_SLOT( openFirstCreateTempDone() ) );
         createTmp();
     }
 }
@@ -301,7 +301,7 @@ void TarArch::openFirstCreateTempDone()
     if ( compressed && ( m_fileMimeType != "application/x-tgz" )
             && ( m_fileMimeType != "application/x-tbz" ) )
     {
-        disconnect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( openFirstCreateTempDone() ) );
+        disconnect( this, TQ_SIGNAL( createTempDone() ), this, TQ_SLOT( openFirstCreateTempDone() ) );
         Q_ASSERT( !m_listingThread );
         m_listingThread = new TarListingThread( this, tmpfile );
     }
@@ -409,12 +409,12 @@ void TarArch::createTmp()
             }
             *kp << "-c" << m_filename;
 
-            connect(kp, TQT_SIGNAL(processExited(TDEProcess *)),
-                    this, TQT_SLOT(createTmpFinished(TDEProcess *)));
-            connect(kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
-                    this, TQT_SLOT(createTmpProgress( TDEProcess *, char *, int )));
-            connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
-                    this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
+            connect(kp, TQ_SIGNAL(processExited(TDEProcess *)),
+                    this, TQ_SLOT(createTmpFinished(TDEProcess *)));
+            connect(kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+                    this, TQ_SLOT(createTmpProgress( TDEProcess *, char *, int )));
+            connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+                    this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
             if (kp->start(TDEProcess::NotifyOnExit, flag ) == false)
             {
                 KMessageBox::error(0, i18n("Unable to fork a decompressor"));
@@ -514,22 +514,22 @@ void TarArch::addFile( const TQStringList&  urls )
   // first. So we'll first delete all the old files matching the names of
   // those in urls.
   m_bNotifyWhenDeleteFails = false;
-  connect( this, TQT_SIGNAL( removeDone() ), this, TQT_SLOT( deleteOldFilesDone() ) );
+  connect( this, TQ_SIGNAL( removeDone() ), this, TQ_SLOT( deleteOldFilesDone() ) );
   deleteOldFiles(urls, ArkSettings::replaceOnlyWithNewer());
 }
 
 void TarArch::deleteOldFilesDone()
 {
-  disconnect( this, TQT_SIGNAL( removeDone() ), this, TQT_SLOT( deleteOldFilesDone() ) );
+  disconnect( this, TQ_SIGNAL( removeDone() ), this, TQ_SLOT( deleteOldFilesDone() ) );
   m_bNotifyWhenDeleteFails = true;
 
-  connect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( addFileCreateTempDone() ) );
+  connect( this, TQ_SIGNAL( createTempDone() ), this, TQ_SLOT( addFileCreateTempDone() ) );
   createTmp();
 }
 
 void TarArch::addFileCreateTempDone()
 {
-  disconnect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( addFileCreateTempDone() ) );
+  disconnect( this, TQ_SIGNAL( createTempDone() ), this, TQ_SLOT( addFileCreateTempDone() ) );
   TQStringList * urls = &m_filesToAdd;
 
   TDEProcess *kp = m_currentProcess = new TDEProcess;
@@ -562,13 +562,13 @@ void TarArch::addFileCreateTempDone()
       kdDebug(1601) << *strTemp << " " << endl;
     }
 
-  connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
-           this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
-  connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
-           this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
+  connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+           this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
+  connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+           this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
 
-  connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this,
-           TQT_SLOT(slotAddFinished(TDEProcess*)));
+  connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this,
+           TQ_SLOT(slotAddFinished(TDEProcess*)));
 
   if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false)
     {
@@ -579,13 +579,13 @@ void TarArch::addFileCreateTempDone()
 
 void TarArch::slotAddFinished(TDEProcess *_kp)
 {
-  disconnect( _kp, TQT_SIGNAL(processExited(TDEProcess*)), this,
-              TQT_SLOT(slotAddFinished(TDEProcess*)));
+  disconnect( _kp, TQ_SIGNAL(processExited(TDEProcess*)), this,
+              TQ_SLOT(slotAddFinished(TDEProcess*)));
   m_pTmpProc = _kp;
   m_filesToAdd = TQStringList();
   if ( compressed )
   {
-    connect( this, TQT_SIGNAL( updateDone() ), this, TQT_SLOT( addFinishedUpdateDone() ) );
+    connect( this, TQ_SIGNAL( updateDone() ), this, TQ_SLOT( addFinishedUpdateDone() ) );
     updateArch();
   }
   else
@@ -595,7 +595,7 @@ void TarArch::slotAddFinished(TDEProcess *_kp)
 void TarArch::addFinishedUpdateDone()
 {
   if ( compressed )
-    disconnect( this, TQT_SIGNAL( updateDone() ), this, TQT_SLOT( addFinishedUpdateDone() ) );
+    disconnect( this, TQ_SIGNAL( updateDone() ), this, TQ_SLOT( addFinishedUpdateDone() ) );
   Arch::slotAddExited( m_pTmpProc ); // this will delete _kp
   m_pTmpProc = NULL;
 }
@@ -641,13 +641,13 @@ void TarArch::unarchFileInternal()
         }
     }
 
-  connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
-           this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
-  connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
-           this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
+  connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+           this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
+  connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+           this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
 
-  connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this,
-           TQT_SLOT(slotExtractExited(TDEProcess*)));
+  connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this,
+           TQ_SLOT(slotExtractExited(TDEProcess*)));
 
   if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false)
     {
@@ -661,13 +661,13 @@ void TarArch::remove(TQStringList *list)
 {
   deleteInProgress = true;
   m_filesToRemove = *list;
-  connect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( removeCreateTempDone() ) );
+  connect( this, TQ_SIGNAL( createTempDone() ), this, TQ_SLOT( removeCreateTempDone() ) );
   createTmp();
 }
 
 void TarArch::removeCreateTempDone()
 {
-  disconnect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( removeCreateTempDone() ) );
+  disconnect( this, TQ_SIGNAL( createTempDone() ), this, TQ_SLOT( removeCreateTempDone() ) );
 
   TQString name, tmp;
   TDEProcess *kp = m_currentProcess = new TDEProcess;
@@ -685,13 +685,13 @@ void TarArch::removeCreateTempDone()
     }
   m_filesToRemove = TQStringList();
 
-  connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
-           this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
-  connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
-           this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
+  connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+           this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
+  connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+           this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
 
-  connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this,
-           TQT_SLOT(slotDeleteExited(TDEProcess*)));
+  connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this,
+           TQ_SLOT(slotDeleteExited(TDEProcess*)));
 
   if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false)
     {
@@ -705,7 +705,7 @@ void TarArch::slotDeleteExited(TDEProcess *_kp)
   m_pTmpProc2 = _kp;
   if ( compressed )
   {
-    connect( this, TQT_SIGNAL( updateDone() ), this, TQT_SLOT( removeUpdateDone() ) );
+    connect( this, TQ_SIGNAL( updateDone() ), this, TQ_SLOT( removeUpdateDone() ) );
     updateArch();
   }
   else
@@ -715,7 +715,7 @@ void TarArch::slotDeleteExited(TDEProcess *_kp)
 void TarArch::removeUpdateDone()
 {
   if ( compressed )
-    disconnect( this, TQT_SIGNAL( updateDone() ), this, TQT_SLOT( removeUpdateDone() ) );
+    disconnect( this, TQ_SIGNAL( updateDone() ), this, TQ_SLOT( removeUpdateDone() ) );
 
   deleteInProgress = false;
   emit removeDone();
@@ -806,12 +806,12 @@ void TarArch::test()
 
   *kp << m_filename;
 
-  connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
-           SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
-  connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
-           SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
-  connect( kp, SIGNAL( processExited(TDEProcess*) ),
-           SLOT( slotTestExited(TDEProcess*) ) );
+  connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ),
+           TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+  connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ),
+           TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) );
+  connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ),
+           TQ_SLOT( slotTestExited(TDEProcess*) ) );
 
   if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
   {