diff options
Diffstat (limited to 'certmanager')
155 files changed, 533 insertions, 1368 deletions
diff --git a/certmanager/CMakeL10n.txt b/certmanager/CMakeL10n.txt index 210b1fab..963caa2f 100644 --- a/certmanager/CMakeL10n.txt +++ b/certmanager/CMakeL10n.txt @@ -8,3 +8,9 @@ tde_l10n_create_template( ) tde_l10n_auto_add_subdirectories( ) + +tde_l10n_create_template( + CATALOG "desktop_files/certmanager-desktops/" + SOURCES *.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/certmanager/CMakeLists.txt b/certmanager/CMakeLists.txt index 91151b69..1f331750 100644 --- a/certmanager/CMakeLists.txt +++ b/certmanager/CMakeLists.txt @@ -39,7 +39,11 @@ link_directories( ##### other data ################################ -install( FILES kleopatra.desktop kleopatra_import.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE kleopatra.desktop kleopatra_import.desktop + PO_DIR certmanager-desktops +) + install( FILES kleopatraui.rc DESTINATION ${DATA_INSTALL_DIR}/kleopatra ) diff --git a/certmanager/certificateinfowidgetimpl.cpp b/certmanager/certificateinfowidgetimpl.cpp index 79b02b24..9ff6b15a 100644 --- a/certmanager/certificateinfowidgetimpl.cpp +++ b/certmanager/certificateinfowidgetimpl.cpp @@ -84,17 +84,17 @@ CertificateInfoWidgetImpl::CertificateInfoWidgetImpl( const GpgME::Key & key, bo listView->header()->setClickEnabled( false ); listView->setSorting( -1 ); - connect( listView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( slotShowInfo( TQListViewItem* ) ) ); + connect( listView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotShowInfo( TQListViewItem* ) ) ); pathView->setColumnWidthMode( 0, TQListView::Maximum ); pathView->header()->hide(); - connect( pathView, TQT_SIGNAL( doubleClicked( TQListViewItem* ) ), - this, TQT_SLOT( slotShowCertPathDetails( TQListViewItem* ) ) ); - connect( pathView, TQT_SIGNAL( returnPressed( TQListViewItem* ) ), - this, TQT_SLOT( slotShowCertPathDetails( TQListViewItem* ) ) ); - connect( importButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotImportCertificate() ) ); + connect( pathView, TQ_SIGNAL( doubleClicked( TQListViewItem* ) ), + this, TQ_SLOT( slotShowCertPathDetails( TQListViewItem* ) ) ); + connect( pathView, TQ_SIGNAL( returnPressed( TQListViewItem* ) ), + this, TQ_SLOT( slotShowCertPathDetails( TQListViewItem* ) ) ); + connect( importButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotImportCertificate() ) ); dumpView->setFont( TDEGlobalSettings::fixedFont() ); @@ -232,10 +232,10 @@ void CertificateInfoWidgetImpl::startCertificateChainListing() { Kleo::CryptoBackendFactory::instance()->smime()->keyListJob( false ); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - TQT_SLOT(slotCertificateChainListingResult(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(slotCertificateChainListingResult(const GpgME::KeyListResult&)) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + TQ_SLOT(slotNextKey(const GpgME::Key&)) ); kdDebug() << "Going to fetch" << endl << " issuer : \"" << mChain.front().issuerName() << "\"" << endl @@ -253,17 +253,17 @@ 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(); - TQObject::connect( proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int) ), - this, TQT_SLOT( slotCollectStdout(TDEProcess *, char *, int) ) ); - TQObject::connect( proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int) ), - this, TQT_SLOT( slotCollectStderr(TDEProcess *, char *, int) ) ); - TQObject::connect( proc, TQT_SIGNAL( processExited(TDEProcess*) ), - this, TQT_SLOT( slotDumpProcessExited(TDEProcess*) ) ); + TQObject::connect( proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int) ), + this, TQ_SLOT( slotCollectStdout(TDEProcess *, char *, int) ) ); + TQObject::connect( proc, TQ_SIGNAL( receivedStderr(TDEProcess *, char *, int) ), + this, TQ_SLOT( slotCollectStderr(TDEProcess *, char *, int) ) ); + TQObject::connect( proc, TQ_SIGNAL( processExited(TDEProcess*) ), + this, TQ_SLOT( slotDumpProcessExited(TDEProcess*) ) ); if ( !proc->start( TDEProcess::NotifyOnExit, (TDEProcess::Communication)(TDEProcess::Stdout | TDEProcess::Stderr) ) ) { TQString wmsg = i18n("Failed to execute gpgsm:\n%1").arg( i18n( "program not found" ) ); @@ -383,8 +383,8 @@ void CertificateInfoWidgetImpl::slotShowCertPathDetails( TQListViewItem * item ) new CertificateInfoWidgetImpl( mChain[itemIndex], mExternal, dialog ); dialog->setMainWidget( top ); // proxy the signal to our receiver: - connect( top, TQT_SIGNAL(requestCertificateDownload(const TQString&, const TQString&)), - TQT_SIGNAL(requestCertificateDownload(const TQString&, const TQString&)) ); + connect( top, TQ_SIGNAL(requestCertificateDownload(const TQString&, const TQString&)), + TQ_SIGNAL(requestCertificateDownload(const TQString&, const TQString&)) ); dialog->show(); } @@ -415,10 +415,10 @@ void CertificateInfoWidgetImpl::startKeyExistanceCheck() { Kleo::CryptoBackendFactory::instance()->smime()->keyListJob( false ); assert( job ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), - TQT_SLOT(slotKeyExistanceCheckNextCandidate(const GpgME::Key&)) ); - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - TQT_SLOT(slotKeyExistanceCheckFinished()) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + TQ_SLOT(slotKeyExistanceCheckNextCandidate(const GpgME::Key&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + TQ_SLOT(slotKeyExistanceCheckFinished()) ); // nor to check for errors: job->start( fingerprint ); } diff --git a/certmanager/certificateinfowidgetimpl.h b/certmanager/certificateinfowidgetimpl.h index 9536ddb3..5838ec84 100644 --- a/certmanager/certificateinfowidgetimpl.h +++ b/certmanager/certificateinfowidgetimpl.h @@ -47,7 +47,7 @@ namespace GpgME { } class CertificateInfoWidgetImpl : public CertificateInfoWidget { - Q_OBJECT + TQ_OBJECT public: CertificateInfoWidgetImpl( const GpgME::Key & key, bool external, diff --git a/certmanager/certificatewizard.ui b/certmanager/certificatewizard.ui index cb544807..3fdeb600 100644 --- a/certmanager/certificatewizard.ui +++ b/certmanager/certificatewizard.ui @@ -546,16 +546,14 @@ If you want to change anything, press Back and make your changes; otherwise, pre <tabstop>certificateTE</tabstop> <tabstop>generatePB</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">slotEmailAddressChanged(const TQString&)</slot> <slot access="protected">slotGenerateCertificate()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp index e1d47f99..f5dd08ad 100644 --- a/certmanager/certificatewizardimpl.cpp +++ b/certmanager/certificatewizardimpl.cpp @@ -126,16 +126,16 @@ CertificateWizardImpl::CertificateWizardImpl( TQWidget* parent, const char* nam // Allow to select remote URLs storeUR->setMode( KFile::File ); storeUR->setFilter( "application/pkcs10" ); - connect( storeUR, TQT_SIGNAL( urlSelected( const TQString& ) ), - this, TQT_SLOT( slotURLSelected( const TQString& ) ) ); + connect( storeUR, TQ_SIGNAL( urlSelected( const TQString& ) ), + this, TQ_SLOT( slotURLSelected( const TQString& ) ) ); const TDEConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" ); caEmailED->setText( config.readEntry( "CAEmailAddress" ) ); - connect( this, TQT_SIGNAL( helpClicked() ), - this, TQT_SLOT( slotHelpClicked() ) ); - connect( insertAddressButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotSetValuesFromWhoAmI() ) ); + connect( this, TQ_SIGNAL( helpClicked() ), + this, TQ_SLOT( slotHelpClicked() ) ); + connect( insertAddressButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotSetValuesFromWhoAmI() ) ); for ( unsigned int i = 0 ; i < numKeyLengths ; ++i ) keyLengthCB->insertItem( i18n("%n bit", "%n bits", keyLengths[i] ) ); @@ -246,8 +246,8 @@ void CertificateWizardImpl::slotGenerateCertificate() Kleo::CryptoBackendFactory::instance()->smime()->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&)) ); certificateTE->setText( certParms ); @@ -362,10 +362,10 @@ void CertificateWizardImpl::createPersonalDataPage() if ( config.entryIsImmutable( attr ) ) le->setEnabled( false ); - _attrPairList.append(tqMakePair(key, le)); + _attrPairList.append(qMakePair(key, le)); - connect( le, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotEnablePersonalDataPageExit()) ); + connect( le, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotEnablePersonalDataPageExit()) ); } // enable button only if administrator wants to allow it @@ -490,8 +490,8 @@ void CertificateWizardImpl::accept() TDEIO::Job* uploadJob = TDEIOext::put( _keyData, url, -1, overwrite, false /*resume*/ ); uploadJob->setWindow( this ); - connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) ); + connect( uploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotUploadResult( TDEIO::Job* ) ) ); // Can't press finish again during the upload setFinishEnabled( finishPage, false ); } diff --git a/certmanager/certificatewizardimpl.h b/certmanager/certificatewizardimpl.h index 9ac52f7a..844f39ed 100644 --- a/certmanager/certificatewizardimpl.h +++ b/certmanager/certificatewizardimpl.h @@ -48,7 +48,7 @@ namespace TDEIO { class CertificateWizardImpl : public CertificateWizard { - Q_OBJECT + TQ_OBJECT public: diff --git a/certmanager/certlistview.h b/certmanager/certlistview.h index 63154d9f..dd488691 100644 --- a/certmanager/certlistview.h +++ b/certmanager/certlistview.h @@ -6,7 +6,7 @@ /// We need to derive from Kleo::KeyListView simply to add support for drop events class CertKeyListView : public Kleo::KeyListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp index 86ee531a..ddcdb8a4 100644 --- a/certmanager/certmanager.cpp +++ b/certmanager/certmanager.cpp @@ -96,7 +96,7 @@ // other #include <algorithm> #include <assert.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <kinputdialog.h> namespace { @@ -187,17 +187,17 @@ CertManager::CertManager( bool remote, const TQString& query, const TQString & i mKeyListView->setSelectionMode( TQListView::Extended ); setCentralWidget( mKeyListView ); - connect( mKeyListView, TQT_SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const TQPoint&,int)), - TQT_SLOT(slotViewDetails(Kleo::KeyListViewItem*)) ); - connect( mKeyListView, TQT_SIGNAL(returnPressed(Kleo::KeyListViewItem*)), - TQT_SLOT(slotViewDetails(Kleo::KeyListViewItem*)) ); - connect( mKeyListView, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(slotSelectionChanged()) ); - connect( mKeyListView, TQT_SIGNAL(contextMenu(Kleo::KeyListViewItem*, const TQPoint&)), - TQT_SLOT(slotContextMenu(Kleo::KeyListViewItem*, const TQPoint&)) ); + connect( mKeyListView, TQ_SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const TQPoint&,int)), + TQ_SLOT(slotViewDetails(Kleo::KeyListViewItem*)) ); + connect( mKeyListView, TQ_SIGNAL(returnPressed(Kleo::KeyListViewItem*)), + TQ_SLOT(slotViewDetails(Kleo::KeyListViewItem*)) ); + connect( mKeyListView, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(slotSelectionChanged()) ); + connect( mKeyListView, TQ_SIGNAL(contextMenu(Kleo::KeyListViewItem*, const TQPoint&)), + TQ_SLOT(slotContextMenu(Kleo::KeyListViewItem*, const TQPoint&)) ); - connect( mKeyListView, TQT_SIGNAL(dropped(const KURL::List&) ), - TQT_SLOT( slotDropped(const KURL::List&) ) ); + connect( mKeyListView, TQ_SIGNAL(dropped(const KURL::List&) ), + TQ_SLOT( slotDropped(const KURL::List&) ) ); mLineEditAction->setText(query); if ( !mRemote && !mNextFindRemote || !query.isEmpty() ) @@ -244,132 +244,132 @@ void CertManager::createStatusBar() { } static inline void connectEnableOperationSignal( TQObject * s, TQObject * d ) { - TQObject::connect( s, TQT_SIGNAL(enableOperations(bool)), - d, TQT_SLOT(setEnabled(bool)) ); + TQObject::connect( s, TQ_SIGNAL(enableOperations(bool)), + d, TQ_SLOT(setEnabled(bool)) ); } void CertManager::createActions() { TDEAction * action = 0; - (void)KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() ); + (void)KStdAction::quit( this, TQ_SLOT(close()), actionCollection() ); - action = KStdAction::redisplay( TQT_TQOBJECT(this), TQT_SLOT(slotRedisplay()), actionCollection() ); + action = KStdAction::redisplay( this, TQ_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, TQ_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, TQ_SLOT(newCertificate()), actionCollection(), "file_new_certificate" ); connect( new TDEToggleAction( i18n("Hierarchical Key List"), 0, actionCollection(), "view_hierarchical" ), - TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleHierarchicalView(bool)) ); + TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggleHierarchicalView(bool)) ); action = new TDEAction( i18n("Expand All"), 0, CTRL+Key_Period, - TQT_TQOBJECT(this), TQT_SLOT(slotExpandAll()), + this, TQ_SLOT(slotExpandAll()), actionCollection(), "view_expandall" ); action = new TDEAction( i18n("Collapse All"), 0, CTRL+Key_Comma, - TQT_TQOBJECT(this), TQT_SLOT(slotCollapseAll()), + this, TQ_SLOT(slotCollapseAll()), actionCollection(), "view_collapseall" ); (void) new TDEAction( i18n("Refresh CRLs"), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(slotRefreshKeys()), + this, TQ_SLOT(slotRefreshKeys()), actionCollection(), "certificates_refresh_clr" ); #ifdef NOT_IMPLEMENTED_ANYWAY mRevokeCertificateAction = new TDEAction( i18n("Revoke"), 0, - TQT_TQOBJECT(this), TQT_SLOT(revokeCertificate()), + this, TQ_SLOT(revokeCertificate()), actionCollection(), "edit_revoke_certificate" ); connectEnableOperationSignal( this, mRevokeCertificateAction ); mExtendCertificateAction = new TDEAction( i18n("Extend"), 0, - TQT_TQOBJECT(this), TQT_SLOT(extendCertificate()), + this, TQ_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, TQ_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, TQ_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, TQ_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, TQ_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, TQ_SLOT(slotExportCertificate()), actionCollection(), "file_export_certificate" ); mExportSecretKeyAction = new TDEAction( i18n("Export Secret Key..."), "export", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotExportSecretKey()), + this, TQ_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, TQ_SLOT(slotViewDetails()), actionCollection(), "view_certificate_details" ); mDownloadCertificateAction = new TDEAction( i18n( "Download"), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(slotDownloadCertificate()), actionCollection(), + this, TQ_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, TQ_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, TQ_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), - TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg"); + action = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, this, + TQ_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), - TQT_SLOT(slotSearch()), + mLineEditAction = new LineEditAction( TQString(), actionCollection(), this, + TQ_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, TQ_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, TQ_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, TQ_SLOT(slotEditKeybindings()), actionCollection() ); + KStdAction::preferences( this, TQ_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, TQ_SLOT(slotConfigureGpgME()), actionCollection(), "configure_gpgme" ); createStandardStatusBarAction(); @@ -387,7 +387,7 @@ void CertManager::slotEditKeybindings() { void CertManager::slotShowConfigurationDialog() { ConfigureDialog dlg( this ); - connect( &dlg, TQT_SIGNAL( configCommitted() ), TQT_SLOT( slotRepaint() ) ); + connect( &dlg, TQ_SIGNAL( configCommitted() ), TQ_SLOT( slotRepaint() ) ); dlg.exec(); } @@ -451,10 +451,10 @@ void CertManager::connectJobToStatusBarProgress( Kleo::Job * job, const TQString return; if ( !initialText.isEmpty() ) statusBar()->message( initialText ); - connect( job, TQT_SIGNAL(progress(const TQString&,int,int)), - mProgressBar, TQT_SLOT(slotProgress(const TQString&,int,int)) ); - connect( job, TQT_SIGNAL(done()), mProgressBar, TQT_SLOT(reset()) ); - connect( this, TQT_SIGNAL(stopOperations()), job, TQT_SLOT(slotCancel()) ); + connect( job, TQ_SIGNAL(progress(const TQString&,int,int)), + mProgressBar, TQ_SLOT(slotProgress(const TQString&,int,int)) ); + connect( job, TQ_SIGNAL(done()), mProgressBar, TQ_SLOT(reset()) ); + connect( this, TQ_SIGNAL(stopOperations()), job, TQ_SLOT(slotCancel()) ); action("view_stop_operations")->setEnabled( true ); emit enableOperations( false ); @@ -509,8 +509,8 @@ void CertManager::slotRefreshKeys() { Kleo::RefreshKeysJob * job = Kleo::CryptoBackendFactory::instance()->smime()->refreshKeysJob(); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::Error&)), - this, TQT_SLOT(slotRefreshKeysResult(const GpgME::Error&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::Error&)), + this, TQ_SLOT(slotRefreshKeysResult(const GpgME::Error&)) ); connectJobToStatusBarProgress( job, i18n("Refreshing keys...") ); if ( const GpgME::Error err = job->start( keys ) ) @@ -571,10 +571,10 @@ void CertManager::startKeyListing( bool validating, bool refresh, const TQString job = Kleo::CryptoBackendFactory::instance()->smime()->keyListJob( mRemote, false, validating ); assert( job ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), - mKeyListView, refresh ? TQT_SLOT(slotRefreshKey(const GpgME::Key&)) : TQT_SLOT(slotAddKey(const GpgME::Key&)) ); - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - this, TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + mKeyListView, refresh ? TQ_SLOT(slotRefreshKey(const GpgME::Key&)) : TQ_SLOT(slotAddKey(const GpgME::Key&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + this, TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); connectJobToStatusBarProgress( job, i18n("Fetching keys...") ); @@ -685,7 +685,7 @@ void CertManager::slotImportCertFromFile( const KURL & certURL ) // Download the cert TDEIOext::StoredTransferJob* importJob = TDEIOext::storedGet( certURL ); importJob->setWindow( this ); - connect( importJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotImportResult(TDEIO::Job*)) ); + connect( importJob, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotImportResult(TDEIO::Job*)) ); } void CertManager::slotImportResult( TDEIO::Job* job ) @@ -729,8 +729,8 @@ void CertManager::slotStartCertificateDownload( const TQString& fingerprint, con Kleo::CryptoBackendFactory::instance()->smime()->downloadJob( false /* no armor */ ); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::Error&,const TQByteArray&)), - TQT_SLOT(slotCertificateDownloadResult(const GpgME::Error&,const TQByteArray&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::Error&,const TQByteArray&)), + TQ_SLOT(slotCertificateDownloadResult(const GpgME::Error&,const TQByteArray&)) ); connectJobToStatusBarProgress( job, i18n("Fetching certificate from server...") ); @@ -782,8 +782,8 @@ void CertManager::startCertificateImport( const TQByteArray & keyData, const TQS Kleo::ImportJob * job = Kleo::CryptoBackendFactory::instance()->smime()->importJob(); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::ImportResult&)), - TQT_SLOT(slotCertificateImportResult(const GpgME::ImportResult&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::ImportResult&)), + TQ_SLOT(slotCertificateImportResult(const GpgME::ImportResult&)) ); connectJobToStatusBarProgress( job, i18n("Importing certificates...") ); @@ -906,8 +906,8 @@ void CertManager::importCRLFromFile() { destURL.setPath( tempFile.name() ); TDEIO::Job* copyJob = TDEIO::file_copy( url, destURL, 0600, true, false ); copyJob->setWindow( this ); - connect( copyJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotImportCRLJobFinished( TDEIO::Job * ) ) ); + connect( copyJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotImportCRLJobFinished( TDEIO::Job * ) ) ); } } } @@ -930,9 +930,9 @@ bool CertManager::connectAndStartDirmngr( const char * slot, const char * proces assert( processname ); assert( mDirmngrProc ); mErrorbuffer = TQString(); - connect( mDirmngrProc, TQT_SIGNAL(processExited(TDEProcess*)), slot ); - connect( mDirmngrProc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int) ), - this, TQT_SLOT(slotStderr(TDEProcess*,char*,int)) ); + connect( mDirmngrProc, TQ_SIGNAL(processExited(TDEProcess*)), slot ); + connect( mDirmngrProc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int) ), + this, TQ_SLOT(slotStderr(TDEProcess*,char*,int)) ); if( !mDirmngrProc->start( TDEProcess::NotifyOnExit, TDEProcess::Stderr ) ) { delete mDirmngrProc; mDirmngrProc = 0; KMessageBox::error( this, i18n( "Unable to start %1 process. Please check your installation." ).arg( processname ), i18n( "Certificate Manager Error" ) ); @@ -947,7 +947,7 @@ void CertManager::startImportCRL( const TQString& filename, bool isTempFile ) mImportCRLTempFile = isTempFile ? filename : TQString(); mDirmngrProc = new TDEProcess(); *mDirmngrProc << "gpgsm" << "--call-dirmngr" << "loadcrl" << filename; - if ( !connectAndStartDirmngr( TQT_SLOT(slotDirmngrExited()), "gpgsm" ) ) { + if ( !connectAndStartDirmngr( TQ_SLOT(slotDirmngrExited()), "gpgsm" ) ) { updateImportActions( true ); if ( isTempFile ) TQFile::remove( mImportCRLTempFile ); // unlink tempfile @@ -959,7 +959,7 @@ void CertManager::startClearCRLs() { mDirmngrProc = new TDEProcess(); *mDirmngrProc << "dirmngr" << "--flush"; //*mDirmngrProc << "gpgsm" << "--call-dimngr" << "flush"; // use this once it's implemented! - connectAndStartDirmngr( TQT_SLOT(slotClearCRLsResult()), "dirmngr" ); + connectAndStartDirmngr( TQ_SLOT(slotClearCRLsResult()), "dirmngr" ); } void CertManager::slotStderr( TDEProcess*, char* buf, int len ) { @@ -1031,13 +1031,13 @@ 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&)), - mHierarchyAnalyser, TQT_SLOT(slotNextKey(const GpgME::Key&)) ); - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - this, TQT_SLOT(slotDeleteCertificate()) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + mHierarchyAnalyser, TQ_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + this, TQ_SLOT(slotDeleteCertificate()) ); connectJobToStatusBarProgress( job, i18n("Checking key dependencies...") ); if ( const GpgME::Error error = job->start( TQStringList() ) ) { showKeyListError( this, error ); @@ -1110,8 +1110,8 @@ void CertManager::slotDeleteCertificate() { Kleo::MultiDeleteJob * job = new Kleo::MultiDeleteJob( Kleo::CryptoBackendFactory::instance()->smime() ); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::Error&,const GpgME::Key&)), - TQT_SLOT(slotDeleteResult(const GpgME::Error&,const GpgME::Key&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::Error&,const GpgME::Key&)), + TQ_SLOT(slotDeleteResult(const GpgME::Error&,const GpgME::Key&)) ); connectJobToStatusBarProgress( job, i18n("Deleting keys...") ); @@ -1156,8 +1156,8 @@ void CertManager::slotViewDetails( Kleo::KeyListViewItem * item ) { CertificateInfoWidgetImpl * top = new CertificateInfoWidgetImpl( item->key(), isRemote(), dialog ); dialog->setMainWidget( top ); // </UGH> - connect( top, TQT_SIGNAL(requestCertificateDownload(const TQString&, const TQString&)), - TQT_SLOT(slotStartCertificateDownload(const TQString&, const TQString&)) ); + connect( top, TQ_SIGNAL(requestCertificateDownload(const TQString&, const TQString&)), + TQ_SLOT(slotStartCertificateDownload(const TQString&, const TQString&)) ); dialog->show(); } @@ -1219,8 +1219,8 @@ void CertManager::startCertificateExport( const TQStringList & fingerprints ) { Kleo::ExportJob * job = Kleo::CryptoBackendFactory::instance()->smime()->publicKeyExportJob( true ); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::Error&,const TQByteArray&)), - TQT_SLOT(slotCertificateExportResult(const GpgME::Error&,const TQByteArray&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::Error&,const TQByteArray&)), + TQ_SLOT(slotCertificateExportResult(const GpgME::Error&,const TQByteArray&)) ); connectJobToStatusBarProgress( job, i18n("Exporting certificate...") ); @@ -1271,8 +1271,8 @@ void CertManager::slotCertificateExportResult( const GpgME::Error & err, const T TDEIO::Job* uploadJob = TDEIOext::put( data, url, -1, overwrite, false /*resume*/ ); uploadJob->setWindow( this ); - connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) ); + connect( uploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotUploadResult( TDEIO::Job* ) ) ); } @@ -1356,8 +1356,8 @@ void CertManager::startSecretKeyExport( const TQString & fingerprint ) { Kleo::ExportJob * job = Kleo::CryptoBackendFactory::instance()->smime()->secretKeyExportJob( false, charset ); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::Error&,const TQByteArray&)), - TQT_SLOT(slotSecretKeyExportResult(const GpgME::Error&,const TQByteArray&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::Error&,const TQByteArray&)), + TQ_SLOT(slotSecretKeyExportResult(const GpgME::Error&,const TQByteArray&)) ); connectJobToStatusBarProgress( job, i18n("Exporting secret key...") ); @@ -1390,8 +1390,8 @@ void CertManager::slotSecretKeyExportResult( const GpgME::Error & err, const TQB TDEIO::Job* uploadJob = TDEIOext::put( data, url, -1, overwrite, false /*resume*/ ); uploadJob->setWindow( this ); - connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) ); + connect( uploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotUploadResult( TDEIO::Job* ) ) ); } void CertManager::slotUploadResult( TDEIO::Job* job ) diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h index c61ce7db..8a893b36 100644 --- a/certmanager/certmanager.h +++ b/certmanager/certmanager.h @@ -1,4 +1,4 @@ -/* -*- mode: c++; c-basic-offset:4 -*- +/* certmanager.h This file is part of Kleopatra, the KDE keymanager @@ -36,7 +36,7 @@ //#include <gpgme.h> #include <tdemainwindow.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <kurl.h> #include <tqcstring.h> #include <tqptrlist.h> @@ -77,7 +77,7 @@ namespace GpgME { } class KDE_EXPORT CertManager : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: CertManager( bool remote = false, const TQString& query = TQString(), diff --git a/certmanager/conf/CMakeLists.txt b/certmanager/conf/CMakeLists.txt index 506f72d3..37eee758 100644 --- a/certmanager/conf/CMakeLists.txt +++ b/certmanager/conf/CMakeLists.txt @@ -29,11 +29,14 @@ link_directories( ##### other data ################################ -install( FILES +tde_create_translated_desktop( + SOURCE kleopatra_config_dirserv.desktop kleopatra_config_appear.desktop kleopatra_config_dnorder.desktop - DESTINATION ${SERVICES_INSTALL_DIR} ) + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR certmanager-desktops +) ##### kcm_kleopatra (module) #################### diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp index c31fa900..49723f4d 100644 --- a/certmanager/conf/appearanceconfigpage.cpp +++ b/certmanager/conf/appearanceconfigpage.cpp @@ -36,7 +36,7 @@ #include <tdelocale.h> #include <kdebug.h> -#include <tdepimmacros.h> +#include <kdemacros.h> AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, const char * name ) : TDECModule( parent, name ) @@ -44,7 +44,7 @@ AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, con TQVBoxLayout* lay = new TQVBoxLayout( this ); mWidget = new Kleo::AppearanceConfigWidget( this ); lay->addWidget( mWidget ); - connect( mWidget, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) ); + connect( mWidget, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) ); #ifndef HAVE_UNBROKEN_KCMULTIDIALOG load(); diff --git a/certmanager/conf/appearanceconfigpage.h b/certmanager/conf/appearanceconfigpage.h index 6b6848c4..c8cd8e22 100644 --- a/certmanager/conf/appearanceconfigpage.h +++ b/certmanager/conf/appearanceconfigpage.h @@ -42,7 +42,7 @@ namespace Kleo { * "Appearance" configuration page for kleopatra's configuration dialog */ class AppearanceConfigurationPage : public TDECModule { - Q_OBJECT + TQ_OBJECT public: AppearanceConfigurationPage( TQWidget * parent=0, const char * name=0 ); diff --git a/certmanager/conf/appearanceconfigwidget.h b/certmanager/conf/appearanceconfigwidget.h index f6ca9c8e..2609f5dc 100644 --- a/certmanager/conf/appearanceconfigwidget.h +++ b/certmanager/conf/appearanceconfigwidget.h @@ -41,7 +41,7 @@ class TDEConfig; namespace Kleo { class AppearanceConfigWidget : public AppearanceConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/certmanager/conf/appearanceconfigwidgetbase.ui b/certmanager/conf/appearanceconfigwidgetbase.ui index 57029201..462963f2 100644 --- a/certmanager/conf/appearanceconfigwidgetbase.ui +++ b/certmanager/conf/appearanceconfigwidgetbase.ui @@ -201,7 +201,7 @@ <tabstop>strikeoutCB</tabstop> <tabstop>defaultLookPB</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">slotForegroundClicked()</slot> <slot access="protected">slotBackgroundClicked()</slot> <slot access="protected">slotFontClicked()</slot> @@ -210,6 +210,6 @@ <slot access="protected">slotItalicClicked()</slot> <slot access="protected">slotBoldClicked()</slot> <slot access="protected">slotStrikeoutClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/certmanager/conf/configuredialog.h b/certmanager/conf/configuredialog.h index 95d20d53..8216cbe8 100644 --- a/certmanager/conf/configuredialog.h +++ b/certmanager/conf/configuredialog.h @@ -38,7 +38,7 @@ class ConfigureDialog : public KCMultiDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp index 7a19d451..ad2e6099 100644 --- a/certmanager/conf/dirservconfigpage.cpp +++ b/certmanager/conf/dirservconfigpage.cpp @@ -47,7 +47,7 @@ #include <tqcheckbox.h> #include <tqlayout.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #if 0 // disabled, since it is apparently confusing // For sync'ing kabldaprc @@ -146,7 +146,7 @@ DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget Kleo::CryptoConfigEntry::ArgType_LDAPURL, true ); mWidget = new Kleo::DirectoryServicesWidget( entry, this ); lay->addWidget( mWidget ); - connect( mWidget, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) ); + connect( mWidget, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) ); // LDAP timeout TQHBox* box = new TQHBox( this ); @@ -155,7 +155,7 @@ DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget TQLabel* label = new TQLabel( i18n( "LDAP &timeout (minutes:seconds)" ), box ); mTimeout = new TQTimeEdit( box ); mTimeout->setDisplay( TQTimeEdit::Minutes | TQTimeEdit::Seconds ); - connect( mTimeout, TQT_SIGNAL( valueChanged( const TQTime& ) ), this, TQT_SLOT( slotChanged() ) ); + connect( mTimeout, TQ_SIGNAL( valueChanged( const TQTime& ) ), this, TQ_SLOT( slotChanged() ) ); label->setBuddy( mTimeout ); TQWidget* stretch = new TQWidget( box ); box->setStretchFactor( stretch, 2 ); @@ -167,13 +167,13 @@ DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget mMaxItems = new KIntNumInput( box ); mMaxItems->setLabel( i18n( "&Maximum number of items returned by query" ), TQt::AlignLeft | TQt::AlignVCenter ); mMaxItems->setMinValue( 0 ); - connect( mMaxItems, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotChanged() ) ); + connect( mMaxItems, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotChanged() ) ); stretch = new TQWidget( box ); box->setStretchFactor( stretch, 2 ); #ifdef NOT_USEFUL_CURRENTLY mAddNewServersCB = new TQCheckBox( i18n( "Automatically add &new servers discovered in CRL distribution points" ), this ); - connect( mAddNewServersCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); + connect( mAddNewServersCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) ); lay->addWidget( mAddNewServersCB ); #endif diff --git a/certmanager/conf/dirservconfigpage.h b/certmanager/conf/dirservconfigpage.h index f6a32301..b717b4eb 100644 --- a/certmanager/conf/dirservconfigpage.h +++ b/certmanager/conf/dirservconfigpage.h @@ -34,7 +34,7 @@ #include <tdecmodule.h> #include <kleo/cryptoconfig.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQCheckBox; class TQTimeEdit; @@ -51,7 +51,7 @@ namespace Kleo { * remote certificates in kleopatra. */ class KDE_EXPORT DirectoryServicesConfigurationPage : public TDECModule { - Q_OBJECT + TQ_OBJECT public: DirectoryServicesConfigurationPage( TQWidget * parent=0, const char * name=0 ); diff --git a/certmanager/conf/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp index a802a06f..5c2d6c20 100644 --- a/certmanager/conf/dnorderconfigpage.cpp +++ b/certmanager/conf/dnorderconfigpage.cpp @@ -34,7 +34,7 @@ #include <ui/dnattributeorderconfigwidget.h> #include <kleo/dn.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqlayout.h> @@ -45,7 +45,7 @@ DNOrderConfigPage::DNOrderConfigPage( TQWidget * parent, const char * name ) mWidget = Kleo::DNAttributeMapper::instance()->configWidget( this, "mWidget" ); vlay->addWidget( mWidget ); - connect( mWidget, TQT_SIGNAL(changed()), TQT_SLOT(slotChanged()) ); + connect( mWidget, TQ_SIGNAL(changed()), TQ_SLOT(slotChanged()) ); #ifndef HAVE_UNBROKEN_KCMULTIDIALOG load(); diff --git a/certmanager/conf/dnorderconfigpage.h b/certmanager/conf/dnorderconfigpage.h index 0830acbc..9c42d5c8 100644 --- a/certmanager/conf/dnorderconfigpage.h +++ b/certmanager/conf/dnorderconfigpage.h @@ -42,7 +42,7 @@ namespace Kleo { * "DN Order" configuration page for kleopatra's configuration dialog */ class DNOrderConfigPage : public TDECModule { - Q_OBJECT + TQ_OBJECT public: DNOrderConfigPage( TQWidget * parent=0, const char * name=0 ); diff --git a/certmanager/conf/kleopatra_config_appear.desktop b/certmanager/conf/kleopatra_config_appear.desktop index a216a8dc..1bc5b147 100644 --- a/certmanager/conf/kleopatra_config_appear.desktop +++ b/certmanager/conf/kleopatra_config_appear.desktop @@ -13,165 +13,7 @@ X-TDE-ParentComponents=kleopatra X-TDE-CfgDlgHierarchy=Kleopatra Name=Appearance -Name[ar]=المظهر -Name[be]=Знешні выгляд -Name[bg]=Външен вид -Name[br]=Neuziadur -Name[bs]=Izgled -Name[ca]=Aparença -Name[cs]=Vzhled -Name[cy]=Golwg -Name[da]=Udseende -Name[de]=Erscheinungsbild -Name[el]=Εμφάνιση -Name[eo]=Prezentado -Name[es]=Apariencia -Name[et]=Välimus -Name[eu]=Itxura -Name[fa]=ظاهر -Name[fi]=Ulkoasu -Name[fr]=Apparence -Name[fy]=Uterlik -Name[ga]=Cuma -Name[gl]=Apariencia -Name[he]=מראה -Name[hr]=Izgled -Name[hu]=Megjelenés -Name[is]=Útlit -Name[it]=Aspetto -Name[ja]=外観 -Name[kk]=Сыртқы көрінісі -Name[km]=រូបរាង -Name[ko]=모양 -Name[lt]=Išvaizda -Name[mk]=Изглед -Name[ms]=Rupa -Name[nb]=Utseende -Name[nds]=Utsehn -Name[ne]=मोहडा -Name[nl]=Uiterlijk -Name[nn]=Utsjånad -Name[pl]=Wygląd -Name[pt]=Aparência -Name[pt_BR]=Aparência -Name[ru]=Внешний вид -Name[rw]=Imigaragarire -Name[se]=Fárda -Name[sk]=Vzhľad -Name[sl]=Videz -Name[sr]=Изглед -Name[sr@Latn]=Izgled -Name[sv]=Uppträdande -Name[ta]=தோற்றம் -Name[tg]=Намуди зоҳирӣ -Name[tr]=Görünüm -Name[uk]=Вигляд -Name[uz]=Кўриниши -Name[zh_CN]=外观 + Comment=Colors & Fonts Configuration -Comment[af]=Kleur en skrif tipe opstelling -Comment[ar]=إعدادات الألوان و المحارف -Comment[be]=Настаўленні колераў і шрыфтоў -Comment[bg]=Настройки на цветовете и шрифтовете -Comment[bs]=Podešavanje boja i fontova -Comment[ca]=Configuració de colors i lletres -Comment[cs]=Nastavení barev a písem -Comment[da]=Indstilling af farver & skrifttype -Comment[de]=Farb- & Schrifteneinrichtung -Comment[el]=Ρύθμιση χρωμάτων & γραμματοσειρών -Comment[en_GB]=Colours & Fonts Configuration -Comment[eo]=Kolora kaj Tipara Agordo -Comment[es]=Configuración de colores y tipografías -Comment[et]=Värvide ja fontide seadistamine -Comment[eu]=Kolore eta letra-tipoen konfigurazioa -Comment[fa]=پیکربندی رنگها و قلمها -Comment[fi]=Värien ja kirjasinten asetukset -Comment[fr]=Configuration des polices et des couleurs -Comment[fy]=Kleur- en lettertype-ynstellings -Comment[ga]=Cumraíocht na nDathanna/gClófhoirne -Comment[gl]=Configuración de Cores e Fontes -Comment[he]=תצורת צבעים וגופנים -Comment[hu]=A színek és betűtípusok beállítása -Comment[is]=Stilling lita & leturgerða -Comment[it]=Configurazione tipi di carattere e colori -Comment[ja]=色とフォントの設定 -Comment[kk]=Түс & Қаріп параметрлері -Comment[km]=ការកំណត់រចនាសម្ព័ន្ធពណ៌ & ពុម្ពអក្សរ -Comment[ko]=색과 글꼴 설정 -Comment[lt]=Spalvų ir šriftų konfigūravimas -Comment[mk]=Конфигурација на бои и фонтови -Comment[ms]=Warna & Konfigurasi fon -Comment[nb]=Oppsett av farger og skrifttyper -Comment[nds]=Klören un Schriftoorden instellen -Comment[ne]=रङ र फन्ट कन्फिगरेसन -Comment[nl]=Kleur- en lettertype-instellingen -Comment[nn]=Oppsett av fargar og skrifter -Comment[pl]=Konfiguracja czcionek i kolorów -Comment[pt]=Configuração das Cores e Tipos de Letra -Comment[pt_BR]=Configuração de Cores & Fontes -Comment[ru]=Настройка цветов и шрифтов -Comment[se]=Heivet ivnniid ja fonttaid -Comment[sk]=Nastavenie písiem a farieb -Comment[sl]=Nastavitev pisav in barv -Comment[sr]=Подешавање боја и фонтова -Comment[sr@Latn]=Podešavanje boja i fontova -Comment[sv]=Inställning av färger och teckensnitt -Comment[ta]=வண்ணங்கள்& எழுத்துருக்கள் கட்டமைப்பு -Comment[tg]=Танзимоти ранг ва ҳуруф -Comment[tr]=Renkler ve Yazı Tipleri Yapılandırması -Comment[uk]=Налаштування кольорів і шрифтів -Comment[zh_CN]=颜色和字体配置 -Comment[zh_TW]=設定顏色與字型 + Keywords=color;font; configuration; -Keywords[af]=kleur;skrif tipe;opstelling;color;font; -Keywords[ar]=لون;حرف; إعدادات;محرف;ألوان; -Keywords[be]=колер; шрыфт; канфігурацыя; color; font; configuration; -Keywords[bg]=цвят; шрифт; настройване; настройки color; font; configuration; -Keywords[br]=liv;nodrezh; kefluniadur; -Keywords[bs]=color;font; configuration;boja;boje;font;podešavanje; -Keywords[ca]=color;lletres; configuració; -Keywords[cs]=barva;písmo;nastavení; -Keywords[da]=farve;skrifttype;indstilling; -Keywords[de]=Farben;Schriftarten;Konfiguration;Einrichtung;Einstellungen; -Keywords[el]=χρώμα;γραμματοσειρά; ρύθμιση; -Keywords[en_GB]=colour;font; configuration; -Keywords[eo]=koloro;tiparo; agordo; -Keywords[es]=color; tipografía; configuración; -Keywords[et]=värv; font; seadistamine; -Keywords[eu]=kolore;letra-tipo; konfigurazioa; -Keywords[fa]=رنگ، قلم، پیکربندی; -Keywords[fi]=värit;kirjasimet;asetukset; -Keywords[fr]=couleur;police;configuration;paramètres;réglages;couleurs;polices; -Keywords[fy]=kleur;kleuren;font;lettertype;konfiguraasje;ynstellings;setup;opset; -Keywords[ga]=dath;cló;cumraíocht; -Keywords[gl]=cor;fonte; configuración; -Keywords[he]=color;font; configuration;צבע;צבעים; גופנים; גופן; תצורה; הגדרה; -Keywords[hu]=szín;betűtípus;beállítások; -Keywords[is]=litir;letur; stillingar; -Keywords[it]=colori; font; caratteri; configurazione; -Keywords[ja]=色;フォント;設定; -Keywords[km]=ពណ៌;ពុម្ពអក្សរ;ការកំណត់រចនាសម្ព័ន្ធ; -Keywords[ko]=색;글꼴;설정; -Keywords[lt]=color;font; configuration; spalvų; šriftų konfigūravimas; -Keywords[mk]=color;font;configuration;боја;фонт;конфигурација; -Keywords[ms]=warna;fon; konfigurasi; -Keywords[nb]=farge;skrifttype;oppsett; -Keywords[nds]=Klöör;Schriftoort;instellen; -Keywords[ne]=रङ; फन्ट; कन्फिगरेसन; -Keywords[nl]=kleur;kleuren;font;lettertype;configuratie;instellingen;setup; -Keywords[nn]=farge;skrift;oppsett; -Keywords[pl]=kolor;czcionki;kolory;konfiguracja; -Keywords[pt]=cor;tipo de letra; configuração; -Keywords[pt_BR]=cor;fonte;configurar;configurações; -Keywords[ru]=цвета;шрифты;настройка; -Keywords[se]=ivdni;fonta;heivehus; -Keywords[sk]=farba;písmo;nastavenie; -Keywords[sl]=barva;barve;pisava;pisave;nastavi;nastavitve; -Keywords[sr]=боја;фонт;подешавања; -Keywords[sr@Latn]=boja;font;podešavanja; -Keywords[sv]=färger;teckensnitt; inställningar; -Keywords[ta]=Comment=வண்ணம்;எழுத்துரு; கட்டமைப்பு; -Keywords[tg]=рангҳо;ҳуруфҳо;танзимот; -Keywords[tr]=renk;yazı tipi; yapılandırma; -Keywords[uk]=колір; шрифт; налаштування; -Keywords[zh_CN]=color;font;configuration;颜色;字体;配置; diff --git a/certmanager/conf/kleopatra_config_dirserv.desktop b/certmanager/conf/kleopatra_config_dirserv.desktop index ab7ff0c0..6f1023b3 100644 --- a/certmanager/conf/kleopatra_config_dirserv.desktop +++ b/certmanager/conf/kleopatra_config_dirserv.desktop @@ -13,154 +13,7 @@ X-TDE-ParentComponents=kleopatra X-TDE-CfgDlgHierarchy=Kleopatra Name=Directory Services -Name[ar]=خدمات الدليل -Name[bg]=Директорийни услуги -Name[bs]=Imenički servisi -Name[ca]=Serveis de directori -Name[cs]=Adresářové služby -Name[da]=Opslagstjeneste -Name[de]=Verzeichnisdienste -Name[el]=Υπηρεσίες καταλόγου -Name[eo]=Dosierujaj Servoj -Name[es]=Servicios de directorio -Name[et]=Kataloogiteenused -Name[eu]=Direktorio zerbitzuak -Name[fa]=خدمات فهرست راهنما -Name[fi]=Hakemistopalvelut -Name[fr]=Services de répertoires -Name[fy]=Maptsjinsten -Name[ga]=Seirbhísí Eolaire -Name[gl]=Servicios de Directorio -Name[he]=שירותי ספרייה -Name[hu]=Címtárszolgáltatások -Name[is]=Nafnaþjónustur -Name[it]=Servizi Directory -Name[ja]=ディレクトリサービス -Name[kk]=Каталог қызметтері -Name[km]=សេវាថត -Name[ko]=디렉터리 서비스 -Name[lt]=Aplankų tarnybos -Name[mk]=Именички сервиси -Name[ms]=Servis Direktori -Name[nb]=Katalogtjenere -Name[nds]=Vertekendeensten -Name[ne]=डाइरेक्टरी कार्य -Name[nl]=Mapdiensten -Name[nn]=Katalogtenester -Name[pa]=ਡਾਇਰੈਕਟਰੀ ਸੇਵਾਵਾਂ -Name[pl]=Usługi katalogowe -Name[pt]=Serviços de Directório -Name[pt_BR]=Serviços de Diretório -Name[ru]=Службы каталогов -Name[se]=Ohcobálvalusat -Name[sk]=Adresárové služby -Name[sl]=Imeniške storitve -Name[sr]=Сервис директоријума -Name[sr@Latn]=Servis direktorijuma -Name[sv]=Katalogtjänster -Name[ta]= அடைவு சேவைகள் -Name[tg]=Кӯмакҳои каталог -Name[tr]=Dizin Servisleri -Name[uk]=Служби каталогів -Name[zh_CN]=目录服务 -Name[zh_TW]=目錄服務 + Comment=Configuration of LDAP directory services -Comment[af]=Opstelling van LDAP gids diens -Comment[bg]=Настройки на директорийните услуги LDAP -Comment[bs]=Podešavanje LDAP usluge imenika -Comment[ca]=Configuració dels serveis de directori LDAP -Comment[cs]=Nastavení adresářových služeb LDAP -Comment[da]=Indstilling af LDAP opslagstjeneste -Comment[de]=Einrichtung von LDAP-Verzeichnisdiensten -Comment[el]=Ρυθμίσεις των υπηρεσιών καταλόγου LDAP -Comment[eo]=Agordo de LDAP dosierujaj servoj -Comment[es]=Configuración de los servicios de directorio LDAP -Comment[et]=LDAP kataloogiteenuste seadistused -Comment[eu]=LDAP direktorio zerbitzuen konfigurazioa -Comment[fa]=پیکربندی خدمات فهرست راهنمای LDAP -Comment[fi]=Hakemistopalveluiden asetukset -Comment[fr]=Configuration des répertoires LDAP -Comment[fy]=Konfiguraasje foar LDAP-tsjinsten -Comment[gl]=Configuración dos servicios de directorio LDAP -Comment[he]=תצורה של שירותי ספרייה עבור LDAP -Comment[hu]=Az LDAP címtárszolgáltatások beállításai -Comment[is]=Stillingar LDAP uppflettingaþjónustunnar -Comment[it]=Configurazione servizi LDAP -Comment[ja]=LDAP ディレクトリサービスの設定 -Comment[kk]=LDAP каталог қызметтер параметрлері -Comment[km]=ការកំណត់រចនាសម្ព័ន្ធរបស់សេវាថត LDAP -Comment[ko]=LDAP 디렉터리 서비스 설정 -Comment[lt]=LDAP aplankų tarnybų konfigūravimas -Comment[mk]=Конфигурација на LDAP-именички сервиси -Comment[ms]=Konfigurasi LDAP servis direktori -Comment[nb]=Oppsett av LDAP katalogtjenester -Comment[nds]=LDAP-Vertekendeensten instellen -Comment[ne]=LDAP डाइरेक्टरी कार्यको कन्फिगरेसन -Comment[nl]=Configuratie voor LDAP-diensten -Comment[nn]=Oppsett av LDAP-katalogtenester -Comment[pl]=Konfiguracja usług katalogowych LDAP -Comment[pt]=Configuração dos serviços de directório LDAP -Comment[pt_BR]=Configuração dos serviços de diretório LDAP -Comment[ru]=Настройка служб каталогов LDAP -Comment[se]=Heivet LDAP-ohcobálvalusaid -Comment[sk]=Nastavenie adresárových služieb LDAP -Comment[sl]=Nastavitve imeniških storitev LDAP -Comment[sr]= Подешавања LDAP сервиса директоријума -Comment[sr@Latn]= Podešavanja LDAP servisa direktorijuma -Comment[sv]=Inställning av LDAP-katalogtjänster -Comment[ta]= LDAP அடைவு சேவைகளின் கட்டமைப்பு -Comment[tg]=Танзимоти кӯмакҳои каталоги LDAP -Comment[tr]=LDAP dizin servislerinin yapılandırması -Comment[uk]=Налаштування служб каталогів LDAP -Comment[zh_CN]=LDAP 目录服务配置 -Comment[zh_TW]=設定 LDAP 目錄服務 + Keywords=ldap;directory;services; -Keywords[af]=ldap;directory;services;gids; -Keywords[be]=каталёг;сэрвісы;ldap;directory;services; -Keywords[bg]=директорийни; услуги; ldap; directory; services; -Keywords[br]=ldap;renkell;servijeroù; -Keywords[bs]=ldap;directory;services;imenik;servis;usluga;imenički;imeničke;usluge; -Keywords[ca]=ldap;directori;serveis; -Keywords[cs]=LDAP;adresář;služby; -Keywords[da]=ldap;opslag;tjenester; -Keywords[de]=LDAP;Verzeichnis;Dienste;Verzeichnisdienst; -Keywords[el]=ldap;κατάλογος;υπηρεσίες; -Keywords[eo]=ldap;dosierujo;servoj; -Keywords[es]=ldap;directorio;servicios; -Keywords[et]=ldap;kataloog;teenused; -Keywords[eu]=Idap; direktorio; zerbitzuak; -Keywords[fa]=ldap، فهرست راهنما، خدمات; -Keywords[fi]=ldap;hakemisto;palvelut; -Keywords[fr]=ldap;dossier;dossiers;service;services; -Keywords[fy]=ldap;directory;services;triemtafel;tsjinsten; -Keywords[ga]=ldap;eolaire;seirbhísí; -Keywords[gl]=ldap;directorio;servicios; -Keywords[he]=ldap;directory;services;ספרייה;שירותים; -Keywords[hu]=ldap;címtár;szolgáltatások; -Keywords[is]=ldap;directory;services;nafnaþjónusta; -Keywords[it]=ldap; servizi; directory; -Keywords[ja]=ldap;ディレクトリ;サービス; -Keywords[km]=ldap;ថត;សេវា; -Keywords[ko]=ldap;디렉터리;서비스; -Keywords[lt]=ldap;directory;services;aplankai;tarnybos; -Keywords[mk]=ldap;directory;services;именик;сервиси; -Keywords[ms]=ldap;direktori;servis; -Keywords[nb]=ldap;mappe;tjenester; -Keywords[nds]=LDAP;Verteken;Deensten; -Keywords[ne]=ldap;डाइरेक्टरी;कार्य; -Keywords[nn]=ldap;katalog;tenester; -Keywords[pl]=ldap;katalog;usługi katalogowe;usługi;LDAP; -Keywords[pt]=ldap;directório;serviços; -Keywords[pt_BR]=ldap;diretório;serviços; -Keywords[ru]=LDAP;службы каталогов; -Keywords[se]=ldap;ohcu;bálvalusat; -Keywords[sk]=ldap;adresár;služby; -Keywords[sl]=ldap;imenik;storitve; -Keywords[sr]=ldap;директоријум;сервиси; -Keywords[sr@Latn]=ldap;direktorijum;servisi; -Keywords[sv]=ldap;katalog;tjänster; -Keywords[ta]=ldap; அடைவு; சேவைகள்; -Keywords[tg]=ldap;кӯмакҳои каталог; -Keywords[tr]=ldap;dizin;servisler; -Keywords[uk]=ldap;служби;каталогів; -Keywords[zh_CN]=ldap;directory;services;目录;服务; diff --git a/certmanager/conf/kleopatra_config_dnorder.desktop b/certmanager/conf/kleopatra_config_dnorder.desktop index 445ed261..31a24feb 100644 --- a/certmanager/conf/kleopatra_config_dnorder.desktop +++ b/certmanager/conf/kleopatra_config_dnorder.desktop @@ -13,149 +13,7 @@ X-TDE-ParentComponents=kleopatra X-TDE-CfgDlgHierarchy=Kleopatra Name=DN-Attribute Order -Name[bg]=Подредба -Name[bs]=Redoslijed DN atributa -Name[ca]=Ordre d'atributs DN -Name[cs]=Pořadí DN atributů -Name[da]=DN-Attributrækkefølge -Name[de]=DN-Attribut-Ordnung -Name[el]=Σειρά ιδιότητας DN -Name[eo]=DN-Atributa Sinsekvo -Name[es]=Orden de atributos DN -Name[et]=DN-atribuutide järjekord -Name[eu]=DN-atributu ordena -Name[fa]=ترتیب خصیصۀ DN -Name[fi]=DN-attribuuttien järjestys -Name[fr]=Ordre des attributs DN -Name[fy]=DN-Attribuutoarder -Name[gl]=Orde de DN-Attribute -Name[he]=סדר של מאפייני DN -Name[hu]=DN-attribútumsorrend -Name[is]=DN eiginleikaröðun -Name[it]=Attributi DN, ordine -Name[ja]=DN 属性順位 -Name[kk]=DN-атрибуттер реті -Name[km]=លំដាប់គុណលក្ខណៈ DN -Name[ko]=DN 분배 순서 -Name[lt]=DN-Savybių tvarka -Name[mk]=Редослед на DN-атрибути -Name[ms]=Tertib atribut DN -Name[nb]=DN-Attributtrekkefølge -Name[nds]=DN-Egenschappenreeg -Name[ne]=डीएन विशेषता आदेश -Name[nl]=DN-Attribuutvolgorde -Name[nn]=DN-attributtrekkjefølgje -Name[pl]=Porządek atrybutów DN -Name[pt]=Ordem de Atributos DN -Name[pt_BR]=Ordem do Atributo DN -Name[ru]=Порядок атрибутов DN -Name[se]=DN-attribuhttaortnet -Name[sk]=Poradie atribútov DN -Name[sl]=Vrstni red atributov DN -Name[sr]=DN-Атрибут ред -Name[sr@Latn]=DN-Atribut red -Name[sv]=DN-egenskapsordning -Name[ta]=DN-பண்புக்கூறு வரிசை -Name[tg]=Тартиби мушаххасияти DN -Name[tr]=DN-Öznitelik Sırası -Name[uk]=Порядок атрибутів DN -Name[zh_CN]=DN 属性顺序 -Name[zh_TW]=DN-屬性順序 + Comment=Configure the order in which DN attributes are shown -Comment[af]=Stel die volgorde op waarin DN eienskappe vertoon word -Comment[bg]=Настройки на подредбата на атрибутите на индекса (DN) -Comment[bs]=Podesite redoslijed kojim će biti prikazani DN atributi -Comment[ca]=Configura l'ordre en què es mostren els atributs DN -Comment[cs]=Nastavení pořadí zobrazení DN atributů -Comment[da]=Indstil rækkefølgen i hvilken DN-attributter vises -Comment[de]=Einrichtung für die Anzeigereihenfolge der DN-Attribute -Comment[el]=Ρύθμιση της σειράς εμφάνισης των ιδιοτήτων DN -Comment[eo]=Agordi la sinsekvon en kiu DN-atributoj aperas -Comment[es]=Configura el orden en el que se muestran los atributos DN -Comment[et]=DN-atribuutide näitamise järjekorra seadistamine -Comment[eu]=Konfiguratu DN atributuak zein ordenetan erakutsiko diren -Comment[fa]=پیکربندی ترتیبی که خصیصههای DN طبق آن نمایش داده میشوند -Comment[fi]=Määrittele missä järjestyksessä DN-attribuutit näytetään -Comment[fr]=Configurer l'ordre dans lequel les attributs DN sont affichés -Comment[fy]=De folchoarder fan de DN-atributen ynstelle -Comment[gl]=Configurar a orde en que se amosan os atributos DN -Comment[he]=הגדרה של הסדר שבהם מאפייני DN מוצגים -Comment[hu]=A DN-attribútumok megjelenítési sorrendjének beállítása -Comment[is]=Stilla röð DN eiginleikanna -Comment[it]=Configura l'ordine in cui sono mostrati gli attributi DN -Comment[ja]=DN 属性を表示する順位を設定 -Comment[kk]=DN атрибуттерді көрсету ретін баптау -Comment[km]=កំណត់រចនាសម្ព័ន្ធលំដាប់ ដែលត្រូវបង្ហាញគុណលក្ខណៈ DN -Comment[lt]=Konfigūruoti DN savybių rodymo tvarką -Comment[mk]=Конфигурирајте го редоследот по кој се покажуваат DN-атрибутите -Comment[ms]=Konfigur tertib yang atribut DN dipaparkan -Comment[nb]=Still inn rekkefølgen DN-attributtene er sortert i -Comment[nds]=De Reeg bi't Wiesen vun DN-Egenschappen fastleggen -Comment[ne]=डीएन विशेषता देखिने आदेश कन्फिगर गर्नुहोस् -Comment[nl]=Stel de volgorde in van de DN-attributen -Comment[nn]=Vel kva rekkjefølgje DN-attributtane er sorterte i -Comment[pl]=Konfiguracja kolejności wyświetlania atrybutów DN -Comment[pt]=Configuração da ordem em que os atributos DN são mostrados -Comment[pt_BR]=Configura a ordem na qual os atributos DN são mostrados -Comment[ru]=Настройка порядка показываемых атрибутов DN -Comment[se]=Vállje makkár ortnegis DN-attribuhttat sorterejuvvojit -Comment[sk]=Nastavenie poradia, v ktorom sú zobrazené atribúty DN -Comment[sl]=Nastavite vrstni red, v katerem so prikazani atributi DN -Comment[sr]=Подешава ред којим су приказани DN атрибути -Comment[sr@Latn]=Podešava red kojim su prikazani DN atributi -Comment[sv]=Anpassa ordningen som DN-egenskaper visas -Comment[ta]= DN விவரங்கள் எந்த வரிசையில் உள்ளதோ அப்படியே அமை -Comment[tg]=Танзимоти мушаххасиятҳои намоишшавандаи тартибии DN -Comment[tr]=DN özniteliklerinin hangi sıralama ile gösterileceğini yapılandır -Comment[uk]=Налаштування порядку показу атрибутів DN -Comment[zh_CN]=配置 DN 属性显示的顺序 -Comment[zh_TW]=設定 DN 屬性顯示順序 + Keywords=DN;order;RDN;attribute; -Keywords[af]=DN;order;RDN;attribute;volgorde;eienskap; -Keywords[be]=парадак;атрыбут;DN;order;RDN;attribute; -Keywords[bg]=индекс; ред; подредба; атрибут DN; order; RDN; attribute; -Keywords[bs]=DN;order;RDN;attribute;redoslijed;atribut; -Keywords[ca]=DN;ordre;RDN;atribut; -Keywords[cs]=DN;pořadí;RDN;atribut; -Keywords[da]=DN;rækkefølge;RDN;attribut; -Keywords[de]=DN;Ordnung;RDN;Attribut; -Keywords[el]=DN;σειρά;RDN;ιδιότητα; -Keywords[eo]=DN;sinsekvo;ordo;RDN;atributo; -Keywords[es]=DN;orden;RDN;atributo; -Keywords[et]=DN;järjekord;RDN;atribuut; -Keywords[eu]=DN; ordena; RDN; atributua; -Keywords[fa]=DN، ترتیب، RDN، خصیصه; -Keywords[fi]=DN;järjestys;RDN;attribuutti; -Keywords[fr]=DN;ordre;RDN;attribut; -Keywords[fy]=DN;Fochoarder;RDN;attribuut; -Keywords[ga]=DN;ord;RDN;aitreabúid; -Keywords[gl]=DN;orde;RDN;atributo; -Keywords[he]=DN;order;RDN;attribute; סדר; מאפיין; -Keywords[hu]=DN;sorrend;RDN;attribútum; -Keywords[is]=DN;röð;order;RDN;attribute; -Keywords[it]=DN;ordine;RDN;attributi; -Keywords[ja]=DN;順位;RDN;属性; -Keywords[km]=DN;លំដាប់;RDN;គុណលក្ខណៈ; -Keywords[lt]=DN;order;RDN;attribute;savybė;tvarka; -Keywords[mk]=DN;order;RDN;attribute;редослед;атрибут; -Keywords[ms]=DN;susunan;RDN;atribut; -Keywords[nb]=DN;orden;RDN;attributt; -Keywords[nds]=DN;Reeg;RDN;Egenschap; -Keywords[ne]=डीएन;क्रम;आरडीएन; विशेषता; -Keywords[nl]=DN;volgorde;RDN;attribuut; -Keywords[nn]=DN;rekkjefølgje;RDN;attributt; -Keywords[pl]=DN;kolejność;RDN;atrybuty; -Keywords[pt]=DN;ordem;RDN;atributo; -Keywords[pt_BR]=DN; ordem; RDN;atributo; -Keywords[ru]=DN;порядок;RDN;атрибут; -Keywords[se]=DN;ortnet;RDN;attribuhtta; -Keywords[sk]=DN;poradie;RDN;atribút; -Keywords[sl]=DN;vrstni red;RDN;atribut; -Keywords[sr]=DN;ред;RDN;атрибут; -Keywords[sr@Latn]=DN;red;RDN;atribut; -Keywords[sv]=DN;ordning;RDN;egenskap; -Keywords[ta]=DN;வரிசை;RDN;குணம்; -Keywords[tg]=DN;тартибот;RDN;мушаххасот; -Keywords[tr]=DN;sıralama;RDN;öznitelik; -Keywords[uk]=DN;порядок;RDN;атрибут; -Keywords[zh_CN]=DN;order;RDN;attribute;顺序;属性; diff --git a/certmanager/crlview.cpp b/certmanager/crlview.cpp index f94a4557..2cefe045 100644 --- a/certmanager/crlview.cpp +++ b/certmanager/crlview.cpp @@ -71,16 +71,16 @@ CRLView::CRLView( TQWidget* parent, const char* name, bool modal ) hbLayout->addWidget( _closeButton ); // connections: - connect( _updateButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotUpdateView() ) ); - connect( _closeButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( close() ) ); + connect( _updateButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotUpdateView() ) ); + connect( _closeButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( close() ) ); resize( _textView->fontMetrics().width( 'M' ) * 80, _textView->fontMetrics().lineSpacing() * 25 ); _timer = new TQTimer( this ); - connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotAppendBuffer()) ); + connect( _timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotAppendBuffer()) ); } CRLView::~CRLView() @@ -101,10 +101,10 @@ void CRLView::slotUpdateView() if( _process == 0 ) { _process = new TDEProcess(); *_process << "gpgsm" << "--call-dirmngr" << "listcrls"; - connect( _process, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int) ), - this, TQT_SLOT( slotReadStdout( TDEProcess*, char*, int ) ) ); - connect( _process, TQT_SIGNAL( processExited( TDEProcess* ) ), - this, TQT_SLOT( slotProcessExited() ) ); + connect( _process, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int) ), + this, TQ_SLOT( slotReadStdout( TDEProcess*, char*, int ) ) ); + connect( _process, TQ_SIGNAL( processExited( TDEProcess* ) ), + this, TQ_SLOT( slotProcessExited() ) ); } if( _process->isRunning() ) _process->kill(); if( !_process->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ) ) { diff --git a/certmanager/crlview.h b/certmanager/crlview.h index eef97deb..0e500f88 100644 --- a/certmanager/crlview.h +++ b/certmanager/crlview.h @@ -42,7 +42,7 @@ class TDEProcess; class TQTimer; class CRLView : public TQDialog { - Q_OBJECT + TQ_OBJECT public: CRLView( TQWidget* parent = 0, const char* name = 0, bool modal = false ); diff --git a/certmanager/customactions.cpp b/certmanager/customactions.cpp index bf637538..9c88491e 100644 --- a/certmanager/customactions.cpp +++ b/certmanager/customactions.cpp @@ -55,7 +55,7 @@ int LabelAction::plug( TQWidget * widget, int index ) { TQLabel* label = new TQLabel( text(), bar, "tde toolbar widget" ); bar->insertWidget( id_, label->width(), label, index ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -82,8 +82,8 @@ int LineEditAction::plug( TQWidget * widget, int index ) { bar->insertWidget( id_, _le->width(), _le, index ); bar->setStretchableWidget( _le ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); - connect( _le, TQT_SIGNAL( returnPressed() ), _receiver, _member ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); + connect( _le, TQ_SIGNAL( returnPressed() ), _receiver, _member ); return containerCount() - 1; } @@ -123,10 +123,10 @@ int ComboAction::plug( TQWidget * widget, int index ) { if ( widget->inherits( "TDEToolBar" ) ) { TDEToolBar *bar = (TDEToolBar *)widget; int id_ = getToolButtonID(); - bar->insertCombo( _lst, id_, false, TQT_SIGNAL( highlighted(int) ), _receiver, _member ); + bar->insertCombo( _lst, id_, false, TQ_SIGNAL( highlighted(int) ), _receiver, _member ); bar->setCurrentComboItem( id_,_selectedId ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } diff --git a/certmanager/customactions.h b/certmanager/customactions.h index 67a429f9..97dc68b5 100644 --- a/certmanager/customactions.h +++ b/certmanager/customactions.h @@ -40,7 +40,7 @@ class TQLineEdit; class LabelAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: LabelAction( const TQString & text, TDEActionCollection * parent, @@ -50,7 +50,7 @@ public: }; class LineEditAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: LineEditAction( const TQString & text, TDEActionCollection * parent, @@ -68,7 +68,7 @@ private: }; class ComboAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: ComboAction( const TQStringList & lst, TDEActionCollection * parent, diff --git a/certmanager/hierarchyanalyser.h b/certmanager/hierarchyanalyser.h index dede3814..34e7b5a6 100644 --- a/certmanager/hierarchyanalyser.h +++ b/certmanager/hierarchyanalyser.h @@ -1,4 +1,4 @@ -/* -*- mode: c++ -*- +/* hierarchyanalyser.h This file is part of Kleopatra, the KDE keymanager @@ -42,7 +42,7 @@ #include <vector> class HierarchyAnalyser : public TQObject { - Q_OBJECT + TQ_OBJECT public: HierarchyAnalyser( TQObject * parent=0, const char * name=0 ); diff --git a/certmanager/kleopatra.desktop b/certmanager/kleopatra.desktop index 2fab4ee7..756447dc 100644 --- a/certmanager/kleopatra.desktop +++ b/certmanager/kleopatra.desktop @@ -3,123 +3,11 @@ Type=Application Categories=Qt;TDE;Utility; Exec=kleopatra Icon=kleopatra + Name=Kleopatra -Name[af]=Kleopatra -Name[ar]=كليوبترا -Name[be]=Kleopatra -Name[bg]=Kleopatra -Name[br]=Kleopatra -Name[bs]=Kleopatra -Name[ca]=Kleopatra -Name[ca@valencia]=Kleopatra -Name[cs]=Kleopatra -Name[cy]=Kleopatra -Name[da]=Kleopatra -Name[de]=Kleopatra -Name[el]=Kleopatra -Name[en_GB]=Kleopatra -Name[eo]=Kleopatra -Name[es]=Kleopatra -Name[et]=Kleopatra -Name[eu]=Kleopatra -Name[fi]=Kleopatra -Name[fr]=Kleopatra -Name[fy]=Kleopatra -Name[ga]=Kleopatra -Name[gl]=Kleopatra -Name[he]=Kleopatra -Name[hu]=Kleopatra -Name[ia]=Kleopatra -Name[is]=Kleópatra -Name[it]=Kleopatra -Name[ja]=Kleopatra -Name[ka]=Kleopatra -Name[kk]=Kleopatra -Name[km]=Kleopatra -Name[ko]=Kleopatra -Name[lt]=Kleopatra -Name[lv]=Kleopatra -Name[mk]=Клеопатра -Name[mr]=क्लिओपात्रा -Name[ms]=Kleopatra -Name[nb]=Kleopatra -Name[nds]=Kleopatra -Name[ne]=क्लेओपेट्रा -Name[nl]=Kleopatra -Name[nn]=Kleopatra -Name[oc]=Kleopatra -Name[pa]=ਕਲੀਉਪਾਟਰਾ -Name[pl]=Kleopatra -Name[pt]=Kleopatra -Name[pt_BR]=Kleopatra -Name[ro]=Kleopatra -Name[ru]=Kleopatra -Name[se]=Kleopatra -Name[sk]=Kleopatra -Name[sl]=Kleopatra -Name[sr]=Клеопатра -Name[sr@ijekavian]=Клеопатра -Name[sr@ijekavianlatin]=Kleopatra -Name[sr@latin]=Kleopatra -Name[sv]=Kleopatra -Name[ta]=க்ளியோபட்ரா -Name[tg]=Kleopatra -Name[tr]=Kleopatra -Name[ug]=Kleopatra -Name[uk]=Kleopatra -Name[uz]=Kleopatra -Name[uz@cyrillic]=Kleopatra -Name[wa]=Kleopatra -Name[x-test]=xxKleopatraxx -Name[zh_CN]=Kleopatra -Name[zh_TW]=Kleopatra + GenericName=Certificate Manager and Unified Crypto GUI -GenericName[bs]=Upravitelj certifikata i grafičko okruženje za Unified Crypto -GenericName[ca]=Gestor de certificats i IGU criptogràfica unificada -GenericName[ca@valencia]=Gestor de certificats i IGU criptogràfica unificada -GenericName[cs]=Správce certifikátů a rozhraní pro šifrování -GenericName[da]=Certifikathåndtering og forenet krypterings-GUI -GenericName[de]=Zertifikatsverwaltung und Kryptografie-Oberfläche -GenericName[el]=Περιβάλλον διαχείρισης πιστοποιητικών και ενοποιημένης κρυπτογράφησης -GenericName[en_GB]=Certificate Manager and Unified Crypto GUI -GenericName[es]=Gestor de certificados e interfaz gráfica de usuario unificada de cifrado -GenericName[et]=Sertifikaadihaldur ja ühendatud krüptimise graafiline kasutajaliides -GenericName[fi]=Varmenteiden hallinta ja yhtenäinen salauskäyttöliittymä -GenericName[fr]=Interface de gestion des certificats et cryptographie unifiée -GenericName[gl]=Xestor de certificados e interface gráfica unificada de criptografía -GenericName[hu]=Tanúsítványkezelő és egységes kriptográfiai kezelőfelület -GenericName[ia]=Gerente de certificatos e interfacie unificate de Crypto -GenericName[it]=Gestore di certificati e interfaccia grafica unificata di crittografia -GenericName[ja]=証明書マネージャと、統合された暗号 GUI -GenericName[kk]=Куәлік менеджері мен шифрлау интерфейсі -GenericName[km]=កម្មវិធីគ្រប់គ្រងវិញ្ញាបនបត្រ និង Unified Crypto GUI -GenericName[lt]=Liudijimų tvarkytuvė ir jungtinė kriptografijos grafinė sąsaja -GenericName[lv]=Sertifikātu pārvaldnieks un vienota kriptofgrāfijas saskarne -GenericName[mr]=प्रमाणपत्र व्यवस्थापक व एकत्रित क्रिप्टो GUI -GenericName[nb]=Sertifikatbehandler og forent krypto-GUI -GenericName[nds]=Zertifikatenpleger un eenheitlich Verslötel-Böversiet -GenericName[nl]=Certificaatbeheer en GUI voor Unified Crypto -GenericName[nn]=Sertifikathandsamar og sameina krypteringsgrensesnitt -GenericName[pa]=ਸਰਟੀਫਿਕੇਟ ਮੈਨੇਜਰ ਅਤੇ ਇੱਕ ਕ੍ਰਿਪਟੂ GUI -GenericName[pl]=Zarządzanie certyfikatami i zunifikowane GUI kryptograficzne -GenericName[pt]=Gestor de Certificados e GUI Unificada de Criptografia -GenericName[pt_BR]=Gerenciador de certificados e interface gráfica de criptografia unificada -GenericName[ro]=Gestionar de certificate și interfață de criptare unificată -GenericName[ru]=Управление сертификатами -GenericName[sk]=Správca certifikátov a unifikované šifrovacie grafické rozhranie -GenericName[sl]=Upravljalnik potrdil in enoten šifrirni vmesnik -GenericName[sr]=Менаџер сертификата и обједињено сучеље за шифровање -GenericName[sr@ijekavian]=Менаџер сертификата и обједињено сучеље за шифровање -GenericName[sr@ijekavianlatin]=Menadžer sertifikata i objedinjeno sučelje za šifrovanje -GenericName[sr@latin]=Menadžer sertifikata i objedinjeno sučelje za šifrovanje -GenericName[sv]=Certifikathantering och gemensamt grafiskt användargränssnitt för kryptering -GenericName[tr]=Sertifika Yöneticisi ve Birleşik Şifreleme Arayüzü -GenericName[ug]=گۇۋاھنامە باشقۇرغۇ ۋەبىرلىككە كەلگەن شىفىرلاش گرافىكىلىق ئارايۈزى -GenericName[uk]=Засіб для керування сертифікатами і уніфікований графічний інтерфейс шифрування -GenericName[wa]=GUI manaedjeu d' acertineures eyet d' ecriptaedje unifyî -GenericName[x-test]=xxCertificate Manager and Unified Crypto GUIxx -GenericName[zh_CN]=证书管理器和统一的密钥操作界面 -GenericName[zh_TW]=憑證管理與統一加密介面 + Terminal=false X-TDE-StartupNotify=true X-DocPath=kleopatra/index.html diff --git a/certmanager/kleopatra_import.desktop b/certmanager/kleopatra_import.desktop index a4264852..9429b889 100644 --- a/certmanager/kleopatra_import.desktop +++ b/certmanager/kleopatra_import.desktop @@ -1,9 +1,6 @@ [Desktop Entry] Name=Kleopatra -Name[is]=Kleópatra -Name[mk]=Клеопатра -Name[ne]=क्लेओपत्र -Name[ta]=க்ளியோபட்ரா + Type=Application Exec=kleopatra --import-certificate %u Icon=kleopatra diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp index 6b186178..25b7dc06 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp @@ -93,13 +93,13 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name ) mExeED = new KURLRequester( w ); glay->addWidget( new TQLabel( mExeED, i18n("&Executable:"), w ), row, 0 ); glay->addWidget( mExeED, row, 1 ); - connect( mExeED, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()) ); + connect( mExeED, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()) ); ++row; mSocketED = new KURLRequester( w ); glay->addWidget( new TQLabel( mSocketED, i18n("&Socket:"), w ), row, 0 ); glay->addWidget( mSocketED, row, 1 ); - connect( mSocketED, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()) ); + connect( mSocketED, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()) ); ++row; mLogLevelCB = new TQComboBox( false, w ); @@ -110,7 +110,7 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name ) mLogLevelCB->insertItem( i18n("Guru") ); glay->addWidget( new TQLabel( mLogLevelCB, i18n("Default &log level:"), w ), row, 0 ); glay->addWidget( mLogLevelCB, row, 1 ); - connect( mLogLevelCB, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged()) ); + connect( mLogLevelCB, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged()) ); vlay->addWidget( group ); @@ -134,21 +134,21 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name ) TQPushButton * button = new TQPushButton( i18n("Set &Unlimited"), w ); glay->addWidget( button, row, 2 ); - connect( mLoglenSB, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged()) ); - connect( button, TQT_SIGNAL(clicked()), TQT_SLOT(slotSetHistorySizeUnlimited()) ); + connect( mLoglenSB, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged()) ); + connect( button, TQ_SIGNAL(clicked()), TQ_SLOT(slotSetHistorySizeUnlimited()) ); ++row; mWordWrapCB = new TQCheckBox( i18n("Enable &word wrapping"), w ); mWordWrapCB->hide(); // TQTextEdit doesn't support word wrapping in LogText mode glay->addMultiCellWidget( mWordWrapCB, row, row, 0, 2 ); - connect( mWordWrapCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()) ); + connect( mWordWrapCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()) ); vlay->addWidget( group ); vlay->addStretch( 1 ); - connect( this, TQT_SIGNAL(applyClicked()), TQT_SLOT(slotSave()) ); - connect( this, TQT_SIGNAL(okClicked()), TQT_SLOT(slotSave()) ); + connect( this, TQ_SIGNAL(applyClicked()), TQ_SLOT(slotSave()) ); + connect( this, TQ_SIGNAL(okClicked()), TQ_SLOT(slotSave()) ); } void KWatchGnuPGConfig::slotSetHistorySizeUnlimited() { diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.h b/certmanager/kwatchgnupg/kwatchgnupgconfig.h index 3a58a99a..09fc36a2 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgconfig.h +++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.h @@ -41,7 +41,7 @@ class TQSpinBox; class KURLRequester; class KWatchGnuPGConfig : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KWatchGnuPGConfig( TQWidget* parent, const char* name = 0 ); diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp index d02a2fad..ef189a6e 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp @@ -69,16 +69,16 @@ KWatchGnuPGMainWindow::KWatchGnuPGMainWindow( TQWidget* parent, const char* name setCentralWidget( mCentralWidget ); mWatcher = new KProcIO( TQTextCodec::codecForMib( 106 /*utf-8*/ ) ); - connect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ), - this, TQT_SLOT( slotWatcherExited() ) ); - connect( mWatcher, TQT_SIGNAL( readReady(KProcIO*) ), - this, TQT_SLOT( slotReadStdout() ) ); + connect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ), + this, TQ_SLOT( slotWatcherExited() ) ); + connect( mWatcher, TQ_SIGNAL( readReady(KProcIO*) ), + this, TQ_SLOT( slotReadStdout() ) ); slotReadConfig(); mSysTray = new KWatchGnuPGTray( this ); mSysTray->show(); - connect( mSysTray, TQT_SIGNAL( quitSelected() ), - this, TQT_SLOT( slotQuit() ) ); + connect( mSysTray, TQ_SIGNAL( quitSelected() ), + this, TQ_SLOT( slotQuit() ) ); setAutoSaveSettings(); } @@ -90,24 +90,24 @@ KWatchGnuPGMainWindow::~KWatchGnuPGMainWindow() void KWatchGnuPGMainWindow::slotClear() { mCentralWidget->clear(); - mCentralWidget->append( tqtr("[%1] Log cleared").arg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) ); + mCentralWidget->append( i18n("[%1] Log cleared").arg( TQDateTime::currentDateTime().toString(TQt::ISODate) ) ); } void KWatchGnuPGMainWindow::createActions() { (void)new TDEAction( i18n("C&lear History"), "history_clear", CTRL+Key_L, - TQT_TQOBJECT(this), TQT_SLOT( slotClear() ), + this, TQ_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, TQ_SLOT(slotSaveAs()), actionCollection() ); + (void)KStdAction::close( this, TQ_SLOT(close()), actionCollection() ); + (void)KStdAction::quit( this, TQ_SLOT(slotQuit()), actionCollection() ); + (void)KStdAction::preferences( this, TQ_SLOT(slotConfigure()), actionCollection() ); + (void)KStdAction::keyBindings(this, TQ_SLOT(configureShortcuts()), actionCollection()); + (void)KStdAction::configureToolbars(this, TQ_SLOT(slotConfigureToolbars()), actionCollection()); #if 0 (void)new TDEAction( i18n("Configure KWatchGnuPG..."), TQString::fromLatin1("configure"), - 0, this, TQT_SLOT( slotConfigure() ), + 0, this, TQ_SLOT( slotConfigure() ), actionCollection(), "configure" ); #endif @@ -127,15 +127,15 @@ void KWatchGnuPGMainWindow::slotConfigureToolbars() void KWatchGnuPGMainWindow::startWatcher() { - disconnect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ), - this, TQT_SLOT( slotWatcherExited() ) ); + disconnect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ), + this, TQ_SLOT( slotWatcherExited() ) ); if( mWatcher->isRunning() ) { mWatcher->kill(); while( mWatcher->isRunning() ) { kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput); } - mCentralWidget->append(tqtr("[%1] Log stopped") - .arg( TQDateTime::currentDateTime().toString(Qt::ISODate))); + mCentralWidget->append(i18n("[%1] Log stopped") + .arg( TQDateTime::currentDateTime().toString(TQt::ISODate))); } mWatcher->clearArguments(); TDEConfig* config = kapp->config(); @@ -147,11 +147,11 @@ void KWatchGnuPGMainWindow::startWatcher() if( !mWatcher->start() ) { KMessageBox::sorry( this, i18n("The watchgnupg logging process could not be started.\nPlease install watchgnupg somewhere in your $PATH.\nThis log window is now completely useless." ) ); } else { - mCentralWidget->append( tqtr("[%1] Log started") - .arg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) ); + mCentralWidget->append( i18n("[%1] Log started") + .arg( TQDateTime::currentDateTime().toString(TQt::ISODate) ) ); } - connect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ), - this, TQT_SLOT( slotWatcherExited() ) ); + connect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ), + this, TQ_SLOT( slotWatcherExited() ) ); } void KWatchGnuPGMainWindow::setGnuPGConfig() @@ -213,7 +213,7 @@ void KWatchGnuPGMainWindow::slotReadStdout() mSysTray->setAttention(true); } } - TQTimer::singleShot( 0, this, TQT_SLOT(slotAckRead()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotAckRead()) ); } void KWatchGnuPGMainWindow::slotAckRead() { @@ -251,8 +251,8 @@ void KWatchGnuPGMainWindow::slotSaveAs() void KWatchGnuPGMainWindow::slotQuit() { - disconnect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ), - this, TQT_SLOT( slotWatcherExited() ) ); + disconnect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ), + this, TQ_SLOT( slotWatcherExited() ) ); mWatcher->kill(); kapp->quit(); } @@ -261,8 +261,8 @@ void KWatchGnuPGMainWindow::slotConfigure() { if( !mConfig ) { mConfig = new KWatchGnuPGConfig( this, "config dialog" ); - connect( mConfig, TQT_SIGNAL( reconfigure() ), - this, TQT_SLOT( slotReadConfig() ) ); + connect( mConfig, TQ_SIGNAL( reconfigure() ), + this, TQ_SLOT( slotReadConfig() ) ); } mConfig->loadConfig(); mConfig->exec(); diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h index 7df54051..6d08fe05 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h +++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h @@ -41,7 +41,7 @@ class KProcIO; class TQTextEdit; class KWatchGnuPGMainWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: KWatchGnuPGMainWindow( TQWidget* parent = 0, const char* name = 0 ); diff --git a/certmanager/kwatchgnupg/tray.h b/certmanager/kwatchgnupg/tray.h index eb438aa3..f9cc76a1 100644 --- a/certmanager/kwatchgnupg/tray.h +++ b/certmanager/kwatchgnupg/tray.h @@ -39,7 +39,7 @@ class KWatchGnuPGMainWindow; class KWatchGnuPGTray : public KSystemTray { - Q_OBJECT + TQ_OBJECT public: KWatchGnuPGTray( KWatchGnuPGMainWindow* mainwin ); diff --git a/certmanager/lib/CMakeLists.txt b/certmanager/lib/CMakeLists.txt index 74dc46ea..92d80925 100644 --- a/certmanager/lib/CMakeLists.txt +++ b/certmanager/lib/CMakeLists.txt @@ -32,7 +32,12 @@ link_directories( ##### other data ################################ -install( FILES libkleopatrarc.desktop DESTINATION ${CONFIG_INSTALL_DIR} RENAME libkleopatrarc ) +tde_create_translated_desktop( + SOURCE libkleopatrarc.desktop + DESTINATION ${CONFIG_INSTALL_DIR} + OUTPUT_NAME libkleopatrarc + PO_DIR certmanager-desktops +) ##### kleopatra (shared) ######################## diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp index e89070f3..d5083b96 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp @@ -442,7 +442,7 @@ bool Kleo::ChiasmusBackend::checkForSMIME( TQString * reason ) const { bool Kleo::ChiasmusBackend::checkForChiasmus( TQString * reason ) const { // kills the protocol instance when we return false: - std::auto_ptr<Protocol> tmp( mProtocol ); + std::unique_ptr<Protocol> tmp( mProtocol ); mProtocol = 0; const CryptoConfigEntry * path = config()->entry( "Chiasmus", "General", "path" ); diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.h b/certmanager/lib/backends/chiasmus/chiasmusbackend.h index 1619f9ea..17f7572c 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusbackend.h +++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* chiasmusbackend.h This file is part of libkleopatra, the KDE keymanagement library 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/chiasmusjob.h b/certmanager/lib/backends/chiasmus/chiasmusjob.h index 1ca6ba19..d46d530d 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusjob.h +++ b/certmanager/lib/backends/chiasmus/chiasmusjob.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* chiasmusjob.h This file is part of libkleopatra, the KDE keymanagement library @@ -50,7 +50,7 @@ namespace Kleo { @short SpecialJob for Chiasmus operations */ class ChiasmusJob : public Kleo::SpecialJob { - Q_OBJECT + TQ_OBJECT TQ_ENUMS( Mode ) TQ_PROPERTY( Mode mode READ mode ) diff --git a/certmanager/lib/backends/chiasmus/chiasmuslibrary.h b/certmanager/lib/backends/chiasmus/chiasmuslibrary.h index fa1adc73..3a3536af 100644 --- a/certmanager/lib/backends/chiasmus/chiasmuslibrary.h +++ b/certmanager/lib/backends/chiasmus/chiasmuslibrary.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* chiasmuslibrary.h This file is part of libkleopatra, the KDE keymanagement library 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/obtainkeysjob.h b/certmanager/lib/backends/chiasmus/obtainkeysjob.h index da19257b..29557c14 100644 --- a/certmanager/lib/backends/chiasmus/obtainkeysjob.h +++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* obtainkeysjob.h This file is part of libkleopatra, the KDE keymanagement library @@ -63,7 +63,7 @@ namespace Kleo { absolute filenames of the keys found in the configured key files. */ class ObtainKeysJob : public Kleo::SpecialJob { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQStringList result READ result ) public: 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/chiasmus/symcryptrunprocessbase.h b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h index 36866e13..5f0c69a3 100644 --- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h +++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h @@ -42,7 +42,7 @@ class TQString; namespace Kleo { class SymCryptRunProcessBase : public TDEProcess { - Q_OBJECT + TQ_OBJECT public: enum Operation { diff --git a/certmanager/lib/backends/kpgp/gpg1backend.h b/certmanager/lib/backends/kpgp/gpg1backend.h index a1ff723c..96729f33 100644 --- a/certmanager/lib/backends/kpgp/gpg1backend.h +++ b/certmanager/lib/backends/kpgp/gpg1backend.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* gpg1backend.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp b/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp index b5b006b5..dfa88af6 100644 --- a/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp +++ b/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* kpgpbackendbase.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/kpgpbackendbase.h b/certmanager/lib/backends/kpgp/kpgpbackendbase.h index 6fdf29bf..d9dbf579 100644 --- a/certmanager/lib/backends/kpgp/kpgpbackendbase.h +++ b/certmanager/lib/backends/kpgp/kpgpbackendbase.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* kpgpbackendbase.h This file is part of libkleopatra, the KDE keymanagement library 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/kpgp/kpgpkeylistjob.h b/certmanager/lib/backends/kpgp/kpgpkeylistjob.h index d126ea67..3ab04cf3 100644 --- a/certmanager/lib/backends/kpgp/kpgpkeylistjob.h +++ b/certmanager/lib/backends/kpgp/kpgpkeylistjob.h @@ -1,4 +1,4 @@ -/* -*- mode: C++ -*- +/* kpgpkeylistjob.h This file is part of libkleopatra, the KDE keymanagement library @@ -50,7 +50,7 @@ namespace Kpgp { namespace Kleo { class KpgpKeyListJob : public KeyListJob { - Q_OBJECT + TQ_OBJECT public: KpgpKeyListJob( Kpgp::Base * pgpBase ); diff --git a/certmanager/lib/backends/kpgp/kpgpwrapper.cpp b/certmanager/lib/backends/kpgp/kpgpwrapper.cpp index 71c08293..6778f45d 100644 --- a/certmanager/lib/backends/kpgp/kpgpwrapper.cpp +++ b/certmanager/lib/backends/kpgp/kpgpwrapper.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* kpgpwrapper.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/kpgpwrapper.h b/certmanager/lib/backends/kpgp/kpgpwrapper.h index 8dc7dbc2..7776e98c 100644 --- a/certmanager/lib/backends/kpgp/kpgpwrapper.h +++ b/certmanager/lib/backends/kpgp/kpgpwrapper.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* kpgpwrapper.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/pgp2backend.h b/certmanager/lib/backends/kpgp/pgp2backend.h index b486bfd6..622566e1 100644 --- a/certmanager/lib/backends/kpgp/pgp2backend.h +++ b/certmanager/lib/backends/kpgp/pgp2backend.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* pgp2backend.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/pgp5backend.h b/certmanager/lib/backends/kpgp/pgp5backend.h index 2db55932..b02183de 100644 --- a/certmanager/lib/backends/kpgp/pgp5backend.h +++ b/certmanager/lib/backends/kpgp/pgp5backend.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* pgp5backend.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/pgp6backend.h b/certmanager/lib/backends/kpgp/pgp6backend.h index c5f9eeff..46494244 100644 --- a/certmanager/lib/backends/kpgp/pgp6backend.h +++ b/certmanager/lib/backends/kpgp/pgp6backend.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* pgp6backend.h This file is part of libkleopatra, the KDE keymanagement library 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/gnupgprocessbase.h b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h index 528179a2..639c25ed 100644 --- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h +++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h @@ -46,7 +46,7 @@ namespace Kleo { * @author Marc Mutz <mutz@kde.org> */ class GnuPGProcessBase : public TDEProcess { - Q_OBJECT + TQ_OBJECT public: GnuPGProcessBase( TQObject * parent=0, const char * name=0 ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp index c38097ed..ee4128bf 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* qgpgmebackend.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.h b/certmanager/lib/backends/qgpgme/qgpgmebackend.h index a23c08d4..9d6aca81 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmebackend.h +++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* qgpgmebackend.h This file is part of libkleopatra, the KDE keymanagement library 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/qgpgmecryptoconfig.h b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h index 712ce24e..710fa168 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h +++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h @@ -48,7 +48,7 @@ class QGpgMECryptoConfigEntry; */ class QGpgMECryptoConfig : public TQObject, public Kleo::CryptoConfig { - Q_OBJECT + TQ_OBJECT public: /** @@ -80,7 +80,7 @@ class QGpgMECryptoConfigGroup; /// For docu, see kleo/cryptoconfig.h class QGpgMECryptoConfigComponent : public TQObject, public Kleo::CryptoConfigComponent { - Q_OBJECT + TQ_OBJECT public: QGpgMECryptoConfigComponent( QGpgMECryptoConfig*, const TQString& name, const TQString& description ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h index e58ea326..ea3454fe 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h @@ -47,7 +47,7 @@ namespace GpgME { namespace Kleo { class QGpgMEDecryptJob : public DecryptJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEDecryptJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h index 79ff268b..67cdf357 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h @@ -38,7 +38,7 @@ #include "qgpgmejob.h" #include <tqcstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { class Error; @@ -48,7 +48,7 @@ namespace GpgME { namespace Kleo { class KDE_EXPORT QGpgMEDecryptVerifyJob : public DecryptVerifyJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEDecryptVerifyJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h b/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h index 20dca974..c867b855 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h @@ -46,7 +46,7 @@ namespace GpgME { namespace Kleo { class QGpgMEDeleteJob : public DeleteJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEDeleteJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h b/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h index 5317afd4..1facc509 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h @@ -45,7 +45,7 @@ namespace GpgME { namespace Kleo { class QGpgMEDownloadJob : public DownloadJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEDownloadJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h index 80b5e467..13b7546c 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h @@ -50,7 +50,7 @@ namespace GpgME { namespace Kleo { class QGpgMEEncryptJob : public EncryptJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEEncryptJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h index aa2e0c0a..7e427d6c 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h @@ -47,7 +47,7 @@ namespace GpgME { namespace Kleo { class QGpgMEExportJob : public ExportJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEExportJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h b/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h index 2324da6d..0a5ab681 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h @@ -47,7 +47,7 @@ namespace GpgME { namespace Kleo { class QGpgMEImportJob : public ImportJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEImportJob( GpgME::Context * context ); 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/qgpgmejob.h b/certmanager/lib/backends/qgpgme/qgpgmejob.h index 844ca974..64ce36bc 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmejob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmejob.h @@ -43,7 +43,7 @@ #include <tqstring.h> #include <vector> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { class Data; diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h index c9e16474..6b3e6716 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h @@ -36,7 +36,7 @@ #include <kleo/keygenerationjob.h> #include "qgpgmejob.h" -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { class Error; @@ -52,7 +52,7 @@ namespace QGpgME { namespace Kleo { class KDE_EXPORT QGpgMEKeyGenerationJob : public KeyGenerationJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEKeyGenerationJob( GpgME::Context * context ); 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/qgpgmekeylistjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h index 8e26d791..a62a7379 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h @@ -48,7 +48,7 @@ namespace GpgME { namespace Kleo { class QGpgMEKeyListJob : public KeyListJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEKeyListJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp index bc0d232e..54d13358 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* qgpgmeprogresstokenmapper.cpp This file is part of libkleopatra, the KDE keymanagement library 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/qgpgmerefreshkeysjob.h b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h index ac160036..78c26ef3 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h @@ -50,7 +50,7 @@ class TDEProcess; namespace Kleo { class QGpgMERefreshKeysJob : public RefreshKeysJob { - Q_OBJECT + TQ_OBJECT public: QGpgMERefreshKeysJob(); 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/backends/qgpgme/qgpgmesecretkeyexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h index 335fd770..1dad417c 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h @@ -55,7 +55,7 @@ class TDEProcess; namespace Kleo { class QGpgMESecretKeyExportJob : public ExportJob { - Q_OBJECT + TQ_OBJECT public: QGpgMESecretKeyExportJob( bool armour, const TQString& charset ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h index 24672d83..f259d754 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h @@ -44,7 +44,7 @@ #include <utility> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { class Error; class Context; @@ -54,7 +54,7 @@ namespace GpgME { namespace Kleo { class KDE_EXPORT QGpgMESignEncryptJob : public SignEncryptJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMESignEncryptJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignjob.h index 2b51eada..388b2756 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesignjob.h @@ -50,7 +50,7 @@ namespace GpgME { namespace Kleo { class QGpgMESignJob : public SignJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMESignJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h b/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h index a62699d3..5e9728d3 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h @@ -47,7 +47,7 @@ namespace GpgME { namespace Kleo { class QGpgMEVerifyDetachedJob : public VerifyDetachedJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEVerifyDetachedJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h b/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h index 87a19619..ea596e13 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h @@ -47,7 +47,7 @@ namespace GpgME { namespace Kleo { class QGpgMEVerifyOpaqueJob : public VerifyOpaqueJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEVerifyOpaqueJob( GpgME::Context * context ); diff --git a/certmanager/lib/cryptplug.cpp b/certmanager/lib/cryptplug.cpp index 77a91451..24ded795 100644 --- a/certmanager/lib/cryptplug.cpp +++ b/certmanager/lib/cryptplug.cpp @@ -1,5 +1,4 @@ -/* -*- Mode: C++ -*- - +/* this is a C++-ification of: GPGMEPLUG - an GPGME based cryptography plug-in following the common CRYPTPLUG specification. @@ -697,8 +696,8 @@ GpgME::ImportResult CryptPlug::importCertificateFromMem( const char* data, size_ { using namespace GpgME; - std::auto_ptr<Context> context( Context::createForProtocol( mProtocol ) ); - if ( !context.get() ) + std::unique_ptr<Context> context( Context::createForProtocol( mProtocol ) ); + if ( !context ) return ImportResult(); Data keydata( data, length, false ); diff --git a/certmanager/lib/cryptplug.h b/certmanager/lib/cryptplug.h index d633e639..fce71937 100644 --- a/certmanager/lib/cryptplug.h +++ b/certmanager/lib/cryptplug.h @@ -1,5 +1,4 @@ -/* -*- Mode: C++ -*- - +/* this is a C++-ification of: CRYPTPLUG - an independent cryptography plug-in API @@ -26,7 +25,7 @@ #include <gpgmepp/context.h> #include <gpgme.h> // need it for gpgme_protocol_t :( -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { class ImportResult; diff --git a/certmanager/lib/cryptplugfactory.h b/certmanager/lib/cryptplugfactory.h index 3eb5f7e6..4a0a7a3d 100644 --- a/certmanager/lib/cryptplugfactory.h +++ b/certmanager/lib/cryptplugfactory.h @@ -35,7 +35,7 @@ #include "kleo/cryptobackendfactory.h" -#include <tdepimmacros.h> +#include <kdemacros.h> #ifndef LIBKLEOPATRA_NO_COMPAT namespace Kleo { @@ -48,7 +48,7 @@ class CryptPlugWrapperList; namespace KMail { class KDE_EXPORT CryptPlugFactory : public Kleo::CryptoBackendFactory { - Q_OBJECT + TQ_OBJECT protected: CryptPlugFactory(); diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h index a8ea1112..2be5cd56 100644 --- a/certmanager/lib/cryptplugwrapper.h +++ b/certmanager/lib/cryptplugwrapper.h @@ -54,7 +54,7 @@ #include <tqpair.h> #include <tqstringlist.h> #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TDEConfigBase; diff --git a/certmanager/lib/cryptplugwrapperlist.cpp b/certmanager/lib/cryptplugwrapperlist.cpp index 43f88670..94d8a48c 100644 --- a/certmanager/lib/cryptplugwrapperlist.cpp +++ b/certmanager/lib/cryptplugwrapperlist.cpp @@ -1,5 +1,4 @@ -/* -*- c++ -*- - +/* CRYPTPLUG - an independent cryptography plug-in API. CryptPlugWrapperList holds any number of crypto plug-ins. diff --git a/certmanager/lib/cryptplugwrapperlist.h b/certmanager/lib/cryptplugwrapperlist.h index 30d4fcd9..01691338 100644 --- a/certmanager/lib/cryptplugwrapperlist.h +++ b/certmanager/lib/cryptplugwrapperlist.h @@ -1,5 +1,4 @@ -/* -*- Mode: C++ -*- - +/* CRYPTPLUG - an independent cryptography plug-in API. CryptPlugWrapperList holds any number of crypto plug-ins. diff --git a/certmanager/lib/kleo/cryptobackendfactory.h b/certmanager/lib/kleo/cryptobackendfactory.h index 09012da3..03dea6b2 100644 --- a/certmanager/lib/kleo/cryptobackendfactory.h +++ b/certmanager/lib/kleo/cryptobackendfactory.h @@ -36,7 +36,7 @@ #include <tqobject.h> #include "cryptobackend.h" -#include <tdepimmacros.h> +#include <kdemacros.h> #include <vector> #include <map> @@ -57,7 +57,7 @@ namespace Kleo { }; class KDE_EXPORT CryptoBackendFactory : public TQObject { - Q_OBJECT + TQ_OBJECT protected: CryptoBackendFactory(); diff --git a/certmanager/lib/kleo/decryptjob.h b/certmanager/lib/kleo/decryptjob.h index bce60b81..98ff47c8 100644 --- a/certmanager/lib/kleo/decryptjob.h +++ b/certmanager/lib/kleo/decryptjob.h @@ -60,7 +60,7 @@ namespace Kleo { destruction by calling TQObject::deleteLater(). */ class DecryptJob : public Job { - Q_OBJECT + TQ_OBJECT protected: DecryptJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/kleo/decryptverifyjob.h b/certmanager/lib/kleo/decryptverifyjob.h index 94b016a0..f804590e 100644 --- a/certmanager/lib/kleo/decryptverifyjob.h +++ b/certmanager/lib/kleo/decryptverifyjob.h @@ -63,7 +63,7 @@ namespace Kleo { destruction by calling TQObject::deleteLater(). */ class DecryptVerifyJob : public Job { - Q_OBJECT + TQ_OBJECT protected: DecryptVerifyJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/kleo/deletejob.h b/certmanager/lib/kleo/deletejob.h index 15bd5a51..46c361c3 100644 --- a/certmanager/lib/kleo/deletejob.h +++ b/certmanager/lib/kleo/deletejob.h @@ -56,7 +56,7 @@ namespace Kleo { destruction by calling TQObject::deleteLater(). */ class DeleteJob : public Job { - Q_OBJECT + TQ_OBJECT protected: DeleteJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/kleo/dn.h b/certmanager/lib/kleo/dn.h index c9bdbffd..c194d58e 100644 --- a/certmanager/lib/kleo/dn.h +++ b/certmanager/lib/kleo/dn.h @@ -35,7 +35,7 @@ #include <tqstring.h> #include <tqvaluevector.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQStringList; class TQWidget; diff --git a/certmanager/lib/kleo/downloadjob.h b/certmanager/lib/kleo/downloadjob.h index e1f52cd7..ee2546b4 100644 --- a/certmanager/lib/kleo/downloadjob.h +++ b/certmanager/lib/kleo/downloadjob.h @@ -59,7 +59,7 @@ namespace Kleo { destruction by calling TQObject::deleteLater(). */ class DownloadJob : public Job { - Q_OBJECT + TQ_OBJECT protected: DownloadJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/kleo/encryptjob.h b/certmanager/lib/kleo/encryptjob.h index f55ab76d..8fa20d23 100644 --- a/certmanager/lib/kleo/encryptjob.h +++ b/certmanager/lib/kleo/encryptjob.h @@ -62,7 +62,7 @@ namespace Kleo { destruction by calling TQObject::deleteLater(). */ class EncryptJob : public Job { - Q_OBJECT + TQ_OBJECT protected: EncryptJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/kleo/enum.h b/certmanager/lib/kleo/enum.h index 07e93c49..723f65ae 100644 --- a/certmanager/lib/kleo/enum.h +++ b/certmanager/lib/kleo/enum.h @@ -33,7 +33,7 @@ #ifndef __KLEO_ENUM_H__ #define __KLEO_ENUM_H__ -#include <tdepimmacros.h> +#include <kdemacros.h> class TQString; class TQStringList; diff --git a/certmanager/lib/kleo/exportjob.h b/certmanager/lib/kleo/exportjob.h index 69ad8e5c..4d9259f8 100644 --- a/certmanager/lib/kleo/exportjob.h +++ b/certmanager/lib/kleo/exportjob.h @@ -59,7 +59,7 @@ namespace Kleo { destruction by calling TQObject::deleteLater(). */ class ExportJob : public Job { - Q_OBJECT + TQ_OBJECT protected: ExportJob( TQObject * parent, const char * name ); 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/hierarchicalkeylistjob.h b/certmanager/lib/kleo/hierarchicalkeylistjob.h index 0b74d2f9..cb971bd0 100644 --- a/certmanager/lib/kleo/hierarchicalkeylistjob.h +++ b/certmanager/lib/kleo/hierarchicalkeylistjob.h @@ -35,7 +35,7 @@ #include <kleo/keylistjob.h> #include <kleo/cryptobackend.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <gpgmepp/keylistresult.h> @@ -69,7 +69,7 @@ namespace Kleo { schedule its own destruction by calling TQObject::deleteLater(). */ class KDE_EXPORT HierarchicalKeyListJob : public KeyListJob { - Q_OBJECT + TQ_OBJECT public: HierarchicalKeyListJob( const CryptoBackend::Protocol * protocol, diff --git a/certmanager/lib/kleo/importjob.h b/certmanager/lib/kleo/importjob.h index bd0a6f04..6468e670 100644 --- a/certmanager/lib/kleo/importjob.h +++ b/certmanager/lib/kleo/importjob.h @@ -60,7 +60,7 @@ namespace Kleo { destruction by calling TQObject::deleteLater(). */ class ImportJob : public Job { - Q_OBJECT + TQ_OBJECT protected: ImportJob( TQObject * parent, const char * name ); 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/job.h b/certmanager/lib/kleo/job.h index 00087566..52630c30 100644 --- a/certmanager/lib/kleo/job.h +++ b/certmanager/lib/kleo/job.h @@ -62,7 +62,7 @@ namespace Kleo { carry the information that the operation was canceled. */ class Job : public TQObject { - Q_OBJECT + TQ_OBJECT protected: Job( TQObject * parent, const char * name ); 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/keyfiltermanager.h b/certmanager/lib/kleo/keyfiltermanager.h index a573934d..d0022fc0 100644 --- a/certmanager/lib/kleo/keyfiltermanager.h +++ b/certmanager/lib/kleo/keyfiltermanager.h @@ -34,7 +34,7 @@ #define __KLEO_KEYFILTERMANAGER_H__ #include <tqobject.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { class Key; } @@ -46,7 +46,7 @@ namespace Kleo { namespace Kleo { class KDE_EXPORT KeyFilterManager : public TQObject { - Q_OBJECT + TQ_OBJECT protected: KeyFilterManager( TQObject * parent=0, const char * name=0 ); diff --git a/certmanager/lib/kleo/keygenerationjob.h b/certmanager/lib/kleo/keygenerationjob.h index b0d94993..d2f5c50d 100644 --- a/certmanager/lib/kleo/keygenerationjob.h +++ b/certmanager/lib/kleo/keygenerationjob.h @@ -59,7 +59,7 @@ namespace Kleo { destruction by calling TQObject::deleteLater(). */ class KeyGenerationJob : public Job { - Q_OBJECT + TQ_OBJECT protected: KeyGenerationJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/kleo/keylistjob.h b/certmanager/lib/kleo/keylistjob.h index 3560f7b8..807c7954 100644 --- a/certmanager/lib/kleo/keylistjob.h +++ b/certmanager/lib/kleo/keylistjob.h @@ -63,7 +63,7 @@ namespace Kleo { TQObject::deleteLater(). */ class KeyListJob : public Job { - Q_OBJECT + TQ_OBJECT protected: KeyListJob( TQObject * parent, const char * name ); 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/kleo/multideletejob.h b/certmanager/lib/kleo/multideletejob.h index d927c927..67ec7492 100644 --- a/certmanager/lib/kleo/multideletejob.h +++ b/certmanager/lib/kleo/multideletejob.h @@ -36,7 +36,7 @@ #include <kleo/job.h> #include <kleo/cryptobackend.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqguardedptr.h> #include <vector> @@ -65,7 +65,7 @@ namespace Kleo { destruction by calling TQObject::deleteLater(). */ class KDE_EXPORT MultiDeleteJob : public Job { - Q_OBJECT + TQ_OBJECT public: MultiDeleteJob( const CryptoBackend::Protocol * protocol ); diff --git a/certmanager/lib/kleo/refreshkeysjob.h b/certmanager/lib/kleo/refreshkeysjob.h index 7a55f106..aa283fd4 100644 --- a/certmanager/lib/kleo/refreshkeysjob.h +++ b/certmanager/lib/kleo/refreshkeysjob.h @@ -60,7 +60,7 @@ namespace Kleo { destruction by calling TQObject::deleteLater(). */ 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 0f31897e..160eb32e 100644 --- a/certmanager/lib/kleo/signencryptjob.h +++ b/certmanager/lib/kleo/signencryptjob.h @@ -65,7 +65,7 @@ namespace Kleo { own destruction by calling TQObject::deleteLater(). */ class SignEncryptJob : public Job { - Q_OBJECT + TQ_OBJECT protected: SignEncryptJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/kleo/signjob.h b/certmanager/lib/kleo/signjob.h index fdeb9a84..54c64a7f 100644 --- a/certmanager/lib/kleo/signjob.h +++ b/certmanager/lib/kleo/signjob.h @@ -63,7 +63,7 @@ namespace Kleo { destruction by calling TQObject::deleteLater(). */ class SignJob : public Job { - Q_OBJECT + TQ_OBJECT protected: SignJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/kleo/specialjob.h b/certmanager/lib/kleo/specialjob.h index c5bc1896..8656b8ac 100644 --- a/certmanager/lib/kleo/specialjob.h +++ b/certmanager/lib/kleo/specialjob.h @@ -63,7 +63,7 @@ namespace Kleo { to be defined in each SpecialJob subclass. */ 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 01cc6377..25f00756 100644 --- a/certmanager/lib/kleo/verifydetachedjob.h +++ b/certmanager/lib/kleo/verifydetachedjob.h @@ -60,7 +60,7 @@ namespace Kleo { it's own destruction by calling TQObject::deleteLater(). */ class VerifyDetachedJob : public Job { - Q_OBJECT + TQ_OBJECT protected: VerifyDetachedJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/kleo/verifyopaquejob.h b/certmanager/lib/kleo/verifyopaquejob.h index 387782df..8e0bdd31 100644 --- a/certmanager/lib/kleo/verifyopaquejob.h +++ b/certmanager/lib/kleo/verifyopaquejob.h @@ -60,7 +60,7 @@ namespace Kleo { it's own destruction by calling TQObject::deleteLater(). */ class VerifyOpaqueJob : public Job { - Q_OBJECT + TQ_OBJECT protected: VerifyOpaqueJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/libkleopatrarc.desktop b/certmanager/lib/libkleopatrarc.desktop index 07af3adc..f502ca88 100644 --- a/certmanager/lib/libkleopatrarc.desktop +++ b/certmanager/lib/libkleopatrarc.desktop @@ -1,52 +1,6 @@ [Key Filter #0] was-validated=false Name=Not Validated Key -Name[af]=Sleutel nie bevestig nie -Name[bg]=Непроверен ключ -Name[ca]=Clau no validada -Name[cs]=Nevalidovaný klíč -Name[da]=Ikke godkendt nøgle -Name[de]=Ungeprüfter Schlüssel -Name[el]=Μη επικυρωμένο κλειδί -Name[eo]=Ŝlosilo Ne Validigita -Name[es]=Clave no validada -Name[et]=Võtme ehtsus kontrollimatu -Name[eu]=Balidatu gabeko gakoa -Name[fa]=کلید بدون اعتبار -Name[fi]=Varmistamaton avain -Name[fr]=Clé non validée -Name[fy]=Net falidearre kaai -Name[gl]=Non hai Chave Validada -Name[he]=מפתח לא מוודא -Name[hu]=Nem ellenőrzött kulcs -Name[is]=Ekki staðfestur lykill -Name[it]=Chiave non convalidata -Name[ja]=認証されていない鍵 -Name[kk]=Тексерілмеген кілт -Name[km]=កូនសោគ្មានសុពលភាព -Name[ko]=검증되지 않은 키 -Name[lt]=Nevaliduotas raktas -Name[ms]=Kekunci Tidak Disahkan -Name[nb]=Nøkkel ikke sjekket for gyldighet -Name[nds]=Nich pröövt Slötel -Name[ne]=प्रमाणीत नगरिएको कुञ्जी -Name[nl]=Geen gevalideerde sleutel -Name[nn]=Ikkje-validert nøkkel -Name[pl]=Niesprawdzony klucz -Name[pt]=Chave Não Validada -Name[pt_BR]=Chave Não Validada -Name[ru]=Непроверенный ключ -Name[se]=Ii-validerejuvvon čoavdda -Name[sk]=Neoverený kľúč -Name[sl]=Nepreverjen ključ -Name[sr]=Неоверени кључ -Name[sr@Latn]=Neovereni ključ -Name[sv]=Nyckeln har inte validerats -Name[ta]=செல்லுபடியாகாத விசை -Name[tr]=Geçerli Olmayan Anahtar -Name[uk]=Неперевірений ключ -Name[zh_CN]=未校验的密钥 -Name[zh_TW]=未確認的金鑰 [Key Filter #1] was-validated=true @@ -54,263 +8,24 @@ is-expired=true is-revoked=false foreground-color=255,0,0 Name=Expired Key -Name[af]=Sleutel het verval -Name[bg]=Изтекъл ключ -Name[br]=Alc'hwez kabac'het -Name[ca]=Clau expirada -Name[cs]=Klíš s prošlou platností -Name[da]=Udløbet nøgle -Name[de]=Abgelaufener Schlüssel -Name[el]=Ληγμένο κλειδί -Name[eo]=Ŝlosilo Eksvalidiĝinta -Name[es]=Clave caducada -Name[et]=Aegunud võti -Name[eu]=Iraungitako gakoa -Name[fa]=کلید منقضی -Name[fi]=Vanhentunut avain -Name[fr]=Clé expirée -Name[fy]=Ferrûne kaai -Name[gl]=Chave caducada -Name[he]=מפתח לא תקף -Name[hu]=Lejárt kulcs -Name[is]=Útrunninn lykill -Name[it]=Chiave scaduta -Name[ja]=期限切れの鍵 -Name[kk]=Ескірген кілт -Name[km]=កូនសោបានផុតកំណត់ -Name[ko]=만료된 키 -Name[lt]=Baigęs galioti raktas -Name[mk]=Истечен клуч -Name[ms]=Kekunci Luput -Name[nb]=Utgått nøkkel -Name[nds]=Aflopen Slötel -Name[ne]=म्याद समाप्त भएको कुञ्जी -Name[nl]=Verlopen sleutel -Name[nn]=Forelda nøkkel -Name[pl]=Klucz, który stracił ważność -Name[pt]=Chave Expirada -Name[pt_BR]=Chave Expirada -Name[ru]=Утерявший силу ключ -Name[se]=Boarásmuvvan čoavdda -Name[sk]=Vypršaný kľúč -Name[sl]=Pretečen ključ -Name[sr]=Истекли кључ -Name[sr@Latn]=Istekli ključ -Name[sv]=Utgången nyckel -Name[ta]=காலாவதியான விசை -Name[tr]=Süresi Dolmuş Anahtar -Name[uk]=Застарілий ключ -Name[zh_CN]=过期密钥 -Name[zh_TW]=已過期的金鑰 [Key Filter #2] was-validated=true is-revoked=true Name=Revoked Key -Name[af]=Sleutel was herroep -Name[bg]=Анулиран ключ -Name[ca]=Clau revocada -Name[cs]=Odvolaný klíč -Name[da]=Fjernet nøgle -Name[de]=Widerrufener Schlüssel -Name[el]=Ακυρωμένο κλειδί -Name[eo]=Ŝlosilo Revokita -Name[es]=Clave revocada -Name[et]=Tühistatud võti -Name[eu]=Errebokatutako gakoa -Name[fa]=کلید لغوشده -Name[fi]=Peruutettu avain -Name[fr]=Clé révoquée -Name[fy]=Ynlutsen kaai -Name[gl]=Chave revocada -Name[he]=מפתח לא קביל -Name[hu]=Visszavont kulcs -Name[is]=Afturkallaður lykill -Name[it]=Chiave revocata -Name[ja]=破棄された鍵 -Name[kk]=Күші жойылған кілт -Name[km]=កូនសោត្រូវបានដកហូត -Name[ko]=거부된 키 -Name[lt]=Atšauktas raktas -Name[mk]=Отповикан клуч -Name[ms]=Kekunci Dibatalkan -Name[nb]=Tilbakekalt nøkkel -Name[nds]=Torüchropen Slötel -Name[ne]=रद्द गरिएको कुञ्जी -Name[nl]=Ingetrokken sleutel -Name[nn]=Tilbakekalla nøkkel -Name[pl]=Odwołany klucz -Name[pt]=Chave Revogada -Name[pt_BR]=Chave Revogada -Name[ru]=Отозванный ключ -Name[sk]=Kľúč so zrušenou platnosťou -Name[sl]=Preklican ključ -Name[sr]=Опозвани кључ -Name[sr@Latn]=Opozvani ključ -Name[sv]=Återkallad nyckel -Name[ta]=நீக்கிய விசை -Name[tr]=Geri Alınmış Anahtar -Name[uk]=Анульований ключ -Name[zh_CN]=吊销的密钥 -Name[zh_TW]=已廢棄的金鑰 [Key Filter #3] was-validated=true is-root-certificate=true is-validity=ultimate Name=Trusted Root Certificate -Name[af]=Vertroude 'Root' sertifikaat -Name[ar]=شهادة جذر موثوق بها -Name[bg]=Надеждно удостоверение -Name[ca]=Certificat arrel de confiança -Name[cs]=Důvěryhodný kořenový certifikát -Name[da]=Root-certifikat der stoles på -Name[de]=Vertrauenswürdiges Stammzertifikat -Name[el]=Έμπιστο βασικό πιστοποιητικό -Name[eo]=Fidinda Radika Certifikato -Name[es]=Certificado raíz de confianza -Name[et]=Usaldusväärne juursertifikaat -Name[eu]=Konfidantzazko erro ziurtagiria -Name[fa]=گواهینامۀ معتبر کاربر ارشد -Name[fi]=Luotettu juurivarmenne -Name[fr]=Certificat racine de confiance -Name[fy]=Fertroude haadsertifikaat -Name[gl]=Certificado raiz autentificado -Name[hu]=Megbízható gyökértanúsítvány -Name[is]=Treyst rótarskilríki -Name[it]=Certificato radice affidabile -Name[ja]=信頼されたルート証明書 -Name[kk]=Сенім артылған түбір куәлігі -Name[km]=វិញ្ញាបនបត្រ Root ដែលអាចជឿទុកចិត្ត -Name[lt]=Patikimas root sertifikatas -Name[mk]=Доверлив коренов сертификат -Name[ms]=Sijil Root Dipercaya -Name[nb]=Tiltrodd rot-sertifikat -Name[nds]=Vertroonswöördig Wörtelzertifikaat -Name[ne]=विश्वास गरिएका मूल प्रमाणपत्र -Name[nl]=Vertrouwd hoofdcertificaat -Name[nn]=Tiltrudd rotsertifikat -Name[pl]=Zaufany certyfikat bazowy -Name[pt]=Certificado Raiz de Confiança -Name[pt_BR]=Certificado Raiz Confiável -Name[ru]=Доверяемый корневой сертификат -Name[se]=Luohttehahtti ruohtassertifikáhta -Name[sk]=Dôveryhodný koreňový certifikát -Name[sl]=Zaupan korenski certifikat -Name[sr]=Корени сертификат од поверења -Name[sr@Latn]=Koreni sertifikat od poverenja -Name[sv]=Pålitligt rotcertifikat -Name[ta]=நம்பகமான மூல சான்றிதழ் -Name[tr]=Güvenilir Kök Sertifikası -Name[uk]=Кореневий сертифікат з довірою -Name[zh_CN]=可信任的根证书 -Name[zh_TW]=可信任的根憑證 [Key Filter #4] was-validated=true is-root-certificate=true is-not-validity=ultimate Name=Not Trusted Root Certificate -Name[af]=Nie vertroude 'root' sertifikaat -Name[ar]=شهادة جذر غير موثوق بها -Name[bg]=Ненадеждно удостоверение -Name[ca]=Certificat arrel sense confiança -Name[cs]=Nedůvěryhodný kořenový certifikát -Name[da]=Root-certifikat der ikke stoles på -Name[de]=Nicht vertrauenswürdiges Stammzertifikat -Name[el]=Μη έμπιστο βασικό πιστοποιητικό -Name[eo]=Ne Fidinda Radika Certifikato -Name[es]=Certificado raíz no de confianza -Name[et]=Ebausaldusväärne juursertifikaat -Name[eu]=Konfidantza gabeko erro ziurtagiria -Name[fa]=گواهینامۀ بدون اعتبار کاربر ارشد -Name[fi]=Ei-luotettu juurivarmenne -Name[fr]=Certificat racine non fiable -Name[fy]=Net fertroude haadsertifikaat -Name[gl]=Certificado raiz non autentificado -Name[hu]=Nem megbízható gyökértanúsítvány -Name[is]=Ekki traust rótarskilríki -Name[it]=Certificato radice non affidabile -Name[ja]=信頼されてないルート証明書 -Name[kk]=Сенім артылмаған түбір куәлігі -Name[km]=វិញ្ញាបនបត្រ Root ដែលមិនអាចជឿទុកចិត្ត -Name[lt]=Nepatikimas root sertifikatas -Name[mk]=Недоверлив коренов сертификат -Name[ms]=Sijil Root Tak Dipercaya -Name[nb]=Ikke tiltrodd rot-sertifikat -Name[nds]=Nich vertroonswöördig Wörtelzertifikaat -Name[ne]=विश्वास नगरिएका मूल प्रमाणपत्र -Name[nl]=Niet vertrouwd hoofdcertificaat -Name[nn]=Ikkje tiltrudd rotsertifikat -Name[pl]=Nie zaufany certyfikat bazowy -Name[pt]=Certificado Raiz Não de Confiança -Name[pt_BR]=Certificado Raiz Não-Confiável -Name[ru]=Не доверяемый корневой сертификат -Name[se]=Ii luohttehahtti ruohtassertifikáhta -Name[sk]=Nedôveryhodný koreňový certifikát -Name[sl]=Nezaupan korenski certifikat -Name[sr]=Корени сертификат који није од поверења -Name[sr@Latn]=Koreni sertifikat koji nije od poverenja -Name[sv]=Opålitligt rotcertifikat -Name[ta]=நம்பமுடியாத மூல சான்றிதழ் -Name[tr]=Güvenilmeyen Kök Sertifikası -Name[uk]=Кореневий сертифікат без довіри -Name[zh_CN]=未信任的根证书 -Name[zh_TW]=不可信任的根憑證 [Key Filter #5] was-validated=true Name=Other Keys -Name[af]=Ander Sleutels -Name[ar]=مفاتيح آخرى -Name[bg]=Други ключове -Name[br]=Alc'hwezioù all -Name[ca]=Altres claus -Name[cs]=Ostatní klíče -Name[da]=Andre nøgler -Name[de]=Andere Schlüssel -Name[el]=Άλλα κλειδιά -Name[eo]=Aliaj Ŝlosiloj -Name[es]=Otras claves -Name[et]=Muud võtmed -Name[eu]=Beste gakoak -Name[fa]=کلیدهای دیگر -Name[fi]=Muut avaimet -Name[fr]=Autres clés -Name[fy]=Oare kaaien -Name[ga]=Eochracha Eile -Name[gl]=Outras chaves -Name[he]=מפתחות אחרים -Name[hu]=Egyéb kulcsok -Name[is]=Aðrir lyklar -Name[it]=Altre chiavi -Name[ja]=他の鍵 -Name[kk]=Басқа кілттер -Name[km]=កូនសោផ្សេងទៀត -Name[ko]=기타 키 -Name[lt]=Kiti raktai -Name[mk]=Други клучеви -Name[ms]=Kekunci Lain -Name[nb]=Andre nøkler -Name[nds]=Anner Slötels -Name[ne]=अन्य कुञ्जी -Name[nl]=Andere sleutels -Name[nn]=Andre nøklar -Name[pa]=ਹੋਰ ਕੁੰਜੀਆਂ -Name[pl]=Inne klucze -Name[pt]=Outras Chaves -Name[pt_BR]=Outras Chaves -Name[ru]=Другие ключи -Name[se]=Eará čoavdagat -Name[sk]=Iné kľúče -Name[sl]=Drugi ključi -Name[sr]=Други кључеви -Name[sr@Latn]=Drugi ključevi -Name[sv]=Andra nycklar -Name[ta]=மற்ற விசைகள் -Name[tr]=Diğer Anahtarlar -Name[uk]=Інші ключі -Name[uz]=Бошқа калитлар -Name[zh_CN]=其它密钥 -Name[zh_TW]=其他金鑰 - diff --git a/certmanager/lib/tests/gnupgviewer.h b/certmanager/lib/tests/gnupgviewer.h index 9a310d49..f9a0e962 100644 --- a/certmanager/lib/tests/gnupgviewer.h +++ b/certmanager/lib/tests/gnupgviewer.h @@ -43,7 +43,7 @@ class TDEProcess; class TQStringList; class GnuPGViewer : public TQTextEdit { - Q_OBJECT + TQ_OBJECT public: GnuPGViewer( TQWidget * parent=0, const char * name=0 ); diff --git a/certmanager/lib/tests/test.data b/certmanager/lib/tests/test.data index a4109fbd..5a63ff09 100644 --- a/certmanager/lib/tests/test.data +++ b/certmanager/lib/tests/test.data @@ -1,4 +1,4 @@ -/* -*- mode: c++; c-basic-offset:4 -*- +/* tests/test_uiserver.cpp This file is part of Kleopatra, the KDE keymanager 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_jobs.cpp b/certmanager/lib/tests/test_jobs.cpp index ba26bfb5..661e07da 100644 --- a/certmanager/lib/tests/test_jobs.cpp +++ b/certmanager/lib/tests/test_jobs.cpp @@ -61,8 +61,8 @@ static void testSign() std::vector<GpgME::Key> signingKeys; - std::auto_ptr<Kleo::KeyListJob> listJob( proto->keyListJob( false, false, true ) ); // use validating keylisting - if ( listJob.get() ) { + std::unique_ptr<Kleo::KeyListJob> listJob( proto->keyListJob( false, false, true ) ); // use validating keylisting + if ( listJob ) { // ##### Adjust this to your own identity listJob->exec( "faure@kde.org", true /*secret*/, signingKeys ); assert( !signingKeys.empty() ); 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_keygen.h b/certmanager/lib/tests/test_keygen.h index 4bf2acaa..952b4d53 100644 --- a/certmanager/lib/tests/test_keygen.h +++ b/certmanager/lib/tests/test_keygen.h @@ -44,7 +44,7 @@ namespace GpgME { class TQLineEdit; class KeyGenerator : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KeyGenerator( TQWidget * parent=0, const char * name=0, WFlags f=0 ); 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/tests/test_keylister.h b/certmanager/lib/tests/test_keylister.h index 58eeac4a..1d6b1611 100644 --- a/certmanager/lib/tests/test_keylister.h +++ b/certmanager/lib/tests/test_keylister.h @@ -40,7 +40,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.cpp b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp index 1c548c5b..c969e875 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 ) ); } /* diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.h b/certmanager/lib/ui/adddirectoryservicedialogimpl.h index f8924dac..c422c3a4 100644 --- a/certmanager/lib/ui/adddirectoryservicedialogimpl.h +++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.h @@ -36,7 +36,7 @@ class AddDirectoryServiceDialogImpl : public AddDirectoryServiceDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp index a97b0020..82db7d7a 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* backendconfigwidget.cpp This file is part of libkleopatra, the KDE keymanagement library @@ -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/backendconfigwidget.h b/certmanager/lib/ui/backendconfigwidget.h index f0131547..041177a2 100644 --- a/certmanager/lib/ui/backendconfigwidget.h +++ b/certmanager/lib/ui/backendconfigwidget.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* backendconfigwidget.h This file is part of libkleopatra, the KDE keymanagement library @@ -35,7 +35,7 @@ #define __KLEO_UI_BACKENDCONFIGWIDGET_H__ #include <tqwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace Kleo { class CryptoBackendFactory; @@ -46,7 +46,7 @@ class TQListViewItem; 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 ); 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/cryptoconfigdialog.h b/certmanager/lib/ui/cryptoconfigdialog.h index 3f6ba328..9ed30c9e 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.h +++ b/certmanager/lib/ui/cryptoconfigdialog.h @@ -33,7 +33,7 @@ #define CRYPTOCONFIGDIALOG_H #include <kdialogbase.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace Kleo { @@ -45,7 +45,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.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/cryptoconfigmodule.h b/certmanager/lib/ui/cryptoconfigmodule.h index 2902423c..dd0d3421 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.h +++ b/certmanager/lib/ui/cryptoconfigmodule.h @@ -46,7 +46,7 @@ namespace Kleo { * It's a simple TQWidget so that it can be embedded into a dialog or into a TDECModule. */ 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 c841a092..652d2071 100644 --- a/certmanager/lib/ui/cryptoconfigmodule_p.h +++ b/certmanager/lib/ui/cryptoconfigmodule_p.h @@ -57,7 +57,7 @@ namespace Kleo { * A widget corresponding to a component in the crypto config */ class CryptoConfigComponentGUI : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -77,7 +77,7 @@ namespace Kleo { * A class managing widgets corresponding to a group in the crypto config */ class CryptoConfigGroupGUI : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -109,7 +109,7 @@ namespace Kleo { * Base class for the widget managers tied to an entry in the crypto config */ class CryptoConfigEntryGUI : public TQObject { - Q_OBJECT + TQ_OBJECT public: CryptoConfigEntryGUI( CryptoConfigModule* module, @@ -147,7 +147,7 @@ namespace Kleo { * A widget manager for a string entry in the crypto config */ class CryptoConfigEntryLineEdit : public CryptoConfigEntryGUI { - Q_OBJECT + TQ_OBJECT public: @@ -167,7 +167,7 @@ namespace Kleo { * A widget manager for a path entry in the crypto config */ class CryptoConfigEntryPath : public CryptoConfigEntryGUI { - Q_OBJECT + TQ_OBJECT public: @@ -187,7 +187,7 @@ namespace Kleo { * A widget manager for a directory path entry in the crypto config */ class CryptoConfigEntryDirPath : public CryptoConfigEntryGUI { - Q_OBJECT + TQ_OBJECT public: @@ -207,7 +207,7 @@ namespace Kleo { * A widget manager for an URL entry in the crypto config */ class CryptoConfigEntryURL : public CryptoConfigEntryGUI { - Q_OBJECT + TQ_OBJECT public: @@ -227,7 +227,7 @@ namespace Kleo { * A widget manager for an int/uint entry in the crypto config */ class CryptoConfigEntrySpinBox : public CryptoConfigEntryGUI { - Q_OBJECT + TQ_OBJECT public: @@ -247,7 +247,7 @@ namespace Kleo { * A widget manager for a bool entry in the crypto config */ class CryptoConfigEntryCheckBox : public CryptoConfigEntryGUI { - Q_OBJECT + TQ_OBJECT public: @@ -266,7 +266,7 @@ namespace Kleo { * A widget manager for a bool entry in the crypto config */ class CryptoConfigEntryLDAPURL : public CryptoConfigEntryGUI { - Q_OBJECT + TQ_OBJECT public: diff --git a/certmanager/lib/ui/directoryserviceswidget.h b/certmanager/lib/ui/directoryserviceswidget.h index a98bc5fe..5514e877 100644 --- a/certmanager/lib/ui/directoryserviceswidget.h +++ b/certmanager/lib/ui/directoryserviceswidget.h @@ -34,7 +34,7 @@ #define DIRECTORYSERVICESWIDGET_H #include "directoryserviceswidgetbase.h" #include <kurl.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class CryptPlugWrapper; namespace Kleo { @@ -43,7 +43,7 @@ class CryptoConfigEntry; class KDE_EXPORT DirectoryServicesWidget : public DirectoryServicesWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/certmanager/lib/ui/directoryserviceswidgetbase.ui b/certmanager/lib/ui/directoryserviceswidgetbase.ui index fcc7d493..c34b16f1 100644 --- a/certmanager/lib/ui/directoryserviceswidgetbase.ui +++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui @@ -330,13 +330,13 @@ By clicking this button, you can remove the currently selected directory service <slot>slotMoveDown()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">slotAddService()</slot> <slot access="protected">slotDeleteService()</slot> <slot access="protected">slotServiceChanged( TQListViewItem* )</slot> <slot access="protected">slotServiceSelected( TQListViewItem* )</slot> <slot access="protected">slotMoveUp()</slot> <slot access="protected">slotMoveDown()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp index b2f1343a..38c4df9d 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* dnattributeorderconfigwidget.cpp This file is part of libkleopatra, the KDE keymanagement library @@ -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/dnattributeorderconfigwidget.h b/certmanager/lib/ui/dnattributeorderconfigwidget.h index b7ba1330..70c093d4 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.h +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* dnattributeorderconfigwidget.h This file is part of libkleopatra, the KDE keymanagement library @@ -34,7 +34,7 @@ #define __KLEO_UI_DNATTRIBUTEORDERCONFIGWIDGET_H__ #include <tqwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace Kleo { class DNAttributeMapper; } @@ -44,7 +44,7 @@ class TQListViewItem; namespace Kleo { class KDE_EXPORT DNAttributeOrderConfigWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /*! Use Kleo::DNAttributeMapper::instance()->configWidget( parent, name ) instead. */ diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp index 118b6b10..2892a05e 100644 --- a/certmanager/lib/ui/kdhorizontalline.cpp +++ b/certmanager/lib/ui/kdhorizontalline.cpp @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* KD Tools - a set of useful widgets for TQt */ diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h index 71c1c928..e9b9646f 100644 --- a/certmanager/lib/ui/kdhorizontalline.h +++ b/certmanager/lib/ui/kdhorizontalline.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* KD Tools - a set of useful widgets for TQt */ @@ -45,7 +45,7 @@ #include <tqstring.h> class KDHorizontalLine : public TQFrame { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString title READ title WRITE setTitle ) public: diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp index 0ee6d865..fd796b8d 100644 --- a/certmanager/lib/ui/keyapprovaldialog.cpp +++ b/certmanager/lib/ui/keyapprovaldialog.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyapprovaldialog.h This file is part of libkleopatra, the KDE keymanagement library @@ -139,7 +139,7 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients d->selfRequester->setKeys( sender ); glay->addWidget( d->selfRequester, row, 1 ); ++row; - glay->addMultiCellWidget( new KSeparator( Qt::Horizontal, view ), row, row, 0, 1 ); + glay->addMultiCellWidget( new KSeparator( TQt::Horizontal, view ), row, row, 0, 1 ); } const TQStringList prefs = preferencesStrings(); @@ -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/keyapprovaldialog.h b/certmanager/lib/ui/keyapprovaldialog.h index bd953fa3..d6a59b09 100644 --- a/certmanager/lib/ui/keyapprovaldialog.h +++ b/certmanager/lib/ui/keyapprovaldialog.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyselectiondialog.h This file is part of libkleopatra, the KDE keymanagement library @@ -40,7 +40,7 @@ #include <kleo/enum.h> #include <kdialogbase.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <kpgpkey.h> // for EncryptPref #include <gpgmepp/key.h> @@ -56,7 +56,7 @@ class TQStringList; namespace Kleo { class KDE_EXPORT KeyApprovalDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: struct Item { 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/keylistview.h b/certmanager/lib/ui/keylistview.h index 4149cb41..414e4dea 100644 --- a/certmanager/lib/ui/keylistview.h +++ b/certmanager/lib/ui/keylistview.h @@ -36,7 +36,7 @@ #include <tdelistview.h> #include <gpgmepp/key.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQPainter; class TQColorGroup; @@ -199,7 +199,7 @@ namespace Kleo { class KDE_EXPORT KeyListView : public TDEListView { - Q_OBJECT + TQ_OBJECT friend class KeyListViewItem; public: diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp index c9516a2b..6dd1b05e 100644 --- a/certmanager/lib/ui/keyrequester.cpp +++ b/certmanager/lib/ui/keyrequester.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyrequester.cpp This file is part of libkleopatra, the KDE keymanagement library @@ -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/keyrequester.h b/certmanager/lib/ui/keyrequester.h index 899d3cde..2f7b3b26 100644 --- a/certmanager/lib/ui/keyrequester.h +++ b/certmanager/lib/ui/keyrequester.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyrequester.h This file is part of libkleopatra, the KDE keymanagement library @@ -53,7 +53,7 @@ #include <kleo/cryptobackend.h> #include <vector> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace Kleo { class KeyListView; @@ -74,7 +74,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, @@ -160,7 +160,7 @@ namespace Kleo { class KDE_EXPORT EncryptionKeyRequester : public KeyRequester { - Q_OBJECT + TQ_OBJECT public: enum { OpenPGP = 1, SMIME = 2, AllProtocols = OpenPGP|SMIME }; @@ -188,7 +188,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.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index c46228a4..1de21dc0 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/certmanager/lib/ui/keyselectiondialog.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyselectiondialog.cpp This file is part of libkleopatra, the KDE keymanagement library @@ -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/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h index 630255c1..c8c833dd 100644 --- a/certmanager/lib/ui/keyselectiondialog.h +++ b/certmanager/lib/ui/keyselectiondialog.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyselectiondialog.h This file is part of libkleopatra, the KDE keymanagement library @@ -41,7 +41,7 @@ #include <kleo/cryptobackend.h> #include <gpgmepp/key.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <vector> class TQVBoxLayout; @@ -64,7 +64,7 @@ namespace GpgME { namespace Kleo { class KDE_EXPORT KeySelectionDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp index fa14bfbe..689c094e 100644 --- a/certmanager/lib/ui/messagebox.cpp +++ b/certmanager/lib/ui/messagebox.cpp @@ -74,7 +74,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 ) diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp index 990f93cd..68837d38 100644 --- a/certmanager/lib/ui/passphrasedialog.cpp +++ b/certmanager/lib/ui/passphrasedialog.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* passphrasedialog.cpp This file is part of libkleopatra, the KDE keymanagement library @@ -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/passphrasedialog.h b/certmanager/lib/ui/passphrasedialog.h index 6515fa4c..15d0a157 100644 --- a/certmanager/lib/ui/passphrasedialog.h +++ b/certmanager/lib/ui/passphrasedialog.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* passphrasedialog.h This file is part of libkleopatra, the KDE keymanagement library @@ -54,7 +54,7 @@ namespace Kleo { class PassphraseDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PassphraseDialog( const TQString & description, 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/progressbar.h b/certmanager/lib/ui/progressbar.h index 51f86dad..ead5b12c 100644 --- a/certmanager/lib/ui/progressbar.h +++ b/certmanager/lib/ui/progressbar.h @@ -34,7 +34,7 @@ #define __KLEO_PROGRESSBAR_H__ #include <tqprogressbar.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQTimer; namespace Kleo { @@ -43,7 +43,7 @@ namespace Kleo { @short A TQProgressBar with self-powered busy indicator */ 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.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 ); } diff --git a/certmanager/lib/ui/progressdialog.h b/certmanager/lib/ui/progressdialog.h index dadfd769..35b1886d 100644 --- a/certmanager/lib/ui/progressdialog.h +++ b/certmanager/lib/ui/progressdialog.h @@ -35,7 +35,7 @@ #include <tqprogressdialog.h> #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace Kleo { class Job; @@ -44,7 +44,7 @@ namespace Kleo { @short A progress dialog for Kleo::Jobs */ class KDE_EXPORT ProgressDialog : public TQProgressDialog { - Q_OBJECT + TQ_OBJECT public: ProgressDialog( Job * job, const TQString & baseText, diff --git a/certmanager/storedtransferjob.cpp b/certmanager/storedtransferjob.cpp index b9816c89..3803502d 100644 --- a/certmanager/storedtransferjob.cpp +++ b/certmanager/storedtransferjob.cpp @@ -30,10 +30,10 @@ StoredTransferJob::StoredTransferJob(const KURL& url, int command, : TDEIO::TransferJob( url, command, packedArgs, _staticData, showProgressInfo ), m_uploadOffset( 0 ) { - connect( this, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( this, TQT_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ), - TQT_SLOT( slotDataReq( TDEIO::Job *, TQByteArray & ) ) ); + connect( this, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( this, TQ_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ), + TQ_SLOT( slotDataReq( TDEIO::Job *, TQByteArray & ) ) ); } void StoredTransferJob::setData( const TQByteArray& arr ) diff --git a/certmanager/storedtransferjob.h b/certmanager/storedtransferjob.h index cfbc6811..bdd7988e 100644 --- a/certmanager/storedtransferjob.h +++ b/certmanager/storedtransferjob.h @@ -45,7 +45,7 @@ namespace TDEIOext { * */ class StoredTransferJob : public TDEIO::TransferJob { - Q_OBJECT + TQ_OBJECT public: |