Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

28 files changed, 144 insertions, 144 deletions

diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
index 265d759b..5c49478e 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 d7ae22c1..90f51243 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 9391f023..34ac1d66 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 3d28ac4b..5ab83715 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 bfd00ac9..e0da7eca 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 e73b4363..2b81c6b1 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 947a5258..71fe0b57 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 5561625c..25edaf84 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 6d05e1ec..8088d28a 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 f553c703..af72a539 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?
diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
index 65b59725..03bb267f 100644
--- a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
+++ b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
@@ -142,8 +142,8 @@ GpgME::Error Kleo::HierarchicalKeyListJob::startAJob() {
   assert( mJob ); // FIXME: we need a way to generate errors ourselves,
 		  // but I don't like the dependency on gpg-error :/
 
-  connect( mJob, TQT_SIGNAL(nextKey(const GpgME::Key&)), TQT_SLOT(slotNextKey(const GpgME::Key&)) );
-  connect( mJob, TQT_SIGNAL(result(const GpgME::KeyListResult&)), TQT_SLOT(slotResult(const GpgME::KeyListResult&)) );
+  connect( mJob, TQ_SIGNAL(nextKey(const GpgME::Key&)), TQ_SLOT(slotNextKey(const GpgME::Key&)) );
+  connect( mJob, TQ_SIGNAL(result(const GpgME::KeyListResult&)), TQ_SLOT(slotResult(const GpgME::KeyListResult&)) );
 
   TQStringList patterns;
   for ( std::set<TQString>::const_iterator it = mNextSet.begin() ; it != mNextSet.end() ; ++it )
diff --git a/certmanager/lib/kleo/job.cpp b/certmanager/lib/kleo/job.cpp
index 907a7448..eb638592 100644
--- a/certmanager/lib/kleo/job.cpp
+++ b/certmanager/lib/kleo/job.cpp
@@ -63,7 +63,7 @@ Kleo::Job::Job( TQObject * parent, const char * name )
   : TQObject( parent, name )
 {
   if ( tqApp )
-    connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(slotCancel()) );
+    connect( tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(slotCancel()) );
 }
 
 Kleo::Job::~Job() {
diff --git a/certmanager/lib/kleo/keyfiltermanager.cpp b/certmanager/lib/kleo/keyfiltermanager.cpp
index 1aa2b170..2c5b5a35 100644
--- a/certmanager/lib/kleo/keyfiltermanager.cpp
+++ b/certmanager/lib/kleo/keyfiltermanager.cpp
@@ -73,7 +73,7 @@ Kleo::KeyFilterManager::KeyFilterManager( TQObject * parent, const char * name )
   d = new Private();
   // ### DF: doesn't a KStaticDeleter work more reliably?
   if ( tqApp )
-    connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) );
+    connect( tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(deleteLater()) );
   reload();
 }
 
diff --git a/certmanager/lib/kleo/multideletejob.cpp b/certmanager/lib/kleo/multideletejob.cpp
index 7c83c24b..9aafdd79 100644
--- a/certmanager/lib/kleo/multideletejob.cpp
+++ b/certmanager/lib/kleo/multideletejob.cpp
@@ -102,7 +102,7 @@ GpgME::Error Kleo::MultiDeleteJob::startAJob() {
   assert( mJob ); // FIXME: we need a way to generate errors ourselves,
 		  // but I don't like the dependency on gpg-error :/
 
-  connect( mJob, TQT_SIGNAL(result(const GpgME::Error&)), TQT_SLOT(slotResult(const GpgME::Error&)) );
+  connect( mJob, TQ_SIGNAL(result(const GpgME::Error&)), TQ_SLOT(slotResult(const GpgME::Error&)) );
 
   return mJob->start( *mIt, mAllowSecretKeyDeletion );
 }
diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp
index 01e5d109..3fdc9938 100644
--- a/certmanager/lib/tests/test_gnupgprocessbase.cpp
+++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp
@@ -62,14 +62,14 @@ void GnuPGViewer::setProcess( Kleo::GnuPGProcessBase * process ) {
   if ( !process )
     return;
   mProcess = process;
-  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&)) );
 }
 
 static TQStringList split( char * buffer, int buflen, TQString & old ) {
diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp
index b678e29d..ef8f8878 100644
--- a/certmanager/lib/tests/test_keygen.cpp
+++ b/certmanager/lib/tests/test_keygen.cpp
@@ -96,7 +96,7 @@ KeyGenerator::KeyGenerator( TQWidget * parent, const char * name, WFlags )
   glay->setRowStretch( row, 1 );
   glay->setColStretch( 1, 1 );
 
-  connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotStartKeyGeneration()) );
+  connect( this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotStartKeyGeneration()) );
 }
 
 KeyGenerator::~KeyGenerator() {}
@@ -118,8 +118,8 @@ void KeyGenerator::slotStartKeyGeneration() {
   Kleo::KeyGenerationJob * job = proto->keyGenerationJob();
   assert( job );
 
-  connect( job, TQT_SIGNAL(result(const GpgME::KeyGenerationResult&,const TQByteArray&)),
-	   TQT_SLOT(slotResult(const GpgME::KeyGenerationResult&,const TQByteArray&)) );
+  connect( job, TQ_SIGNAL(result(const GpgME::KeyGenerationResult&,const TQByteArray&)),
+	   TQ_SLOT(slotResult(const GpgME::KeyGenerationResult&,const TQByteArray&)) );
 
   const GpgME::Error err = job->start( params );
   if ( err )
diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp
index 0e357b59..38b9085b 100644
--- a/certmanager/lib/tests/test_keylister.cpp
+++ b/certmanager/lib/tests/test_keylister.cpp
@@ -115,10 +115,10 @@ void CertListView::slotStart() {
   kdDebug() << "CertListView::slotStart()" << endl;
   Kleo::KeyListJob * job = Kleo::CryptoBackendFactory::instance()->smime()->keyListJob( false );
   assert( job );
-  TQObject::connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)),
-		    this, TQT_SLOT(slotAddKey(const GpgME::Key&)) );
-  TQObject::connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)),
-		    this, TQT_SLOT(slotResult(const GpgME::KeyListResult&)) );
+  TQObject::connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)),
+		    this, TQ_SLOT(slotAddKey(const GpgME::Key&)) );
+  TQObject::connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)),
+		    this, TQ_SLOT(slotResult(const GpgME::KeyListResult&)) );
 #if 0
   TQStringList l;
   l << "Marc";
@@ -138,7 +138,7 @@ int main( int argc, char** argv ) {
   app.setMainWidget( clv );
   clv->show();
 
-  TQTimer::singleShot( 5000, clv, TQT_SLOT(slotStart()) );
+  TQTimer::singleShot( 5000, clv, TQ_SLOT(slotStart()) );
 
   return app.exec();
 }
diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp
index 9d8f4d40..82db7d7a 100644
--- a/certmanager/lib/ui/backendconfigwidget.cpp
+++ b/certmanager/lib/ui/backendconfigwidget.cpp
@@ -215,8 +215,8 @@ Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory,
 
   hlay->addWidget( d->listView, 1 );
 
-  connect( d->listView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-	   TQT_SLOT(slotSelectionChanged(TQListViewItem*)) );
+  connect( d->listView, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+	   TQ_SLOT(slotSelectionChanged(TQListViewItem*)) );
 
   TQVBoxLayout * vlay = new TQVBoxLayout( hlay ); // inherits spacing
 
@@ -224,15 +224,15 @@ Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory,
   d->configureButton->setAutoDefault( false );
   vlay->addWidget( d->configureButton );
 
-  connect( d->configureButton, TQT_SIGNAL(clicked()),
-	   TQT_SLOT(slotConfigureButtonClicked()) );
+  connect( d->configureButton, TQ_SIGNAL(clicked()),
+	   TQ_SLOT(slotConfigureButtonClicked()) );
 
   d->rescanButton = new TQPushButton( i18n("Rescan"), this );
   d->rescanButton->setAutoDefault( false );
   vlay->addWidget( d->rescanButton );
 
-  connect( d->rescanButton, TQT_SIGNAL(clicked()),
-	   TQT_SLOT(slotRescanButtonClicked()) );
+  connect( d->rescanButton, TQ_SIGNAL(clicked()),
+	   TQ_SLOT(slotRescanButtonClicked()) );
 
   vlay->addStretch( 1 );
 }
@@ -306,7 +306,7 @@ void Kleo::BackendConfigWidget::slotConfigureButtonClicked() {
       // Tell other users of gpgconf (e.g. the s/mime page) that the gpgconf data might have changed
       kapp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", TQByteArray() );
       // and schedule a rescan, in case the updates make a backend valid
-      TQTimer::singleShot( 0, this, TQT_SLOT(slotRescanButtonClicked()) );
+      TQTimer::singleShot( 0, this, TQ_SLOT(slotRescanButtonClicked()) );
     }
   }
   else // shouldn't happen, button is disabled
diff --git a/certmanager/lib/ui/cryptoconfigdialog.cpp b/certmanager/lib/ui/cryptoconfigdialog.cpp
index 4ec32cbb..40608ee1 100644
--- a/certmanager/lib/ui/cryptoconfigdialog.cpp
+++ b/certmanager/lib/ui/cryptoconfigdialog.cpp
@@ -44,7 +44,7 @@ Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidg
 {
   mMainWidget = new CryptoConfigModule( config, this );
   setMainWidget( mMainWidget );
-  connect( mMainWidget, TQT_SIGNAL( changed() ), TQT_SLOT( slotChanged() ) );
+  connect( mMainWidget, TQ_SIGNAL( changed() ), TQ_SLOT( slotChanged() ) );
   enableButton( Apply, false );
   if ( mMainWidget->hasError() ) {
       showButton( Default, false );
diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp
index cfe15442..c6e5594f 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.cpp
+++ b/certmanager/lib/ui/cryptoconfigmodule.cpp
@@ -353,7 +353,7 @@ Kleo::CryptoConfigEntryGUI::CryptoConfigEntryGUI(
   const char* name )
   : TQObject( module, name ), mEntry( entry ), mName( entryName ), mChanged( false )
 {
-  connect( this, TQT_SIGNAL( changed() ), module, TQT_SIGNAL( changed() ) );
+  connect( this, TQ_SIGNAL( changed() ), module, TQ_SIGNAL( changed() ) );
 }
 
 TQString Kleo::CryptoConfigEntryGUI::description() const
@@ -387,7 +387,7 @@ Kleo::CryptoConfigEntryLineEdit::CryptoConfigEntryLineEdit(
     label->setEnabled( false );
     mLineEdit->setEnabled( false );
   } else {
-    connect( mLineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) );
+    connect( mLineEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) );
   }
 }
 
@@ -419,7 +419,7 @@ Kleo::CryptoConfigEntryPath::CryptoConfigEntryPath(
     label->setEnabled( false );
     mUrlRequester->setEnabled( false );
   } else {
-    connect( mUrlRequester, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) );
+    connect( mUrlRequester, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) );
   }
 }
 
@@ -453,7 +453,7 @@ Kleo::CryptoConfigEntryDirPath::CryptoConfigEntryDirPath(
     label->setEnabled( false );
     mUrlRequester->setEnabled( false );
   } else {
-    connect( mUrlRequester, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) );
+    connect( mUrlRequester, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) );
   }
 }
 
@@ -488,7 +488,7 @@ Kleo::CryptoConfigEntryURL::CryptoConfigEntryURL(
     label->setEnabled( false );
     mUrlRequester->setEnabled( false );
   } else {
-    connect( mUrlRequester, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) );
+    connect( mUrlRequester, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) );
   }
 }
 
@@ -532,7 +532,7 @@ Kleo::CryptoConfigEntrySpinBox::CryptoConfigEntrySpinBox(
   } else {
     if ( mKind == UInt || mKind == ListOfNone )
       mNumInput->setMinValue( 0 );
-    connect( mNumInput, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotChanged() ) );
+    connect( mNumInput, TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( slotChanged() ) );
   }
 }
 
@@ -584,7 +584,7 @@ Kleo::CryptoConfigEntryCheckBox::CryptoConfigEntryCheckBox(
   if ( entry->isReadOnly() ) {
     mCheckBox->setEnabled( false );
   } else {
-    connect( mCheckBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotChanged() ) );
+    connect( mCheckBox, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotChanged() ) );
   }
 }
 
@@ -619,7 +619,7 @@ Kleo::CryptoConfigEntryLDAPURL::CryptoConfigEntryLDAPURL(
     mLabel->setEnabled( false );
     mPushButton->hide();
   } else {
-    connect( mPushButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOpenDialog() ) );
+    connect( mPushButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOpenDialog() ) );
   }
 }
 
@@ -644,7 +644,7 @@ void Kleo::CryptoConfigEntryLDAPURL::slotOpenDialog()
   DirectoryServicesWidget* dirserv = new DirectoryServicesWidget( mEntry, &dialog );
   dirserv->load();
   dialog.setMainWidget( dirserv );
-  connect( &dialog, TQT_SIGNAL( defaultClicked() ), dirserv, TQT_SLOT( defaults() ) );
+  connect( &dialog, TQ_SIGNAL( defaultClicked() ), dirserv, TQ_SLOT( defaults() ) );
   if ( dialog.exec() ) {
     // Note that we just grab the urls from the dialog, we don't call its save method,
     // since the user hasn't confirmed the big config dialog yet.
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
index 874ba0fa..38c4df9d 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
@@ -105,10 +105,10 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap
   d->currentLV->setSorting( -1 );
   glay->addWidget( d->currentLV, row, 2 );
 
-  connect( d->availableLV, TQT_SIGNAL(clicked( TQListViewItem * )),
-	   TQT_SLOT(slotAvailableSelectionChanged(TQListViewItem*)) );
-  connect( d->currentLV, TQT_SIGNAL(clicked(TQListViewItem*)),
-	   TQT_SLOT(slotCurrentOrderSelectionChanged(TQListViewItem*)) );
+  connect( d->availableLV, TQ_SIGNAL(clicked( TQListViewItem * )),
+	   TQ_SLOT(slotAvailableSelectionChanged(TQListViewItem*)) );
+  connect( d->currentLV, TQ_SIGNAL(clicked(TQListViewItem*)),
+	   TQ_SLOT(slotCurrentOrderSelectionChanged(TQListViewItem*)) );
 
   d->placeHolderItem = new TQListViewItem( d->availableLV, "_X_", i18n("All others") );
 
@@ -123,12 +123,12 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap
     const char * tooltip;
     const char * slot;
   } navButtons[] = {
-    { "2uparrow",    0, 1, I18N_NOOP( "Move to top" ),    TQT_SLOT(slotDoubleUpButtonClicked()) },
-    { "1uparrow",    1, 1, I18N_NOOP( "Move one up" ),    TQT_SLOT(slotUpButtonClicked()) },
-    { "1leftarrow",  2, 0, I18N_NOOP( "Remove from current attribute order" ), TQT_SLOT(slotLeftButtonClicked()) },
-    { "1rightarrow", 2, 2, I18N_NOOP( "Add to current attribute order" ), TQT_SLOT(slotRightButtonClicked()) },
-    { "1downarrow",  3, 1, I18N_NOOP( "Move one down" ),  TQT_SLOT(slotDownButtonClicked()) },
-    { "2downarrow",  4, 1, I18N_NOOP( "Move to bottom" ), TQT_SLOT(slotDoubleDownButtonClicked()) }
+    { "2uparrow",    0, 1, I18N_NOOP( "Move to top" ),    TQ_SLOT(slotDoubleUpButtonClicked()) },
+    { "1uparrow",    1, 1, I18N_NOOP( "Move one up" ),    TQ_SLOT(slotUpButtonClicked()) },
+    { "1leftarrow",  2, 0, I18N_NOOP( "Remove from current attribute order" ), TQ_SLOT(slotLeftButtonClicked()) },
+    { "1rightarrow", 2, 2, I18N_NOOP( "Add to current attribute order" ), TQ_SLOT(slotRightButtonClicked()) },
+    { "1downarrow",  3, 1, I18N_NOOP( "Move one down" ),  TQ_SLOT(slotDownButtonClicked()) },
+    { "2downarrow",  4, 1, I18N_NOOP( "Move to bottom" ), TQ_SLOT(slotDoubleDownButtonClicked()) }
   };
 
   for ( unsigned int i = 0 ; i < sizeof navButtons / sizeof *navButtons ; ++i ) {
@@ -137,7 +137,7 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap
     tb->setEnabled( false );
     TQToolTip::add( tb, i18n( navButtons[i].tooltip ) );
     xlay->addWidget( tb, navButtons[i].row, navButtons[i].col );
-    connect( tb, TQT_SIGNAL(clicked()), navButtons[i].slot );
+    connect( tb, TQ_SIGNAL(clicked()), navButtons[i].slot );
   }
 
   glay->addLayout( xlay, row, 1 );
diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp
index 6b873c0b..fd796b8d 100644
--- a/certmanager/lib/ui/keyapprovaldialog.cpp
+++ b/certmanager/lib/ui/keyapprovaldialog.cpp
@@ -163,7 +163,7 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients
     cb->insertStringList( prefs );
     glay->addWidget( cb, row, 1 );
     cb->setCurrentItem( pref2cb( it->pref ) );
-    connect( cb, TQT_SIGNAL(activated(int)), TQT_SLOT(slotPrefsChanged()) );
+    connect( cb, TQ_SIGNAL(activated(int)), TQ_SLOT(slotPrefsChanged()) );
     d->preferences.push_back( cb );
   }
 
diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp
index 00f69500..af067b1e 100644
--- a/certmanager/lib/ui/keylistview.cpp
+++ b/certmanager/lib/ui/keylistview.cpp
@@ -123,14 +123,14 @@ static const struct {
   const char * source;
   const char * target;
 } signalReplacements[] = {
-  { TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)),
-    TQT_SLOT(slotEmitDoubleClicked(TQListViewItem*,const TQPoint&,int)) },
-  { TQT_SIGNAL(returnPressed(TQListViewItem*)),
-    TQT_SLOT(slotEmitReturnPressed(TQListViewItem*)) },
-  { TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-    TQT_SLOT(slotEmitSelectionChanged(TQListViewItem*)) },
-  { TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*,const TQPoint&)),
-    TQT_SLOT(slotEmitContextMenu(TDEListView*, TQListViewItem*,const TQPoint&)) },
+  { TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)),
+    TQ_SLOT(slotEmitDoubleClicked(TQListViewItem*,const TQPoint&,int)) },
+  { TQ_SIGNAL(returnPressed(TQListViewItem*)),
+    TQ_SLOT(slotEmitReturnPressed(TQListViewItem*)) },
+  { TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+    TQ_SLOT(slotEmitSelectionChanged(TQListViewItem*)) },
+  { TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*,const TQPoint&)),
+    TQ_SLOT(slotEmitContextMenu(TDEListView*, TQListViewItem*,const TQPoint&)) },
 };
 static const int numSignalReplacements = sizeof signalReplacements / sizeof *signalReplacements;
 
@@ -146,7 +146,7 @@ Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const Dis
   d = new Private();
 
   d->updateTimer = new TQTimer( this );
-  connect( d->updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdateTimeout()) );
+  connect( d->updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotUpdateTimeout()) );
 
   if ( !columnStrategy ) {
     kdWarning(5150) << "Kleo::KeyListView: need a column strategy to work with!" << endl;
diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp
index e245898e..6dd1b05e 100644
--- a/certmanager/lib/ui/keyrequester.cpp
+++ b/certmanager/lib/ui/keyrequester.cpp
@@ -130,8 +130,8 @@ void Kleo::KeyRequester::init()
   hlay->addWidget( mEraseButton );
   hlay->addWidget( mDialogButton );
 
-  connect( mEraseButton,  TQT_SIGNAL(clicked()), TQT_SLOT(slotEraseButtonClicked()) );
-  connect( mDialogButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDialogButtonClicked()) );
+  connect( mEraseButton,  TQ_SIGNAL(clicked()), TQ_SLOT(slotEraseButtonClicked()) );
+  connect( mDialogButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDialogButtonClicked()) );
 
   setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
 			      TQSizePolicy::Fixed ) );
@@ -264,10 +264,10 @@ void Kleo::KeyRequester::startKeyListJob( const TQStringList & fingerprints ) {
 			       "Check your installation."),
 			  i18n("Key Listing Failed") );
     } else {
-      connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)),
-	       TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) );
-      connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)),
-	       TQT_SLOT(slotNextKey(const GpgME::Key&)) );
+      connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)),
+	       TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) );
+      connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)),
+	       TQ_SLOT(slotNextKey(const GpgME::Key&)) );
 
       const GpgME::Error err = job->start( fingerprints,
         mKeyUsage & Kleo::KeySelectionDialog::SecretKeys &&
@@ -288,10 +288,10 @@ void Kleo::KeyRequester::startKeyListJob( const TQStringList & fingerprints ) {
 			       "Check your installation."),
 			  i18n("Key Listing Failed") );
     } else {
-      connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)),
-	       TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) );
-      connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)),
-	       TQT_SLOT(slotNextKey(const GpgME::Key&)) );
+      connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)),
+	       TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) );
+      connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)),
+	       TQ_SLOT(slotNextKey(const GpgME::Key&)) );
 
       const GpgME::Error err = job->start( fingerprints,
         mKeyUsage & Kleo::KeySelectionDialog::SecretKeys &&
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index 25a1a225..1de21dc0 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -377,8 +377,8 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection
   if ( !text.isEmpty() ) {
     if ( text.startsWith( "<qt>" ) ) {
       KActiveLabel *textLabel = new KActiveLabel( text, page );
-      disconnect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), textLabel, TQT_SLOT(openLink(const TQString&)) );
-      connect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), TQT_SLOT(slotStartCertificateManager(const TQString&)) );
+      disconnect( textLabel, TQ_SIGNAL(linkClicked(const TQString&)), textLabel, TQ_SLOT(openLink(const TQString&)) );
+      connect( textLabel, TQ_SIGNAL(linkClicked(const TQString&)), TQ_SLOT(slotStartCertificateManager(const TQString&)) );
       textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak );
       mTopLayout->addWidget( textLabel );
     } else {
@@ -391,7 +391,7 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection
   TQPushButton * const searchExternalPB
       = new TQPushButton( i18n("Search for &External Certificates"), page );
   mTopLayout->addWidget( searchExternalPB, 0, TQt::AlignLeft );
-  connect( searchExternalPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStartSearchForExternalCertificates()) );
+  connect( searchExternalPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStartSearchForExternalCertificates()) );
   if ( initialQuery.isEmpty() )
       searchExternalPB->hide();
 
@@ -406,10 +406,10 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection
   hlay->addWidget( le, 1 );
   le->setFocus();
 
-  connect( clearButton, TQT_SIGNAL( clicked() ), le, TQT_SLOT( clear() ) );
-  connect( le, TQT_SIGNAL(textChanged(const TQString&)),
-	   this, TQT_SLOT(slotSearch(const TQString&)) );
-  connect( mStartSearchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotFilter()) );
+  connect( clearButton, TQ_SIGNAL( clicked() ), le, TQ_SLOT( clear() ) );
+  connect( le, TQ_SIGNAL(textChanged(const TQString&)),
+	   this, TQ_SLOT(slotSearch(const TQString&)) );
+  connect( mStartSearchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotFilter()) );
 
   mKeyListView = new KeyListView( new ColumnStrategy( mKeyUsage ), 0, page, "mKeyListView" );
   mKeyListView->setResizeMode( TQListView::LastColumn );
@@ -430,21 +430,21 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection
 			  "</p></qt>") );
   }
 
-  connect( mCheckSelectionTimer, TQT_SIGNAL(timeout()),
-	   TQT_SLOT(slotCheckSelection()) );
+  connect( mCheckSelectionTimer, TQ_SIGNAL(timeout()),
+	   TQ_SLOT(slotCheckSelection()) );
   connectSignals();
 
   connect( mKeyListView,
-	   TQT_SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const TQPoint&,int)),
-	   TQT_SLOT(slotTryOk()) );
+	   TQ_SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const TQPoint&,int)),
+	   TQ_SLOT(slotTryOk()) );
   connect( mKeyListView,
-	   TQT_SIGNAL(contextMenu(Kleo::KeyListViewItem*,const TQPoint&)),
-           TQT_SLOT(slotRMB(Kleo::KeyListViewItem*,const TQPoint&)) );
+	   TQ_SIGNAL(contextMenu(Kleo::KeyListViewItem*,const TQPoint&)),
+           TQ_SLOT(slotRMB(Kleo::KeyListViewItem*,const TQPoint&)) );
 
   setButtonText( KDialogBase::Default, i18n("&Reread Keys") );
   setButtonGuiItem( KDialogBase::Help, i18n("&Start Certificate Manager") );
-  connect( this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(slotRereadKeys()) );
-  connect( this, TQT_SIGNAL(helpClicked()), this, TQT_SLOT(slotStartCertificateManager()) );
+  connect( this, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(slotRereadKeys()) );
+  connect( this, TQ_SIGNAL(helpClicked()), this, TQ_SLOT(slotStartCertificateManager()) );
 
   slotRereadKeys();
   mTopLayout->activate();
@@ -468,20 +468,20 @@ Kleo::KeySelectionDialog::~KeySelectionDialog() {
 
 void Kleo::KeySelectionDialog::connectSignals() {
   if ( mKeyListView->isMultiSelection() )
-    connect( mKeyListView, TQT_SIGNAL(selectionChanged()),
-             TQT_SLOT(slotSelectionChanged()) );
+    connect( mKeyListView, TQ_SIGNAL(selectionChanged()),
+             TQ_SLOT(slotSelectionChanged()) );
   else
-    connect( mKeyListView, TQT_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)),
-             TQT_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) );
+    connect( mKeyListView, TQ_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)),
+             TQ_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) );
 }
 
 void Kleo::KeySelectionDialog::disconnectSignals() {
   if ( mKeyListView->isMultiSelection() )
-    disconnect( mKeyListView, TQT_SIGNAL(selectionChanged()),
-		this, TQT_SLOT(slotSelectionChanged()) );
+    disconnect( mKeyListView, TQ_SIGNAL(selectionChanged()),
+		this, TQ_SLOT(slotSelectionChanged()) );
   else
-    disconnect( mKeyListView, TQT_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)),
-		this, TQT_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) );
+    disconnect( mKeyListView, TQ_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)),
+		this, TQ_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) );
 }
 
 const GpgME::Key & Kleo::KeySelectionDialog::selectedKey() const {
@@ -593,12 +593,12 @@ void Kleo::KeySelectionDialog::startKeyListJobForBackend( const CryptoBackend::P
     return;
   }
 
-  connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)),
-	   TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) );
-  connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)),
+  connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)),
+	   TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) );
+  connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)),
 	   mKeyListView, validate ?
-	   TQT_SLOT(slotRefreshKey(const GpgME::Key&)) :
-	   TQT_SLOT(slotAddKey(const GpgME::Key&)) );
+	   TQ_SLOT(slotRefreshKey(const GpgME::Key&)) :
+	   TQ_SLOT(slotAddKey(const GpgME::Key&)) );
 
   TQStringList fprs;
   std::transform( keys.begin(), keys.end(), std::back_inserter( fprs ), ExtractFingerprint() );
@@ -756,7 +756,7 @@ void Kleo::KeySelectionDialog::slotRMB( Kleo::KeyListViewItem * item, const TQPo
   mCurrentContextMenuItem = item;
 
   TQPopupMenu menu;
-  menu.insertItem( i18n( "Recheck Key" ), this, TQT_SLOT(slotRecheckKey()) );
+  menu.insertItem( i18n( "Recheck Key" ), this, TQ_SLOT(slotRecheckKey()) );
   menu.exec( p );
 }
 
diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp
index f2771201..68837d38 100644
--- a/certmanager/lib/ui/passphrasedialog.cpp
+++ b/certmanager/lib/ui/passphrasedialog.cpp
@@ -90,7 +90,7 @@ Kleo::PassphraseDialog::PassphraseDialog( const TQString & msg, const TQString &
 
   vlay->addWidget( d->lineedit );
 
-  connect( d->lineedit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotOk()) );
+  connect( d->lineedit, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotOk()) );
 
   disableResize();
 }
diff --git a/certmanager/lib/ui/progressbar.cpp b/certmanager/lib/ui/progressbar.cpp
index 6fe2f531..8c530a56 100644
--- a/certmanager/lib/ui/progressbar.cpp
+++ b/certmanager/lib/ui/progressbar.cpp
@@ -44,7 +44,7 @@ Kleo::ProgressBar::ProgressBar( TQWidget * parent, const char * name, WFlags f )
     mRealProgress( -1 )
 {
   mBusyTimer = new TQTimer( this );
-  connect( mBusyTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotBusyTimerTick()) );
+  connect( mBusyTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotBusyTimerTick()) );
   fixup( true );
 }
 
diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp
index 692ee4cb..b99db7cb 100644
--- a/certmanager/lib/ui/progressdialog.cpp
+++ b/certmanager/lib/ui/progressdialog.cpp
@@ -56,13 +56,13 @@ Kleo::ProgressDialog::ProgressDialog( Job * job, const TQString & baseText,
   setLabelText( baseText );
   setProgress( 0, 0 ); // activate busy indicator
 
-  connect( job, TQT_SIGNAL(progress(const TQString&,int,int)),
-	   TQT_SLOT(slotProgress(const TQString&,int,int)) );
-  connect( job, TQT_SIGNAL(done()), TQT_SLOT(slotDone()) );
-  connect( this, TQT_SIGNAL(canceled()),
-	   job, TQT_SLOT(slotCancel()) );
+  connect( job, TQ_SIGNAL(progress(const TQString&,int,int)),
+	   TQ_SLOT(slotProgress(const TQString&,int,int)) );
+  connect( job, TQ_SIGNAL(done()), TQ_SLOT(slotDone()) );
+  connect( this, TQ_SIGNAL(canceled()),
+	   job, TQ_SLOT(slotCancel()) );
 
-  TQTimer::singleShot( minimumDuration(), this, TQT_SLOT(forceShow()) );
+  TQTimer::singleShot( minimumDuration(), this, TQ_SLOT(forceShow()) );
 }
 
 Kleo::ProgressDialog::~ProgressDialog() {
@@ -71,7 +71,7 @@ Kleo::ProgressDialog::~ProgressDialog() {
 
 void Kleo::ProgressDialog::setMinimumDuration( int ms ) {
   if ( 0 < ms && ms < minimumDuration() )
-    TQTimer::singleShot( ms, this, TQT_SLOT(forceShow()) );
+    TQTimer::singleShot( ms, this, TQ_SLOT(forceShow()) );
   TQProgressDialog::setMinimumDuration( ms );
 }