Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

10 files changed, 37 insertions, 37 deletions

diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
index 265d759b7..5c49478e4 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
@@ -90,7 +90,7 @@ GpgME::Error Kleo::ChiasmusJob::setup() {
                                              : SymCryptRunProcessBase::Decrypt,
                                              this, "symcryptrun" );
   TQTimer::singleShot( timeoutEntry->uintValue() * 1000, this, 
-                      TQT_SLOT( slotTimeout() ) );
+                      TQ_SLOT( slotTimeout() ) );
   return 0;
 }
 
@@ -110,8 +110,8 @@ GpgME::Error Kleo::ChiasmusJob::start() {
   if ( const GpgME::Error err = setup() )
     return mError = err;
 
-  connect( mSymCryptRun, TQT_SIGNAL(processExited(TDEProcess*)),
-           this, TQT_SLOT(slotProcessExited(TDEProcess*)) );
+  connect( mSymCryptRun, TQ_SIGNAL(processExited(TDEProcess*)),
+           this, TQ_SLOT(slotProcessExited(TDEProcess*)) );
 
   if ( !mSymCryptRun->launch( mInput ) )
     return mError = gpg_error( GPG_ERR_ENOENT ); // what else?
diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
index d7ae22c1f..90f512435 100644
--- a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
+++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
@@ -70,7 +70,7 @@ Kleo::ObtainKeysJob::ObtainKeysJob()
 Kleo::ObtainKeysJob::~ObtainKeysJob() {}
 
 GpgME::Error Kleo::ObtainKeysJob::start() {
-  TQTimer::singleShot( 0, this, TQT_SLOT(slotPerform()) );
+  TQTimer::singleShot( 0, this, TQ_SLOT(slotPerform()) );
   return mError = 0;
 }
 
@@ -109,7 +109,7 @@ void Kleo::ObtainKeysJob::slotPerform( bool async ) {
   ++mIndex;
 
   if ( async )
-    TQTimer::singleShot( 0, this, TQT_SLOT(slotPerform()) );
+    TQTimer::singleShot( 0, this, TQ_SLOT(slotPerform()) );
   else
     slotPerform( false );
 }
diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp
index 9391f023f..34ac1d66f 100644
--- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp
+++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp
@@ -58,10 +58,10 @@ Kleo::SymCryptRunProcessBase::SymCryptRunProcessBase( const TQString & class_, c
 Kleo::SymCryptRunProcessBase::~SymCryptRunProcessBase() {}
 
 bool Kleo::SymCryptRunProcessBase::launch( const TQByteArray & input, RunMode rm ) {
-  connect( this, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
-           this, TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) );
-  connect( this, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
-           this, TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) );
+  connect( this, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+           this, TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) );
+  connect( this, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+           this, TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) );
   if ( rm == Block ) {
     KTempFile tempfile;
     tempfile.setAutoDelete( true );
@@ -80,7 +80,7 @@ bool Kleo::SymCryptRunProcessBase::launch( const TQByteArray & input, RunMode rm
       return ok;
     mInput = input.copy();
     writeStdin( mInput.begin(), mInput.size() );
-    connect( this, TQT_SIGNAL(wroteStdin(TDEProcess*)), this, TQT_SLOT(closeStdin()) );
+    connect( this, TQ_SIGNAL(wroteStdin(TDEProcess*)), this, TQ_SLOT(closeStdin()) );
     return true;
   }
 }
diff --git a/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp b/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp
index 3d28ac4bc..5ab837152 100644
--- a/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp
+++ b/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp
@@ -264,7 +264,7 @@ GpgME::Error Kleo::KpgpKeyListJob::start( const TQStringList & patterns,
                                           bool secretOnly ) {
   mPatterns = patterns;
   mSecretOnly = secretOnly;
-  TQTimer::singleShot( 0, this, TQT_SLOT( slotDoIt() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( slotDoIt() ) );
   return GpgME::Error( 0 );
 }
 
diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
index bfd00ac92..e0da7eca4 100644
--- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
+++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
@@ -113,7 +113,7 @@ int Kleo::GnuPGProcessBase::commSetupDoneP() {
   if ( d->usetStatusFD ) {
     ::close( d->statusFD[1] ); // close the input end of the pipe, we're the reader
     d->statnot = new TQSocketNotifier( d->statusFD[0], TQSocketNotifier::Read, this );
-    connect( d->statnot, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChildStatus(int)) );
+    connect( d->statnot, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChildStatus(int)) );
   }
   return TDEProcess::commSetupDoneP();
 }
diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
index e73b4363f..2b81c6b1a 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
@@ -75,8 +75,8 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors )
   proc << "gpgconf"; // must be in the PATH
   proc << "--list-components";
 
-  TQObject::connect( &proc, TQT_SIGNAL( readReady(KProcIO*) ),
-                    this, TQT_SLOT( slotCollectStdOut(KProcIO*) ) );
+  TQObject::connect( &proc, TQ_SIGNAL( readReady(KProcIO*) ),
+                    this, TQ_SLOT( slotCollectStdOut(KProcIO*) ) );
 
   // run the process:
   int rc = 0;
@@ -173,8 +173,8 @@ void QGpgMECryptoConfigComponent::runGpgConf()
 
   //kdDebug(5150) << "Running gpgconf --list-options " << mName << endl;
 
-  TQObject::connect( &proc, TQT_SIGNAL( readReady(KProcIO*) ),
-                    this, TQT_SLOT( slotCollectStdOut(KProcIO*) ) );
+  TQObject::connect( &proc, TQ_SIGNAL( readReady(KProcIO*) ),
+                    this, TQ_SLOT( slotCollectStdOut(KProcIO*) ) );
   mCurrentGroup = 0;
 
   // run the process:
diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
index 947a52587..71fe0b57c 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
@@ -96,8 +96,8 @@ Kleo::QGpgMEJob::QGpgMEJob( Kleo::Job * _this, GpgME::Context * context )
 {
   InvarianceChecker check( this );
   assert( context );
-  TQObject::connect( QGpgME::EventLoopInteractor::instance(), TQT_SIGNAL(aboutToDestroy()),
-		    _this, TQT_SLOT(slotCancel()) );
+  TQObject::connect( QGpgME::EventLoopInteractor::instance(), TQ_SIGNAL(aboutToDestroy()),
+		    _this, TQ_SLOT(slotCancel()) );
   context->setProgressProvider( this );
   // (mmutz) work around a gpgme bug in versions at least <= 0.9.0.
   //         These versions will return GPG_ERR_NOT_IMPLEMENTED from
@@ -153,8 +153,8 @@ void Kleo::QGpgMEJob::deleteAllPatterns() {
 void Kleo::QGpgMEJob::hookupContextToEventLoopInteractor() {
   mCtx->setManagedByEventLoopInteractor( true );
   TQObject::connect( QGpgME::EventLoopInteractor::instance(),
-		    TQT_SIGNAL(operationDoneEventSignal(GpgME::Context*,const GpgME::Error&)),
-		    mThis, TQT_SLOT(slotOperationDoneEvent(GpgME::Context*,const GpgME::Error&)) );
+		    TQ_SIGNAL(operationDoneEventSignal(GpgME::Context*,const GpgME::Error&)),
+		    mThis, TQ_SLOT(slotOperationDoneEvent(GpgME::Context*,const GpgME::Error&)) );
 }
 
 void Kleo::QGpgMEJob::setPatterns( const TQStringList & sl, bool allowEmpty ) {
diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
index 5561625c8..25edaf844 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
@@ -79,8 +79,8 @@ GpgME::Error Kleo::QGpgMEKeyListJob::start( const TQStringList & pats, bool secr
 
   hookupContextToEventLoopInteractor();
   connect( QGpgME::EventLoopInteractor::instance(),
-	   TQT_SIGNAL(nextKeyEventSignal(GpgME::Context*,const GpgME::Key&)),
-	   TQT_SLOT(slotNextKeyEvent(GpgME::Context*,const GpgME::Key&)) );
+	   TQ_SIGNAL(nextKeyEventSignal(GpgME::Context*,const GpgME::Key&)),
+	   TQ_SLOT(slotNextKeyEvent(GpgME::Context*,const GpgME::Key&)) );
 
   // The communication channel between gpgme and gpgsm is limited in
   // the number of patterns that can be transported, but they won't
@@ -100,7 +100,7 @@ GpgME::Error Kleo::QGpgMEKeyListJob::start( const TQStringList & pats, bool secr
       }
     } else if ( err.code() == GPG_ERR_EOF ) {
         kdDebug(5150) << "QGpgMEKeyListJob::start(): early end of keylisting, trying to fake an empty result" << endl;
-        TQTimer::singleShot( 10, this, TQT_SLOT(slotFakeOperationDoneEvent()) );
+        TQTimer::singleShot( 10, this, TQ_SLOT(slotFakeOperationDoneEvent()) );
         return GpgME::Error();
     }
     deleteLater();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
index 6d05e1ecc..8088d28ae 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
@@ -107,12 +107,12 @@ GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess() {
 
   mProcess->setUsetStatusFD( true );
 
-  connect( mProcess, TQT_SIGNAL(processExited(TDEProcess*)),
-	   TQT_SLOT(slotProcessExited(TDEProcess*)) );
-  connect( mProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
-	   TQT_SLOT(slotStderr(TDEProcess*,char*,int)) );
-  connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
-	   TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+  connect( mProcess, TQ_SIGNAL(processExited(TDEProcess*)),
+	   TQ_SLOT(slotProcessExited(TDEProcess*)) );
+  connect( mProcess, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+	   TQ_SLOT(slotStderr(TDEProcess*,char*,int)) );
+  connect( mProcess, TQ_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
+	   TQ_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
 
   if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::Stderr ) ) {
     mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else?
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
index f553c7039..af72a5391 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
@@ -88,14 +88,14 @@ GpgME::Error Kleo::QGpgMESecretKeyExportJob::start( const TQStringList & pattern
 
   mProcess->setUsetStatusFD( true );
 
-  connect( mProcess, TQT_SIGNAL(processExited(TDEProcess*)),
-	   TQT_SLOT(slotProcessExited(TDEProcess*)) );
-  connect( mProcess, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
-	   TQT_SLOT(slotStdout(TDEProcess*,char*,int)) );
-  connect( mProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
-	   TQT_SLOT(slotStderr(TDEProcess*,char*,int)) );
-  connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
-	   TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+  connect( mProcess, TQ_SIGNAL(processExited(TDEProcess*)),
+	   TQ_SLOT(slotProcessExited(TDEProcess*)) );
+  connect( mProcess, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+	   TQ_SLOT(slotStdout(TDEProcess*,char*,int)) );
+  connect( mProcess, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+	   TQ_SLOT(slotStderr(TDEProcess*,char*,int)) );
+  connect( mProcess, TQ_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
+	   TQ_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
 
   if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) {
     mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else?