Replace various '#define' strings - part 6

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

4 files changed, 42 insertions, 42 deletions

diff --git a/certmanager/certificateinfowidgetimpl.cpp b/certmanager/certificateinfowidgetimpl.cpp
index 79b02b24c..eb28c1a68 100644
--- a/certmanager/certificateinfowidgetimpl.cpp
+++ b/certmanager/certificateinfowidgetimpl.cpp
@@ -253,7 +253,7 @@ void CertificateInfoWidgetImpl::startCertificateChainListing() {
 }
 
 void CertificateInfoWidgetImpl::startCertificateDump() {
-  TDEProcess* proc = new TDEProcess( TQT_TQOBJECT(this) );
+  TDEProcess* proc = new TDEProcess( this );
   (*proc) << "gpgsm"; // must be in the PATH
   (*proc) << "--dump-keys";
   (*proc) << mChain.front().primaryFingerprint();
diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index a972ce9b1..6dfd3d743 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -252,23 +252,23 @@ static inline void connectEnableOperationSignal( TQObject * s, TQObject * d ) {
 void CertManager::createActions() {
   TDEAction * action = 0;
 
-  (void)KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() );
+  (void)KStdAction::quit( this, TQT_SLOT(close()), actionCollection() );
 
-  action = KStdAction::redisplay( TQT_TQOBJECT(this), TQT_SLOT(slotRedisplay()), actionCollection() );
+  action = KStdAction::redisplay( this, TQT_SLOT(slotRedisplay()), actionCollection() );
   // work around the fact that the stdaction has no shortcut
   TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload);
   reloadShortcut.append(KKey(CTRL + Key_R));
   action->setShortcut( reloadShortcut );
 
-  connectEnableOperationSignal( TQT_TQOBJECT(this), action );
+  connectEnableOperationSignal( this, action );
 
   action = new TDEAction( i18n("Stop Operation"), "process-stop", Key_Escape,
-			TQT_TQOBJECT(this), TQT_SIGNAL(stopOperations()),
+			this, TQT_SIGNAL(stopOperations()),
 			actionCollection(), "view_stop_operations" );
   action->setEnabled( false );
 
   (void)   new TDEAction( i18n("New Key Pair..."), "document-new", 0,
-			TQT_TQOBJECT(this), TQT_SLOT(newCertificate()),
+			this, TQT_SLOT(newCertificate()),
 			actionCollection(), "file_new_certificate" );
 
   connect( new TDEToggleAction( i18n("Hierarchical Key List"), 0,
@@ -276,100 +276,100 @@ void CertManager::createActions() {
 	   TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleHierarchicalView(bool)) );
 
   action = new TDEAction( i18n("Expand All"), 0, CTRL+Key_Period,
-			TQT_TQOBJECT(this), TQT_SLOT(slotExpandAll()),
+			this, TQT_SLOT(slotExpandAll()),
 			actionCollection(), "view_expandall" );
   action = new TDEAction( i18n("Collapse All"), 0, CTRL+Key_Comma,
-			TQT_TQOBJECT(this), TQT_SLOT(slotCollapseAll()),
+			this, TQT_SLOT(slotCollapseAll()),
 			actionCollection(), "view_collapseall" );
 
   (void)   new TDEAction( i18n("Refresh CRLs"), 0, 0,
-			TQT_TQOBJECT(this), TQT_SLOT(slotRefreshKeys()),
+			this, TQT_SLOT(slotRefreshKeys()),
 			actionCollection(), "certificates_refresh_clr" );
 
 #ifdef NOT_IMPLEMENTED_ANYWAY
   mRevokeCertificateAction = new TDEAction( i18n("Revoke"), 0,
-                                          TQT_TQOBJECT(this), TQT_SLOT(revokeCertificate()),
+                                          this, TQT_SLOT(revokeCertificate()),
                                           actionCollection(), "edit_revoke_certificate" );
   connectEnableOperationSignal( this, mRevokeCertificateAction );
 
   mExtendCertificateAction = new TDEAction( i18n("Extend"), 0,
-                                          TQT_TQOBJECT(this), TQT_SLOT(extendCertificate()),
+                                          this, TQT_SLOT(extendCertificate()),
                                           actionCollection(), "edit_extend_certificate" );
   connectEnableOperationSignal( this, mExtendCertificateAction );
 #endif
 
   mDeleteCertificateAction = new TDEAction( i18n("Delete"), "edit-delete", Key_Delete,
-                                    TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCertificate()),
+                                    this, TQT_SLOT(slotDeleteCertificate()),
                                     actionCollection(), "edit_delete_certificate" );
-  connectEnableOperationSignal( TQT_TQOBJECT(this), mDeleteCertificateAction );
+  connectEnableOperationSignal( this, mDeleteCertificateAction );
 
   mValidateCertificateAction = new TDEAction( i18n("Validate"), "reload", SHIFT + Key_F5,
-					    TQT_TQOBJECT(this), TQT_SLOT(slotValidate()),
+					    this, TQT_SLOT(slotValidate()),
 					    actionCollection(), "certificates_validate" );
-  connectEnableOperationSignal( TQT_TQOBJECT(this), mValidateCertificateAction );
+  connectEnableOperationSignal( this, mValidateCertificateAction );
 
   mImportCertFromFileAction = new TDEAction( i18n("Import Certificates..."), 0,
-					   TQT_TQOBJECT(this), TQT_SLOT(slotImportCertFromFile()),
+					   this, TQT_SLOT(slotImportCertFromFile()),
 					   actionCollection(), "file_import_certificates" );
-  connectEnableOperationSignal( TQT_TQOBJECT(this), mImportCertFromFileAction );
+  connectEnableOperationSignal( this, mImportCertFromFileAction );
 
   mImportCRLFromFileAction = new TDEAction( i18n("Import CRLs..."), 0,
-					  TQT_TQOBJECT(this), TQT_SLOT(importCRLFromFile()),
+					  this, TQT_SLOT(importCRLFromFile()),
 					  actionCollection(), "file_import_crls" );
-  connectEnableOperationSignal( TQT_TQOBJECT(this), mImportCRLFromFileAction );
+  connectEnableOperationSignal( this, mImportCRLFromFileAction );
 
   mExportCertificateAction = new TDEAction( i18n("Export Certificates..."), "export", 0,
-					  TQT_TQOBJECT(this), TQT_SLOT(slotExportCertificate()),
+					  this, TQT_SLOT(slotExportCertificate()),
 					  actionCollection(), "file_export_certificate" );
 
   mExportSecretKeyAction = new TDEAction( i18n("Export Secret Key..."), "export", 0,
-                                        TQT_TQOBJECT(this), TQT_SLOT(slotExportSecretKey()),
+                                        this, TQT_SLOT(slotExportSecretKey()),
                                         actionCollection(), "file_export_secret_keys" );
-  connectEnableOperationSignal( TQT_TQOBJECT(this), mExportSecretKeyAction );
+  connectEnableOperationSignal( this, mExportSecretKeyAction );
 
   mViewCertDetailsAction = new TDEAction( i18n("Certificate Details..."), 0, 0,
-                                        TQT_TQOBJECT(this), TQT_SLOT(slotViewDetails()), actionCollection(),
+                                        this, TQT_SLOT(slotViewDetails()), actionCollection(),
                                         "view_certificate_details" );
   mDownloadCertificateAction = new TDEAction( i18n( "Download"), 0, 0,
-                                        TQT_TQOBJECT(this), TQT_SLOT(slotDownloadCertificate()), actionCollection(),
+                                        this, TQT_SLOT(slotDownloadCertificate()), actionCollection(),
                                         "download_certificate" );
 
   const TQString dirmngr = TDEStandardDirs::findExe( "gpgsm" );
   mDirMngrFound = !dirmngr.isEmpty();
 
   action = new TDEAction( i18n("Dump CRL Cache..."), 0,
-			TQT_TQOBJECT(this), TQT_SLOT(slotViewCRLs()),
+			this, TQT_SLOT(slotViewCRLs()),
 			actionCollection(), "crl_dump_crl_cache" );
   action->setEnabled( mDirMngrFound ); // we also need dirmngr for this
 
   action = new TDEAction( i18n("Clear CRL Cache..."), 0,
-			TQT_TQOBJECT(this), TQT_SLOT(slotClearCRLs()),
+			this, TQT_SLOT(slotClearCRLs()),
 			actionCollection(), "crl_clear_crl_cache" );
   action->setEnabled( mDirMngrFound ); // we also need dirmngr for this
 
-  action = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this),
+  action = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, this,
                         TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg");
   // disable action if no kwatchgnupg binary is around
   if (TDEStandardDirs::findExe("kwatchgnupg").isEmpty()) action->setEnabled(false);
 
   (void)new LabelAction( i18n("Search:"), actionCollection(), "label_action" );
 
-  mLineEditAction = new LineEditAction( TQString(), actionCollection(), TQT_TQOBJECT(this),
+  mLineEditAction = new LineEditAction( TQString(), actionCollection(), this,
 					TQT_SLOT(slotSearch()),
 					"query_lineedit_action");
 
   TQStringList lst;
   lst << i18n("In Local Certificates") << i18n("In External Certificates");
-  mComboAction = new ComboAction( lst, actionCollection(), TQT_TQOBJECT(this), TQT_SLOT( slotToggleRemote(int) ),
+  mComboAction = new ComboAction( lst, actionCollection(), this, TQT_SLOT( slotToggleRemote(int) ),
                                   "location_combo_action", mNextFindRemote? 1 : 0 );
 
-  mFindAction = new TDEAction( i18n("Find"), "edit-find", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearch()),
+  mFindAction = new TDEAction( i18n("Find"), "edit-find", 0, this, TQT_SLOT(slotSearch()),
 			     actionCollection(), "find" );
 
-  KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotEditKeybindings()), actionCollection() );
-  KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotShowConfigurationDialog()), actionCollection() );
+  KStdAction::keyBindings( this, TQT_SLOT(slotEditKeybindings()), actionCollection() );
+  KStdAction::preferences( this, TQT_SLOT(slotShowConfigurationDialog()), actionCollection() );
 
-  new TDEAction( i18n( "Configure &GpgME Backend" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureGpgME()),
+  new TDEAction( i18n( "Configure &GpgME Backend" ), 0, 0, this, TQT_SLOT(slotConfigureGpgME()),
                actionCollection(), "configure_gpgme" );
 
   createStandardStatusBarAction();
@@ -1031,7 +1031,7 @@ void CertManager::slotDeleteCertificate() {
     return;
 
   if ( !mHierarchyAnalyser ) {
-    mHierarchyAnalyser = new HierarchyAnalyser( TQT_TQOBJECT(this), "mHierarchyAnalyser" );
+    mHierarchyAnalyser = new HierarchyAnalyser( this, "mHierarchyAnalyser" );
     Kleo::KeyListJob * job = Kleo::CryptoBackendFactory::instance()->smime()->keyListJob();
     assert( job );
     connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)),
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
index 62f08218b..d3b262b34 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
@@ -96,14 +96,14 @@ void KWatchGnuPGMainWindow::slotClear()
 void KWatchGnuPGMainWindow::createActions()
 {
   (void)new TDEAction( i18n("C&lear History"), "history_clear", CTRL+Key_L,
-		     TQT_TQOBJECT(this), TQT_SLOT( slotClear() ),
+		     this, TQT_SLOT( slotClear() ),
 		     actionCollection(), "clear_log" );
-  (void)KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection() );
-  (void)KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() );
-  (void)KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection() );
-  (void)KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection() );
-  (void)KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureShortcuts()), actionCollection());
-  (void)KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection());
+  (void)KStdAction::saveAs( this, TQT_SLOT(slotSaveAs()), actionCollection() );
+  (void)KStdAction::close( this, TQT_SLOT(close()), actionCollection() );
+  (void)KStdAction::quit( this, TQT_SLOT(slotQuit()), actionCollection() );
+  (void)KStdAction::preferences( this, TQT_SLOT(slotConfigure()), actionCollection() );
+  (void)KStdAction::keyBindings(this, TQT_SLOT(configureShortcuts()), actionCollection());
+  (void)KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbars()), actionCollection());
 
 #if 0
   (void)new TDEAction( i18n("Configure KWatchGnuPG..."), TQString::fromLatin1("configure"),
diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp
index 1c548c5b5..c969e8750 100644
--- a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp
+++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp
@@ -49,7 +49,7 @@
 AddDirectoryServiceDialogImpl::AddDirectoryServiceDialogImpl( TQWidget* parent,  const char* name, bool modal, WFlags fl )
     : AddDirectoryServiceDialog( parent, name, modal, fl )
 {
-    portED->setValidator( new TQIntValidator( 0, 65535, TQT_TQOBJECT(portED) ) );
+    portED->setValidator( new TQIntValidator( 0, 65535, portED ) );
 }
 
 /*