Remove spurious TQ_OBJECT instances

61 files changed, 73 insertions, 73 deletions

diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.h b/certmanager/lib/backends/chiasmus/chiasmusjob.h
index 08b3ec1d1..98d7d7f52 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusjob.h
+++ b/certmanager/lib/backends/chiasmus/chiasmusjob.h
@@ -51,7 +51,7 @@ namespace Kleo {
   */
   class ChiasmusJob : public Kleo::SpecialJob {
     Q_OBJECT
-  TQ_OBJECT
+  
     Q_ENUMS( Mode )
     TQ_PROPERTY( Mode mode READ mode )
     TQ_PROPERTY( TQString key READ key WRITE setKey )
diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.h b/certmanager/lib/backends/chiasmus/obtainkeysjob.h
index 6803bd7f8..10ed5d5fc 100644
--- a/certmanager/lib/backends/chiasmus/obtainkeysjob.h
+++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.h
@@ -64,7 +64,7 @@ namespace Kleo {
   */
   class ObtainKeysJob : public Kleo::SpecialJob {
     Q_OBJECT
-  TQ_OBJECT
+  
     TQ_PROPERTY( TQStringList result READ result )
   public:
     ObtainKeysJob();
diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h
index b3a025fdf..281b85530 100644
--- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h
+++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h
@@ -43,7 +43,7 @@ namespace Kleo {
 
 class SymCryptRunProcessBase : public KProcess {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   enum Operation {
     Encrypt, Decrypt
diff --git a/certmanager/lib/backends/kpgp/kpgpkeylistjob.h b/certmanager/lib/backends/kpgp/kpgpkeylistjob.h
index 2e35896ff..d126ea675 100644
--- a/certmanager/lib/backends/kpgp/kpgpkeylistjob.h
+++ b/certmanager/lib/backends/kpgp/kpgpkeylistjob.h
@@ -51,7 +51,7 @@ namespace Kleo {
 
   class KpgpKeyListJob : public KeyListJob {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KpgpKeyListJob( Kpgp::Base * pgpBase );
     ~KpgpKeyListJob();
diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
index 0cf9000a9..4f6dc4ad6 100644
--- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
+++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
@@ -47,7 +47,7 @@ namespace Kleo {
    */
   class GnuPGProcessBase : public KProcess {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     GnuPGProcessBase( TQObject * parent=0, const char * name=0 );
     ~GnuPGProcessBase();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h
index de766de30..712ce24ef 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h
@@ -49,7 +49,7 @@ class QGpgMECryptoConfigEntry;
 class QGpgMECryptoConfig : public TQObject, public Kleo::CryptoConfig {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /**
    * Constructor
@@ -81,7 +81,7 @@ class QGpgMECryptoConfigGroup;
 class QGpgMECryptoConfigComponent : public TQObject, public Kleo::CryptoConfigComponent {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   QGpgMECryptoConfigComponent( QGpgMECryptoConfig*, const TQString& name, const TQString& description );
   ~QGpgMECryptoConfigComponent();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h
index 78e17304b..e58ea3267 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h
@@ -48,7 +48,7 @@ namespace Kleo {
 
   class QGpgMEDecryptJob : public DecryptJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEDecryptJob( GpgME::Context * context );
     ~QGpgMEDecryptJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
index ed3dd07a6..79ff268be 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
@@ -49,7 +49,7 @@ namespace Kleo {
 
   class KDE_EXPORT QGpgMEDecryptVerifyJob : public DecryptVerifyJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEDecryptVerifyJob( GpgME::Context * context );
     ~QGpgMEDecryptVerifyJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h b/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h
index 992404a23..20dca974d 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h
@@ -47,7 +47,7 @@ namespace Kleo {
 
   class QGpgMEDeleteJob : public DeleteJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEDeleteJob( GpgME::Context * context );
     ~QGpgMEDeleteJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h b/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h
index 76baa88f2..5317afd41 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h
@@ -46,7 +46,7 @@ namespace Kleo {
 
   class QGpgMEDownloadJob : public DownloadJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEDownloadJob( GpgME::Context * context );
     ~QGpgMEDownloadJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h
index c367c3525..80b5e4672 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h
@@ -51,7 +51,7 @@ namespace Kleo {
 
   class QGpgMEEncryptJob : public EncryptJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEEncryptJob( GpgME::Context * context );
     ~QGpgMEEncryptJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h
index 11bcec18f..aa2e0c0a2 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h
@@ -48,7 +48,7 @@ namespace Kleo {
 
   class QGpgMEExportJob : public ExportJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEExportJob( GpgME::Context * context );
     ~QGpgMEExportJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h b/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h
index e98eab6e3..2324da6d1 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h
@@ -48,7 +48,7 @@ namespace Kleo {
 
   class QGpgMEImportJob : public ImportJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEImportJob( GpgME::Context * context );
     ~QGpgMEImportJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
index 4a7288098..c9e164746 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
@@ -53,7 +53,7 @@ namespace Kleo {
 
   class KDE_EXPORT QGpgMEKeyGenerationJob : public KeyGenerationJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEKeyGenerationJob( GpgME::Context * context );
     ~QGpgMEKeyGenerationJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h
index c695967e8..8e26d7919 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h
@@ -49,7 +49,7 @@ namespace Kleo {
 
   class QGpgMEKeyListJob : public KeyListJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEKeyListJob( GpgME::Context * context );
     ~QGpgMEKeyListJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
index 555a0bfe3..ebe871ce6 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
@@ -51,7 +51,7 @@ namespace Kleo {
 
   class QGpgMERefreshKeysJob : public RefreshKeysJob {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     QGpgMERefreshKeysJob();
     ~QGpgMERefreshKeysJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
index 73fae9982..4c3c8b820 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
@@ -56,7 +56,7 @@ namespace Kleo {
 
   class QGpgMESecretKeyExportJob : public ExportJob {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     QGpgMESecretKeyExportJob( bool armour, const TQString& charset );
     ~QGpgMESecretKeyExportJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
index 0f2e7657d..24672d834 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
@@ -55,7 +55,7 @@ namespace Kleo {
 
   class KDE_EXPORT QGpgMESignEncryptJob : public SignEncryptJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMESignEncryptJob( GpgME::Context * context );
     ~QGpgMESignEncryptJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignjob.h
index 2dd3230ac..2b51eadae 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesignjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmesignjob.h
@@ -51,7 +51,7 @@ namespace Kleo {
 
   class QGpgMESignJob : public SignJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMESignJob( GpgME::Context * context );
     ~QGpgMESignJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h b/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h
index 76d1715ba..a62699d38 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h
@@ -48,7 +48,7 @@ namespace Kleo {
 
   class QGpgMEVerifyDetachedJob : public VerifyDetachedJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEVerifyDetachedJob( GpgME::Context * context );
     ~QGpgMEVerifyDetachedJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h b/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h
index e24b6bc6c..87a196196 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h
@@ -48,7 +48,7 @@ namespace Kleo {
 
   class QGpgMEVerifyOpaqueJob : public VerifyOpaqueJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEVerifyOpaqueJob( GpgME::Context * context );
     ~QGpgMEVerifyOpaqueJob();
diff --git a/certmanager/lib/cryptplugfactory.h b/certmanager/lib/cryptplugfactory.h
index c7d2783a0..3eb5f7e6b 100644
--- a/certmanager/lib/cryptplugfactory.h
+++ b/certmanager/lib/cryptplugfactory.h
@@ -49,7 +49,7 @@ namespace KMail {
 
   class KDE_EXPORT CryptPlugFactory : public Kleo::CryptoBackendFactory {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     CryptPlugFactory();
     ~CryptPlugFactory();
diff --git a/certmanager/lib/kleo/cryptobackendfactory.h b/certmanager/lib/kleo/cryptobackendfactory.h
index f5076e95e..e674de11c 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.h
+++ b/certmanager/lib/kleo/cryptobackendfactory.h
@@ -58,7 +58,7 @@ namespace Kleo {
 
   class KDE_EXPORT CryptoBackendFactory : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     CryptoBackendFactory();
     ~CryptoBackendFactory();
diff --git a/certmanager/lib/kleo/decryptjob.h b/certmanager/lib/kleo/decryptjob.h
index 72bf1b82e..bce60b811 100644
--- a/certmanager/lib/kleo/decryptjob.h
+++ b/certmanager/lib/kleo/decryptjob.h
@@ -61,7 +61,7 @@ namespace Kleo {
   */
   class DecryptJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     DecryptJob( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/kleo/decryptverifyjob.h b/certmanager/lib/kleo/decryptverifyjob.h
index e1cdce04b..94b016a04 100644
--- a/certmanager/lib/kleo/decryptverifyjob.h
+++ b/certmanager/lib/kleo/decryptverifyjob.h
@@ -64,7 +64,7 @@ namespace Kleo {
   */
   class DecryptVerifyJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     DecryptVerifyJob( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/kleo/deletejob.h b/certmanager/lib/kleo/deletejob.h
index c48852f9d..15bd5a51c 100644
--- a/certmanager/lib/kleo/deletejob.h
+++ b/certmanager/lib/kleo/deletejob.h
@@ -57,7 +57,7 @@ namespace Kleo {
   */
   class DeleteJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     DeleteJob( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/kleo/downloadjob.h b/certmanager/lib/kleo/downloadjob.h
index f3d568ae0..e1f52cd79 100644
--- a/certmanager/lib/kleo/downloadjob.h
+++ b/certmanager/lib/kleo/downloadjob.h
@@ -60,7 +60,7 @@ namespace Kleo {
   */
   class DownloadJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     DownloadJob( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/kleo/encryptjob.h b/certmanager/lib/kleo/encryptjob.h
index c9e4d6764..f55ab76dc 100644
--- a/certmanager/lib/kleo/encryptjob.h
+++ b/certmanager/lib/kleo/encryptjob.h
@@ -63,7 +63,7 @@ namespace Kleo {
   */
   class EncryptJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     EncryptJob( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/kleo/exportjob.h b/certmanager/lib/kleo/exportjob.h
index 0d693a6a9..69ad8e5c9 100644
--- a/certmanager/lib/kleo/exportjob.h
+++ b/certmanager/lib/kleo/exportjob.h
@@ -60,7 +60,7 @@ namespace Kleo {
   */
   class ExportJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     ExportJob( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.h b/certmanager/lib/kleo/hierarchicalkeylistjob.h
index 506b54774..0b74d2f9b 100644
--- a/certmanager/lib/kleo/hierarchicalkeylistjob.h
+++ b/certmanager/lib/kleo/hierarchicalkeylistjob.h
@@ -70,7 +70,7 @@ namespace Kleo {
   */
   class KDE_EXPORT HierarchicalKeyListJob : public KeyListJob {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     HierarchicalKeyListJob( const CryptoBackend::Protocol * protocol,
 			    bool remote=false, bool includeSigs=false, bool validating=false );
diff --git a/certmanager/lib/kleo/importjob.h b/certmanager/lib/kleo/importjob.h
index c363276fd..bd0a6f042 100644
--- a/certmanager/lib/kleo/importjob.h
+++ b/certmanager/lib/kleo/importjob.h
@@ -61,7 +61,7 @@ namespace Kleo {
   */
   class ImportJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     ImportJob( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/kleo/job.h b/certmanager/lib/kleo/job.h
index d4fe79b84..000875665 100644
--- a/certmanager/lib/kleo/job.h
+++ b/certmanager/lib/kleo/job.h
@@ -63,7 +63,7 @@ namespace Kleo {
   */
   class Job : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     Job( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/kleo/keyfiltermanager.h b/certmanager/lib/kleo/keyfiltermanager.h
index 7663cbb8b..a573934d6 100644
--- a/certmanager/lib/kleo/keyfiltermanager.h
+++ b/certmanager/lib/kleo/keyfiltermanager.h
@@ -47,7 +47,7 @@ namespace Kleo {
 
   class KDE_EXPORT KeyFilterManager : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     KeyFilterManager( TQObject * parent=0, const char * name=0 );
     ~KeyFilterManager();
diff --git a/certmanager/lib/kleo/keygenerationjob.h b/certmanager/lib/kleo/keygenerationjob.h
index 058f4127a..b0d949934 100644
--- a/certmanager/lib/kleo/keygenerationjob.h
+++ b/certmanager/lib/kleo/keygenerationjob.h
@@ -60,7 +60,7 @@ namespace Kleo {
   */
   class KeyGenerationJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     KeyGenerationJob( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/kleo/keylistjob.h b/certmanager/lib/kleo/keylistjob.h
index 8d9cb6a34..3560f7b89 100644
--- a/certmanager/lib/kleo/keylistjob.h
+++ b/certmanager/lib/kleo/keylistjob.h
@@ -64,7 +64,7 @@ namespace Kleo {
   */
   class KeyListJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     KeyListJob( TQObject * parent, const char * name );
 
diff --git a/certmanager/lib/kleo/multideletejob.h b/certmanager/lib/kleo/multideletejob.h
index 73612e2db..d927c9274 100644
--- a/certmanager/lib/kleo/multideletejob.h
+++ b/certmanager/lib/kleo/multideletejob.h
@@ -66,7 +66,7 @@ namespace Kleo {
   */
   class KDE_EXPORT MultiDeleteJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     MultiDeleteJob( const CryptoBackend::Protocol * protocol );
     ~MultiDeleteJob();
diff --git a/certmanager/lib/kleo/refreshkeysjob.h b/certmanager/lib/kleo/refreshkeysjob.h
index f5f7304bd..7a55f106e 100644
--- a/certmanager/lib/kleo/refreshkeysjob.h
+++ b/certmanager/lib/kleo/refreshkeysjob.h
@@ -61,7 +61,7 @@ namespace Kleo {
   */
   class RefreshKeysJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     RefreshKeysJob( TQObject * parent, const char * name );
 
diff --git a/certmanager/lib/kleo/signencryptjob.h b/certmanager/lib/kleo/signencryptjob.h
index 976c5d5c8..0f31897e7 100644
--- a/certmanager/lib/kleo/signencryptjob.h
+++ b/certmanager/lib/kleo/signencryptjob.h
@@ -66,7 +66,7 @@ namespace Kleo {
   */
   class SignEncryptJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     SignEncryptJob( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/kleo/signjob.h b/certmanager/lib/kleo/signjob.h
index f317fe582..fdeb9a84d 100644
--- a/certmanager/lib/kleo/signjob.h
+++ b/certmanager/lib/kleo/signjob.h
@@ -64,7 +64,7 @@ namespace Kleo {
   */
   class SignJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     SignJob( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/kleo/specialjob.h b/certmanager/lib/kleo/specialjob.h
index d801bd4cc..c5bc1896c 100644
--- a/certmanager/lib/kleo/specialjob.h
+++ b/certmanager/lib/kleo/specialjob.h
@@ -64,7 +64,7 @@ namespace Kleo {
   */
   class SpecialJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     SpecialJob( TQObject * parent, const char * name );
 
diff --git a/certmanager/lib/kleo/verifydetachedjob.h b/certmanager/lib/kleo/verifydetachedjob.h
index 0bc801c7a..01cc63777 100644
--- a/certmanager/lib/kleo/verifydetachedjob.h
+++ b/certmanager/lib/kleo/verifydetachedjob.h
@@ -61,7 +61,7 @@ namespace Kleo {
   */
   class VerifyDetachedJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     VerifyDetachedJob( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/kleo/verifyopaquejob.h b/certmanager/lib/kleo/verifyopaquejob.h
index 6092a32cb..387782dff 100644
--- a/certmanager/lib/kleo/verifyopaquejob.h
+++ b/certmanager/lib/kleo/verifyopaquejob.h
@@ -61,7 +61,7 @@ namespace Kleo {
   */
   class VerifyOpaqueJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     VerifyOpaqueJob( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/tests/gnupgviewer.h b/certmanager/lib/tests/gnupgviewer.h
index 055a874b2..f52774732 100644
--- a/certmanager/lib/tests/gnupgviewer.h
+++ b/certmanager/lib/tests/gnupgviewer.h
@@ -44,7 +44,7 @@ class TQStringList;
 
 class GnuPGViewer : public TQTextEdit {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   GnuPGViewer( TQWidget * parent=0, const char * name=0 );
   ~GnuPGViewer();
diff --git a/certmanager/lib/tests/test_keygen.h b/certmanager/lib/tests/test_keygen.h
index 70ded0c7e..4bf2acaa7 100644
--- a/certmanager/lib/tests/test_keygen.h
+++ b/certmanager/lib/tests/test_keygen.h
@@ -45,7 +45,7 @@ class TQLineEdit;
 
 class KeyGenerator : public KDialogBase {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KeyGenerator( TQWidget * parent=0, const char * name=0, WFlags f=0 );
   ~KeyGenerator();
diff --git a/certmanager/lib/tests/test_keylister.h b/certmanager/lib/tests/test_keylister.h
index f5b9bd897..58eeac4a1 100644
--- a/certmanager/lib/tests/test_keylister.h
+++ b/certmanager/lib/tests/test_keylister.h
@@ -41,7 +41,7 @@ namespace GpgME {
 
 class CertListView : public Kleo::KeyListView {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   CertListView( TQWidget * parent=0, const char * name=0, WFlags f=0 );
 
diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.h b/certmanager/lib/ui/adddirectoryservicedialogimpl.h
index 0b1a0ca6a..f8924dac5 100644
--- a/certmanager/lib/ui/adddirectoryservicedialogimpl.h
+++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.h
@@ -37,7 +37,7 @@
 class AddDirectoryServiceDialogImpl : public AddDirectoryServiceDialog
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     AddDirectoryServiceDialogImpl( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
diff --git a/certmanager/lib/ui/backendconfigwidget.h b/certmanager/lib/ui/backendconfigwidget.h
index 1cc9362f2..f01315475 100644
--- a/certmanager/lib/ui/backendconfigwidget.h
+++ b/certmanager/lib/ui/backendconfigwidget.h
@@ -47,7 +47,7 @@ namespace Kleo {
 
   class KDE_EXPORT BackendConfigWidget : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     BackendConfigWidget( CryptoBackendFactory * factory, TQWidget * parent=0, const char * name=0, WFlags f=0 );
     ~BackendConfigWidget();
diff --git a/certmanager/lib/ui/cryptoconfigdialog.h b/certmanager/lib/ui/cryptoconfigdialog.h
index dc0dca753..3f6ba328c 100644
--- a/certmanager/lib/ui/cryptoconfigdialog.h
+++ b/certmanager/lib/ui/cryptoconfigdialog.h
@@ -46,7 +46,7 @@ namespace Kleo {
   class KDE_EXPORT CryptoConfigDialog : public KDialogBase
   {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent = 0, const char* name = 0 );
 
diff --git a/certmanager/lib/ui/cryptoconfigmodule.h b/certmanager/lib/ui/cryptoconfigmodule.h
index b6f832b83..4d5042f58 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.h
+++ b/certmanager/lib/ui/cryptoconfigmodule.h
@@ -47,7 +47,7 @@ namespace Kleo {
    */
   class CryptoConfigModule : public KJanusWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CryptoConfigModule( Kleo::CryptoConfig* config, TQWidget * parent=0, const char * name=0 );
 
diff --git a/certmanager/lib/ui/cryptoconfigmodule_p.h b/certmanager/lib/ui/cryptoconfigmodule_p.h
index 0c5f0087b..c841a092e 100644
--- a/certmanager/lib/ui/cryptoconfigmodule_p.h
+++ b/certmanager/lib/ui/cryptoconfigmodule_p.h
@@ -58,7 +58,7 @@ namespace Kleo {
    */
   class CryptoConfigComponentGUI : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigComponentGUI( CryptoConfigModule* module, Kleo::CryptoConfigComponent* component,
@@ -78,7 +78,7 @@ namespace Kleo {
    */
   class CryptoConfigGroupGUI : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigGroupGUI( CryptoConfigModule* module, Kleo::CryptoConfigGroup* group,
@@ -110,7 +110,7 @@ namespace Kleo {
    */
   class CryptoConfigEntryGUI : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CryptoConfigEntryGUI( CryptoConfigModule* module,
                           Kleo::CryptoConfigEntry* entry,
@@ -148,7 +148,7 @@ namespace Kleo {
    */
   class CryptoConfigEntryLineEdit : public CryptoConfigEntryGUI {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigEntryLineEdit( CryptoConfigModule* module,
@@ -168,7 +168,7 @@ namespace Kleo {
    */
   class CryptoConfigEntryPath : public CryptoConfigEntryGUI {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigEntryPath( CryptoConfigModule* module,
@@ -188,7 +188,7 @@ namespace Kleo {
    */
   class CryptoConfigEntryDirPath : public CryptoConfigEntryGUI {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigEntryDirPath( CryptoConfigModule* module,
@@ -208,7 +208,7 @@ namespace Kleo {
    */
   class CryptoConfigEntryURL : public CryptoConfigEntryGUI {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigEntryURL( CryptoConfigModule* module,
@@ -228,7 +228,7 @@ namespace Kleo {
    */
   class CryptoConfigEntrySpinBox : public CryptoConfigEntryGUI {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigEntrySpinBox( CryptoConfigModule* module,
@@ -248,7 +248,7 @@ namespace Kleo {
    */
   class CryptoConfigEntryCheckBox : public CryptoConfigEntryGUI {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigEntryCheckBox( CryptoConfigModule* module,
@@ -267,7 +267,7 @@ namespace Kleo {
    */
   class CryptoConfigEntryLDAPURL : public CryptoConfigEntryGUI {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigEntryLDAPURL( CryptoConfigModule* module,
diff --git a/certmanager/lib/ui/directoryserviceswidget.h b/certmanager/lib/ui/directoryserviceswidget.h
index 3b20bb324..a98bc5fe2 100644
--- a/certmanager/lib/ui/directoryserviceswidget.h
+++ b/certmanager/lib/ui/directoryserviceswidget.h
@@ -44,7 +44,7 @@ class CryptoConfigEntry;
 class KDE_EXPORT DirectoryServicesWidget : public DirectoryServicesWidgetBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   DirectoryServicesWidget(
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.h b/certmanager/lib/ui/dnattributeorderconfigwidget.h
index 4f87c4e61..b7ba1330e 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.h
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.h
@@ -45,7 +45,7 @@ namespace Kleo {
 
   class KDE_EXPORT DNAttributeOrderConfigWidget : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /*! Use Kleo::DNAttributeMapper::instance()->configWidget( parent, name ) instead. */
     DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, TQWidget * parent=0, const char * name=0, WFlags f=0 );
diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h
index 530b89081..71c1c928d 100644
--- a/certmanager/lib/ui/kdhorizontalline.h
+++ b/certmanager/lib/ui/kdhorizontalline.h
@@ -46,7 +46,7 @@
 
 class KDHorizontalLine : public TQFrame {
   Q_OBJECT
-  TQ_OBJECT
+  
   TQ_PROPERTY( TQString title READ title WRITE setTitle )
 public:
   KDHorizontalLine( TQWidget * parent=0, const char * name=0,  WFlags f=0 );
diff --git a/certmanager/lib/ui/keyapprovaldialog.h b/certmanager/lib/ui/keyapprovaldialog.h
index 0b368635d..bd953fa32 100644
--- a/certmanager/lib/ui/keyapprovaldialog.h
+++ b/certmanager/lib/ui/keyapprovaldialog.h
@@ -57,7 +57,7 @@ namespace Kleo {
 
   class KDE_EXPORT KeyApprovalDialog : public KDialogBase {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     struct Item {
       Item() : pref( UnknownPreference ) {}
diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h
index ada8354e2..3f3edc034 100644
--- a/certmanager/lib/ui/keylistview.h
+++ b/certmanager/lib/ui/keylistview.h
@@ -200,7 +200,7 @@ namespace Kleo {
 
   class KDE_EXPORT KeyListView : public KListView {
     Q_OBJECT
-  TQ_OBJECT
+  
     friend class KeyListViewItem;
   public:
 
diff --git a/certmanager/lib/ui/keyrequester.h b/certmanager/lib/ui/keyrequester.h
index 5a3d53754..899d3cde4 100644
--- a/certmanager/lib/ui/keyrequester.h
+++ b/certmanager/lib/ui/keyrequester.h
@@ -75,7 +75,7 @@ namespace Kleo {
   /// Base class for SigningKeyRequester and EncryptionKeyRequester
   class KDE_EXPORT KeyRequester : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KeyRequester( unsigned int allowedKeys, bool multipleKeys=false,
 		  TQWidget * parent=0, const char * name=0 );
@@ -161,7 +161,7 @@ namespace Kleo {
 
   class KDE_EXPORT EncryptionKeyRequester : public KeyRequester {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     enum { OpenPGP = 1, SMIME = 2, AllProtocols = OpenPGP|SMIME };
 
@@ -189,7 +189,7 @@ namespace Kleo {
 
   class KDE_EXPORT SigningKeyRequester : public KeyRequester {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     enum { OpenPGP = 1, SMIME = 2, AllProtocols = OpenPGP|SMIME };
 
diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h
index b638947ee..630255c12 100644
--- a/certmanager/lib/ui/keyselectiondialog.h
+++ b/certmanager/lib/ui/keyselectiondialog.h
@@ -65,7 +65,7 @@ namespace Kleo {
 
   class KDE_EXPORT KeySelectionDialog : public KDialogBase {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
 
     enum KeyUsage {
diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp
index 5917fdee8..96b710c37 100644
--- a/certmanager/lib/ui/messagebox.cpp
+++ b/certmanager/lib/ui/messagebox.cpp
@@ -75,7 +75,7 @@ static KGuiItem KGuiItem_showAuditLog() {
 
 class AuditLogViewer : public KDialogBase {
     // Q_OBJECT
-  TQ_OBJECT
+  
 public:
     explicit AuditLogViewer( const TQString & log, TQWidget * parent=0, const char * name=0, WFlags f=0 )
         : KDialogBase( parent, name, false, i18n("View GnuPG Audit Log"),
diff --git a/certmanager/lib/ui/passphrasedialog.h b/certmanager/lib/ui/passphrasedialog.h
index 5b969a1ea..e83eca422 100644
--- a/certmanager/lib/ui/passphrasedialog.h
+++ b/certmanager/lib/ui/passphrasedialog.h
@@ -55,7 +55,7 @@ namespace Kleo {
 
   class PassphraseDialog : public KDialogBase {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     PassphraseDialog( const TQString & description,
 		      const TQString & caption=TQString(),
diff --git a/certmanager/lib/ui/progressbar.h b/certmanager/lib/ui/progressbar.h
index bf804b58e..51f86dade 100644
--- a/certmanager/lib/ui/progressbar.h
+++ b/certmanager/lib/ui/progressbar.h
@@ -44,7 +44,7 @@ namespace Kleo {
   */
   class KDE_EXPORT ProgressBar : public TQProgressBar {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ProgressBar( TQWidget * parent=0, const char * name=0, WFlags f=0 );
 
diff --git a/certmanager/lib/ui/progressdialog.h b/certmanager/lib/ui/progressdialog.h
index 0c05cdbd3..dadfd7690 100644
--- a/certmanager/lib/ui/progressdialog.h
+++ b/certmanager/lib/ui/progressdialog.h
@@ -45,7 +45,7 @@ namespace Kleo {
   */
   class KDE_EXPORT ProgressDialog : public TQProgressDialog {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ProgressDialog( Job * job, const TQString & baseText,
 		    TQWidget * creator=0, const char * name=0, WFlags f=0  );