diff options
Diffstat (limited to 'certmanager/certmanager.cpp')
-rw-r--r-- | certmanager/certmanager.cpp | 66 |
1 files changed, 33 insertions, 33 deletions
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&)), |