diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-14 12:33:20 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-14 12:43:48 +0900 |
| commit | 3b3f9ec8f31978030c17309fae48335bea5c1587 (patch) | |
| tree | 0b493383a1501860371aacd792ec6fc08d595824 /certmanager | |
| parent | 99e6e1d1f43610c3573e9824a2a8a38f69930cd0 (diff) | |
| download | tdepim-3b3f9ec8f31978030c17309fae48335bea5c1587.tar.gz tdepim-3b3f9ec8f31978030c17309fae48335bea5c1587.zip | |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'certmanager')
39 files changed, 314 insertions, 314 deletions
diff --git a/certmanager/certificateinfowidgetimpl.cpp b/certmanager/certificateinfowidgetimpl.cpp index eb28c1a68..9ff6b15a5 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 @@ -258,12 +258,12 @@ void CertificateInfoWidgetImpl::startCertificateDump() { (*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/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp index 38352db9b..f5dd08adc 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 ); @@ -364,8 +364,8 @@ void CertificateWizardImpl::createPersonalDataPage() _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/certmanager.cpp b/certmanager/certmanager.cpp index 6dfd3d743..ddcdb8a45 100644 --- a/certmanager/certmanager.cpp +++ b/certmanager/certmanager.cpp @@ -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, TQT_SIGNAL(dropped(const KURL::List&) ), - TQT_SLOT( slotDropped(const KURL::List&) ) ); + 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, TQ_SIGNAL(dropped(const KURL::List&) ), + TQ_SLOT( slotDropped(const KURL::List&) ) ); mLineEditAction->setText(query); if ( !mRemote && !mNextFindRemote || !query.isEmpty() ) @@ -244,17 +244,17 @@ 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( this, TQT_SLOT(close()), actionCollection() ); + (void)KStdAction::quit( this, TQ_SLOT(close()), actionCollection() ); - action = KStdAction::redisplay( 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)); @@ -263,113 +263,113 @@ void CertManager::createActions() { connectEnableOperationSignal( this, action ); action = new TDEAction( i18n("Stop Operation"), "process-stop", Key_Escape, - 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, - 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, - this, TQT_SLOT(slotExpandAll()), + this, TQ_SLOT(slotExpandAll()), actionCollection(), "view_expandall" ); action = new TDEAction( i18n("Collapse All"), 0, CTRL+Key_Comma, - this, TQT_SLOT(slotCollapseAll()), + this, TQ_SLOT(slotCollapseAll()), actionCollection(), "view_collapseall" ); (void) new TDEAction( i18n("Refresh CRLs"), 0, 0, - this, TQT_SLOT(slotRefreshKeys()), + this, TQ_SLOT(slotRefreshKeys()), actionCollection(), "certificates_refresh_clr" ); #ifdef NOT_IMPLEMENTED_ANYWAY mRevokeCertificateAction = new TDEAction( i18n("Revoke"), 0, - this, TQT_SLOT(revokeCertificate()), + this, TQ_SLOT(revokeCertificate()), actionCollection(), "edit_revoke_certificate" ); connectEnableOperationSignal( this, mRevokeCertificateAction ); mExtendCertificateAction = new TDEAction( i18n("Extend"), 0, - 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, - this, TQT_SLOT(slotDeleteCertificate()), + this, TQ_SLOT(slotDeleteCertificate()), actionCollection(), "edit_delete_certificate" ); connectEnableOperationSignal( this, mDeleteCertificateAction ); mValidateCertificateAction = new TDEAction( i18n("Validate"), "reload", SHIFT + Key_F5, - this, TQT_SLOT(slotValidate()), + this, TQ_SLOT(slotValidate()), actionCollection(), "certificates_validate" ); connectEnableOperationSignal( this, mValidateCertificateAction ); mImportCertFromFileAction = new TDEAction( i18n("Import Certificates..."), 0, - this, TQT_SLOT(slotImportCertFromFile()), + this, TQ_SLOT(slotImportCertFromFile()), actionCollection(), "file_import_certificates" ); connectEnableOperationSignal( this, mImportCertFromFileAction ); mImportCRLFromFileAction = new TDEAction( i18n("Import CRLs..."), 0, - this, TQT_SLOT(importCRLFromFile()), + this, TQ_SLOT(importCRLFromFile()), actionCollection(), "file_import_crls" ); connectEnableOperationSignal( this, mImportCRLFromFileAction ); mExportCertificateAction = new TDEAction( i18n("Export Certificates..."), "export", 0, - this, TQT_SLOT(slotExportCertificate()), + this, TQ_SLOT(slotExportCertificate()), actionCollection(), "file_export_certificate" ); mExportSecretKeyAction = new TDEAction( i18n("Export Secret Key..."), "export", 0, - this, TQT_SLOT(slotExportSecretKey()), + this, TQ_SLOT(slotExportSecretKey()), actionCollection(), "file_export_secret_keys" ); connectEnableOperationSignal( this, mExportSecretKeyAction ); mViewCertDetailsAction = new TDEAction( i18n("Certificate Details..."), 0, 0, - this, TQT_SLOT(slotViewDetails()), actionCollection(), + this, TQ_SLOT(slotViewDetails()), actionCollection(), "view_certificate_details" ); mDownloadCertificateAction = new TDEAction( i18n( "Download"), 0, 0, - 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, - 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, - 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, this, - TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg"); + 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(), this, - TQT_SLOT(slotSearch()), + TQ_SLOT(slotSearch()), "query_lineedit_action"); TQStringList lst; lst << i18n("In Local Certificates") << i18n("In External Certificates"); - mComboAction = new ComboAction( lst, actionCollection(), 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, this, TQT_SLOT(slotSearch()), + mFindAction = new TDEAction( i18n("Find"), "edit-find", 0, this, TQ_SLOT(slotSearch()), actionCollection(), "find" ); - KStdAction::keyBindings( this, TQT_SLOT(slotEditKeybindings()), actionCollection() ); - KStdAction::preferences( 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, 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 ) { @@ -1034,10 +1034,10 @@ void CertManager::slotDeleteCertificate() { 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/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp index 087e237e3..49723f4d6 100644 --- a/certmanager/conf/appearanceconfigpage.cpp +++ b/certmanager/conf/appearanceconfigpage.cpp @@ -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/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp index 43373e72d..ad2e60993 100644 --- a/certmanager/conf/dirservconfigpage.cpp +++ b/certmanager/conf/dirservconfigpage.cpp @@ -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/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp index 186686844..5c2d6c203 100644 --- a/certmanager/conf/dnorderconfigpage.cpp +++ b/certmanager/conf/dnorderconfigpage.cpp @@ -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/crlview.cpp b/certmanager/crlview.cpp index f94a45574..2cefe0451 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/customactions.cpp b/certmanager/customactions.cpp index bf637538b..9c88491e6 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/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp index 6b1861787..25b7dc065 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/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp index d3b262b34..ef189a6e2 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(); } @@ -96,18 +96,18 @@ void KWatchGnuPGMainWindow::slotClear() void KWatchGnuPGMainWindow::createActions() { (void)new TDEAction( i18n("C&lear History"), "history_clear", CTRL+Key_L, - this, TQT_SLOT( slotClear() ), + this, TQ_SLOT( slotClear() ), actionCollection(), "clear_log" ); - (void)KStdAction::saveAs( this, TQT_SLOT(slotSaveAs()), actionCollection() ); - (void)KStdAction::close( this, TQT_SLOT(close()), actionCollection() ); - (void)KStdAction::quit( this, TQT_SLOT(slotQuit()), actionCollection() ); - (void)KStdAction::preferences( this, TQT_SLOT(slotConfigure()), actionCollection() ); - (void)KStdAction::keyBindings(this, TQT_SLOT(configureShortcuts()), actionCollection()); - (void)KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbars()), actionCollection()); + (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,8 +127,8 @@ 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() ) { @@ -150,8 +150,8 @@ void KWatchGnuPGMainWindow::startWatcher() 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/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp index 265d759b7..5c49478e4 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp @@ -90,7 +90,7 @@ GpgME::Error Kleo::ChiasmusJob::setup() { : SymCryptRunProcessBase::Decrypt, this, "symcryptrun" ); TQTimer::singleShot( timeoutEntry->uintValue() * 1000, this, - TQT_SLOT( slotTimeout() ) ); + TQ_SLOT( slotTimeout() ) ); return 0; } @@ -110,8 +110,8 @@ GpgME::Error Kleo::ChiasmusJob::start() { if ( const GpgME::Error err = setup() ) return mError = err; - connect( mSymCryptRun, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); + connect( mSymCryptRun, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*)) ); if ( !mSymCryptRun->launch( mInput ) ) return mError = gpg_error( GPG_ERR_ENOENT ); // what else? diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp index d7ae22c1f..90f512435 100644 --- a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp +++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp @@ -70,7 +70,7 @@ Kleo::ObtainKeysJob::ObtainKeysJob() Kleo::ObtainKeysJob::~ObtainKeysJob() {} GpgME::Error Kleo::ObtainKeysJob::start() { - TQTimer::singleShot( 0, this, TQT_SLOT(slotPerform()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotPerform()) ); return mError = 0; } @@ -109,7 +109,7 @@ void Kleo::ObtainKeysJob::slotPerform( bool async ) { ++mIndex; if ( async ) - TQTimer::singleShot( 0, this, TQT_SLOT(slotPerform()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotPerform()) ); else slotPerform( false ); } diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp index 9391f023f..34ac1d66f 100644 --- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp +++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp @@ -58,10 +58,10 @@ Kleo::SymCryptRunProcessBase::SymCryptRunProcessBase( const TQString & class_, c Kleo::SymCryptRunProcessBase::~SymCryptRunProcessBase() {} bool Kleo::SymCryptRunProcessBase::launch( const TQByteArray & input, RunMode rm ) { - connect( this, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) ); - connect( this, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - this, TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) ); + connect( this, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) ); + connect( this, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) ); if ( rm == Block ) { KTempFile tempfile; tempfile.setAutoDelete( true ); @@ -80,7 +80,7 @@ bool Kleo::SymCryptRunProcessBase::launch( const TQByteArray & input, RunMode rm return ok; mInput = input.copy(); writeStdin( mInput.begin(), mInput.size() ); - connect( this, TQT_SIGNAL(wroteStdin(TDEProcess*)), this, TQT_SLOT(closeStdin()) ); + connect( this, TQ_SIGNAL(wroteStdin(TDEProcess*)), this, TQ_SLOT(closeStdin()) ); return true; } } diff --git a/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp b/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp index 3d28ac4bc..5ab837152 100644 --- a/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp +++ b/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp @@ -264,7 +264,7 @@ GpgME::Error Kleo::KpgpKeyListJob::start( const TQStringList & patterns, bool secretOnly ) { mPatterns = patterns; mSecretOnly = secretOnly; - TQTimer::singleShot( 0, this, TQT_SLOT( slotDoIt() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDoIt() ) ); return GpgME::Error( 0 ); } diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp index bfd00ac92..e0da7eca4 100644 --- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp +++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp @@ -113,7 +113,7 @@ int Kleo::GnuPGProcessBase::commSetupDoneP() { if ( d->usetStatusFD ) { ::close( d->statusFD[1] ); // close the input end of the pipe, we're the reader d->statnot = new TQSocketNotifier( d->statusFD[0], TQSocketNotifier::Read, this ); - connect( d->statnot, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChildStatus(int)) ); + connect( d->statnot, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChildStatus(int)) ); } return TDEProcess::commSetupDoneP(); } diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp index e73b4363f..2b81c6b1a 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp @@ -75,8 +75,8 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors ) proc << "gpgconf"; // must be in the PATH proc << "--list-components"; - TQObject::connect( &proc, TQT_SIGNAL( readReady(KProcIO*) ), - this, TQT_SLOT( slotCollectStdOut(KProcIO*) ) ); + TQObject::connect( &proc, TQ_SIGNAL( readReady(KProcIO*) ), + this, TQ_SLOT( slotCollectStdOut(KProcIO*) ) ); // run the process: int rc = 0; @@ -173,8 +173,8 @@ void QGpgMECryptoConfigComponent::runGpgConf() //kdDebug(5150) << "Running gpgconf --list-options " << mName << endl; - TQObject::connect( &proc, TQT_SIGNAL( readReady(KProcIO*) ), - this, TQT_SLOT( slotCollectStdOut(KProcIO*) ) ); + TQObject::connect( &proc, TQ_SIGNAL( readReady(KProcIO*) ), + this, TQ_SLOT( slotCollectStdOut(KProcIO*) ) ); mCurrentGroup = 0; // run the process: diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp index 947a52587..71fe0b57c 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp @@ -96,8 +96,8 @@ Kleo::QGpgMEJob::QGpgMEJob( Kleo::Job * _this, GpgME::Context * context ) { InvarianceChecker check( this ); assert( context ); - TQObject::connect( QGpgME::EventLoopInteractor::instance(), TQT_SIGNAL(aboutToDestroy()), - _this, TQT_SLOT(slotCancel()) ); + TQObject::connect( QGpgME::EventLoopInteractor::instance(), TQ_SIGNAL(aboutToDestroy()), + _this, TQ_SLOT(slotCancel()) ); context->setProgressProvider( this ); // (mmutz) work around a gpgme bug in versions at least <= 0.9.0. // These versions will return GPG_ERR_NOT_IMPLEMENTED from @@ -153,8 +153,8 @@ void Kleo::QGpgMEJob::deleteAllPatterns() { void Kleo::QGpgMEJob::hookupContextToEventLoopInteractor() { mCtx->setManagedByEventLoopInteractor( true ); TQObject::connect( QGpgME::EventLoopInteractor::instance(), - TQT_SIGNAL(operationDoneEventSignal(GpgME::Context*,const GpgME::Error&)), - mThis, TQT_SLOT(slotOperationDoneEvent(GpgME::Context*,const GpgME::Error&)) ); + TQ_SIGNAL(operationDoneEventSignal(GpgME::Context*,const GpgME::Error&)), + mThis, TQ_SLOT(slotOperationDoneEvent(GpgME::Context*,const GpgME::Error&)) ); } void Kleo::QGpgMEJob::setPatterns( const TQStringList & sl, bool allowEmpty ) { diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp index 5561625c8..25edaf844 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp @@ -79,8 +79,8 @@ GpgME::Error Kleo::QGpgMEKeyListJob::start( const TQStringList & pats, bool secr hookupContextToEventLoopInteractor(); connect( QGpgME::EventLoopInteractor::instance(), - TQT_SIGNAL(nextKeyEventSignal(GpgME::Context*,const GpgME::Key&)), - TQT_SLOT(slotNextKeyEvent(GpgME::Context*,const GpgME::Key&)) ); + TQ_SIGNAL(nextKeyEventSignal(GpgME::Context*,const GpgME::Key&)), + TQ_SLOT(slotNextKeyEvent(GpgME::Context*,const GpgME::Key&)) ); // The communication channel between gpgme and gpgsm is limited in // the number of patterns that can be transported, but they won't @@ -100,7 +100,7 @@ GpgME::Error Kleo::QGpgMEKeyListJob::start( const TQStringList & pats, bool secr } } else if ( err.code() == GPG_ERR_EOF ) { kdDebug(5150) << "QGpgMEKeyListJob::start(): early end of keylisting, trying to fake an empty result" << endl; - TQTimer::singleShot( 10, this, TQT_SLOT(slotFakeOperationDoneEvent()) ); + TQTimer::singleShot( 10, this, TQ_SLOT(slotFakeOperationDoneEvent()) ); return GpgME::Error(); } deleteLater(); diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp index 6d05e1ecc..8088d28ae 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp @@ -107,12 +107,12 @@ GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess() { mProcess->setUsetStatusFD( true ); - connect( mProcess, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_SLOT(slotProcessExited(TDEProcess*)) ); - connect( mProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - TQT_SLOT(slotStderr(TDEProcess*,char*,int)) ); - connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), - TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); + connect( mProcess, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(slotProcessExited(TDEProcess*)) ); + connect( mProcess, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + TQ_SLOT(slotStderr(TDEProcess*,char*,int)) ); + connect( mProcess, TQ_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), + TQ_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::Stderr ) ) { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else? diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp index f553c7039..af72a5391 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp @@ -88,14 +88,14 @@ GpgME::Error Kleo::QGpgMESecretKeyExportJob::start( const TQStringList & pattern mProcess->setUsetStatusFD( true ); - connect( mProcess, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_SLOT(slotProcessExited(TDEProcess*)) ); - connect( mProcess, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - TQT_SLOT(slotStdout(TDEProcess*,char*,int)) ); - connect( mProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - TQT_SLOT(slotStderr(TDEProcess*,char*,int)) ); - connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), - TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); + connect( mProcess, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(slotProcessExited(TDEProcess*)) ); + connect( mProcess, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + TQ_SLOT(slotStdout(TDEProcess*,char*,int)) ); + connect( mProcess, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + TQ_SLOT(slotStderr(TDEProcess*,char*,int)) ); + connect( mProcess, TQ_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), + TQ_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else? diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp index 65b597255..03bb267f1 100644 --- a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp +++ b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp @@ -142,8 +142,8 @@ GpgME::Error Kleo::HierarchicalKeyListJob::startAJob() { assert( mJob ); // FIXME: we need a way to generate errors ourselves, // but I don't like the dependency on gpg-error :/ - connect( mJob, TQT_SIGNAL(nextKey(const GpgME::Key&)), TQT_SLOT(slotNextKey(const GpgME::Key&)) ); - connect( mJob, TQT_SIGNAL(result(const GpgME::KeyListResult&)), TQT_SLOT(slotResult(const GpgME::KeyListResult&)) ); + connect( mJob, TQ_SIGNAL(nextKey(const GpgME::Key&)), TQ_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( mJob, TQ_SIGNAL(result(const GpgME::KeyListResult&)), TQ_SLOT(slotResult(const GpgME::KeyListResult&)) ); TQStringList patterns; for ( std::set<TQString>::const_iterator it = mNextSet.begin() ; it != mNextSet.end() ; ++it ) diff --git a/certmanager/lib/kleo/job.cpp b/certmanager/lib/kleo/job.cpp index 907a74488..eb6385921 100644 --- a/certmanager/lib/kleo/job.cpp +++ b/certmanager/lib/kleo/job.cpp @@ -63,7 +63,7 @@ Kleo::Job::Job( TQObject * parent, const char * name ) : TQObject( parent, name ) { if ( tqApp ) - connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(slotCancel()) ); + connect( tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(slotCancel()) ); } Kleo::Job::~Job() { diff --git a/certmanager/lib/kleo/keyfiltermanager.cpp b/certmanager/lib/kleo/keyfiltermanager.cpp index 1aa2b170a..2c5b5a350 100644 --- a/certmanager/lib/kleo/keyfiltermanager.cpp +++ b/certmanager/lib/kleo/keyfiltermanager.cpp @@ -73,7 +73,7 @@ Kleo::KeyFilterManager::KeyFilterManager( TQObject * parent, const char * name ) d = new Private(); // ### DF: doesn't a KStaticDeleter work more reliably? if ( tqApp ) - connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) ); + connect( tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(deleteLater()) ); reload(); } diff --git a/certmanager/lib/kleo/multideletejob.cpp b/certmanager/lib/kleo/multideletejob.cpp index 7c83c24bc..9aafdd79a 100644 --- a/certmanager/lib/kleo/multideletejob.cpp +++ b/certmanager/lib/kleo/multideletejob.cpp @@ -102,7 +102,7 @@ GpgME::Error Kleo::MultiDeleteJob::startAJob() { assert( mJob ); // FIXME: we need a way to generate errors ourselves, // but I don't like the dependency on gpg-error :/ - connect( mJob, TQT_SIGNAL(result(const GpgME::Error&)), TQT_SLOT(slotResult(const GpgME::Error&)) ); + connect( mJob, TQ_SIGNAL(result(const GpgME::Error&)), TQ_SLOT(slotResult(const GpgME::Error&)) ); return mJob->start( *mIt, mAllowSecretKeyDeletion ); } diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp index 01e5d1091..3fdc99381 100644 --- a/certmanager/lib/tests/test_gnupgprocessbase.cpp +++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp @@ -62,14 +62,14 @@ void GnuPGViewer::setProcess( Kleo::GnuPGProcessBase * process ) { if ( !process ) return; mProcess = process; - connect( mProcess, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_SLOT(slotProcessExited(TDEProcess*)) ); - connect( mProcess, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - TQT_SLOT(slotStdout(TDEProcess*,char*,int)) ); - connect( mProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - TQT_SLOT(slotStderr(TDEProcess*,char*,int)) ); - connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), - TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); + connect( mProcess, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(slotProcessExited(TDEProcess*)) ); + connect( mProcess, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + TQ_SLOT(slotStdout(TDEProcess*,char*,int)) ); + connect( mProcess, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + TQ_SLOT(slotStderr(TDEProcess*,char*,int)) ); + connect( mProcess, TQ_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), + TQ_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); } static TQStringList split( char * buffer, int buflen, TQString & old ) { diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp index b678e29d7..ef8f8878b 100644 --- a/certmanager/lib/tests/test_keygen.cpp +++ b/certmanager/lib/tests/test_keygen.cpp @@ -96,7 +96,7 @@ KeyGenerator::KeyGenerator( TQWidget * parent, const char * name, WFlags ) glay->setRowStretch( row, 1 ); glay->setColStretch( 1, 1 ); - connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotStartKeyGeneration()) ); + connect( this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotStartKeyGeneration()) ); } KeyGenerator::~KeyGenerator() {} @@ -118,8 +118,8 @@ void KeyGenerator::slotStartKeyGeneration() { Kleo::KeyGenerationJob * job = proto->keyGenerationJob(); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::KeyGenerationResult&,const TQByteArray&)), - TQT_SLOT(slotResult(const GpgME::KeyGenerationResult&,const TQByteArray&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyGenerationResult&,const TQByteArray&)), + TQ_SLOT(slotResult(const GpgME::KeyGenerationResult&,const TQByteArray&)) ); const GpgME::Error err = job->start( params ); if ( err ) diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp index 0e357b591..38b9085bd 100644 --- a/certmanager/lib/tests/test_keylister.cpp +++ b/certmanager/lib/tests/test_keylister.cpp @@ -115,10 +115,10 @@ void CertListView::slotStart() { kdDebug() << "CertListView::slotStart()" << endl; Kleo::KeyListJob * job = Kleo::CryptoBackendFactory::instance()->smime()->keyListJob( false ); assert( job ); - TQObject::connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), - this, TQT_SLOT(slotAddKey(const GpgME::Key&)) ); - TQObject::connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - this, TQT_SLOT(slotResult(const GpgME::KeyListResult&)) ); + TQObject::connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + this, TQ_SLOT(slotAddKey(const GpgME::Key&)) ); + TQObject::connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + this, TQ_SLOT(slotResult(const GpgME::KeyListResult&)) ); #if 0 TQStringList l; l << "Marc"; @@ -138,7 +138,7 @@ int main( int argc, char** argv ) { app.setMainWidget( clv ); clv->show(); - TQTimer::singleShot( 5000, clv, TQT_SLOT(slotStart()) ); + TQTimer::singleShot( 5000, clv, TQ_SLOT(slotStart()) ); return app.exec(); } diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp index 9d8f4d402..82db7d7aa 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -215,8 +215,8 @@ Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory, hlay->addWidget( d->listView, 1 ); - connect( d->listView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( d->listView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); TQVBoxLayout * vlay = new TQVBoxLayout( hlay ); // inherits spacing @@ -224,15 +224,15 @@ Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory, d->configureButton->setAutoDefault( false ); vlay->addWidget( d->configureButton ); - connect( d->configureButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotConfigureButtonClicked()) ); + connect( d->configureButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotConfigureButtonClicked()) ); d->rescanButton = new TQPushButton( i18n("Rescan"), this ); d->rescanButton->setAutoDefault( false ); vlay->addWidget( d->rescanButton ); - connect( d->rescanButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotRescanButtonClicked()) ); + connect( d->rescanButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotRescanButtonClicked()) ); vlay->addStretch( 1 ); } @@ -306,7 +306,7 @@ void Kleo::BackendConfigWidget::slotConfigureButtonClicked() { // Tell other users of gpgconf (e.g. the s/mime page) that the gpgconf data might have changed kapp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", TQByteArray() ); // and schedule a rescan, in case the updates make a backend valid - TQTimer::singleShot( 0, this, TQT_SLOT(slotRescanButtonClicked()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotRescanButtonClicked()) ); } } else // shouldn't happen, button is disabled diff --git a/certmanager/lib/ui/cryptoconfigdialog.cpp b/certmanager/lib/ui/cryptoconfigdialog.cpp index 4ec32cbb6..40608ee10 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.cpp +++ b/certmanager/lib/ui/cryptoconfigdialog.cpp @@ -44,7 +44,7 @@ Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidg { mMainWidget = new CryptoConfigModule( config, this ); setMainWidget( mMainWidget ); - connect( mMainWidget, TQT_SIGNAL( changed() ), TQT_SLOT( slotChanged() ) ); + connect( mMainWidget, TQ_SIGNAL( changed() ), TQ_SLOT( slotChanged() ) ); enableButton( Apply, false ); if ( mMainWidget->hasError() ) { showButton( Default, false ); diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp index cfe154420..c6e5594fe 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.cpp +++ b/certmanager/lib/ui/cryptoconfigmodule.cpp @@ -353,7 +353,7 @@ Kleo::CryptoConfigEntryGUI::CryptoConfigEntryGUI( const char* name ) : TQObject( module, name ), mEntry( entry ), mName( entryName ), mChanged( false ) { - connect( this, TQT_SIGNAL( changed() ), module, TQT_SIGNAL( changed() ) ); + connect( this, TQ_SIGNAL( changed() ), module, TQ_SIGNAL( changed() ) ); } TQString Kleo::CryptoConfigEntryGUI::description() const @@ -387,7 +387,7 @@ Kleo::CryptoConfigEntryLineEdit::CryptoConfigEntryLineEdit( label->setEnabled( false ); mLineEdit->setEnabled( false ); } else { - connect( mLineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); + connect( mLineEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) ); } } @@ -419,7 +419,7 @@ Kleo::CryptoConfigEntryPath::CryptoConfigEntryPath( label->setEnabled( false ); mUrlRequester->setEnabled( false ); } else { - connect( mUrlRequester, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); + connect( mUrlRequester, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) ); } } @@ -453,7 +453,7 @@ Kleo::CryptoConfigEntryDirPath::CryptoConfigEntryDirPath( label->setEnabled( false ); mUrlRequester->setEnabled( false ); } else { - connect( mUrlRequester, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); + connect( mUrlRequester, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) ); } } @@ -488,7 +488,7 @@ Kleo::CryptoConfigEntryURL::CryptoConfigEntryURL( label->setEnabled( false ); mUrlRequester->setEnabled( false ); } else { - connect( mUrlRequester, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); + connect( mUrlRequester, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) ); } } @@ -532,7 +532,7 @@ Kleo::CryptoConfigEntrySpinBox::CryptoConfigEntrySpinBox( } else { if ( mKind == UInt || mKind == ListOfNone ) mNumInput->setMinValue( 0 ); - connect( mNumInput, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotChanged() ) ); + connect( mNumInput, TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( slotChanged() ) ); } } @@ -584,7 +584,7 @@ Kleo::CryptoConfigEntryCheckBox::CryptoConfigEntryCheckBox( if ( entry->isReadOnly() ) { mCheckBox->setEnabled( false ); } else { - connect( mCheckBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotChanged() ) ); + connect( mCheckBox, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotChanged() ) ); } } @@ -619,7 +619,7 @@ Kleo::CryptoConfigEntryLDAPURL::CryptoConfigEntryLDAPURL( mLabel->setEnabled( false ); mPushButton->hide(); } else { - connect( mPushButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOpenDialog() ) ); + connect( mPushButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOpenDialog() ) ); } } @@ -644,7 +644,7 @@ void Kleo::CryptoConfigEntryLDAPURL::slotOpenDialog() DirectoryServicesWidget* dirserv = new DirectoryServicesWidget( mEntry, &dialog ); dirserv->load(); dialog.setMainWidget( dirserv ); - connect( &dialog, TQT_SIGNAL( defaultClicked() ), dirserv, TQT_SLOT( defaults() ) ); + connect( &dialog, TQ_SIGNAL( defaultClicked() ), dirserv, TQ_SLOT( defaults() ) ); if ( dialog.exec() ) { // Note that we just grab the urls from the dialog, we don't call its save method, // since the user hasn't confirmed the big config dialog yet. diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp index 874ba0fa5..38c4df9d2 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp @@ -105,10 +105,10 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap d->currentLV->setSorting( -1 ); glay->addWidget( d->currentLV, row, 2 ); - connect( d->availableLV, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotAvailableSelectionChanged(TQListViewItem*)) ); - connect( d->currentLV, TQT_SIGNAL(clicked(TQListViewItem*)), - TQT_SLOT(slotCurrentOrderSelectionChanged(TQListViewItem*)) ); + connect( d->availableLV, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotAvailableSelectionChanged(TQListViewItem*)) ); + connect( d->currentLV, TQ_SIGNAL(clicked(TQListViewItem*)), + TQ_SLOT(slotCurrentOrderSelectionChanged(TQListViewItem*)) ); d->placeHolderItem = new TQListViewItem( d->availableLV, "_X_", i18n("All others") ); @@ -123,12 +123,12 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap const char * tooltip; const char * slot; } navButtons[] = { - { "2uparrow", 0, 1, I18N_NOOP( "Move to top" ), TQT_SLOT(slotDoubleUpButtonClicked()) }, - { "1uparrow", 1, 1, I18N_NOOP( "Move one up" ), TQT_SLOT(slotUpButtonClicked()) }, - { "1leftarrow", 2, 0, I18N_NOOP( "Remove from current attribute order" ), TQT_SLOT(slotLeftButtonClicked()) }, - { "1rightarrow", 2, 2, I18N_NOOP( "Add to current attribute order" ), TQT_SLOT(slotRightButtonClicked()) }, - { "1downarrow", 3, 1, I18N_NOOP( "Move one down" ), TQT_SLOT(slotDownButtonClicked()) }, - { "2downarrow", 4, 1, I18N_NOOP( "Move to bottom" ), TQT_SLOT(slotDoubleDownButtonClicked()) } + { "2uparrow", 0, 1, I18N_NOOP( "Move to top" ), TQ_SLOT(slotDoubleUpButtonClicked()) }, + { "1uparrow", 1, 1, I18N_NOOP( "Move one up" ), TQ_SLOT(slotUpButtonClicked()) }, + { "1leftarrow", 2, 0, I18N_NOOP( "Remove from current attribute order" ), TQ_SLOT(slotLeftButtonClicked()) }, + { "1rightarrow", 2, 2, I18N_NOOP( "Add to current attribute order" ), TQ_SLOT(slotRightButtonClicked()) }, + { "1downarrow", 3, 1, I18N_NOOP( "Move one down" ), TQ_SLOT(slotDownButtonClicked()) }, + { "2downarrow", 4, 1, I18N_NOOP( "Move to bottom" ), TQ_SLOT(slotDoubleDownButtonClicked()) } }; for ( unsigned int i = 0 ; i < sizeof navButtons / sizeof *navButtons ; ++i ) { @@ -137,7 +137,7 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap tb->setEnabled( false ); TQToolTip::add( tb, i18n( navButtons[i].tooltip ) ); xlay->addWidget( tb, navButtons[i].row, navButtons[i].col ); - connect( tb, TQT_SIGNAL(clicked()), navButtons[i].slot ); + connect( tb, TQ_SIGNAL(clicked()), navButtons[i].slot ); } glay->addLayout( xlay, row, 1 ); diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp index 6b873c0ba..fd796b8dc 100644 --- a/certmanager/lib/ui/keyapprovaldialog.cpp +++ b/certmanager/lib/ui/keyapprovaldialog.cpp @@ -163,7 +163,7 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients cb->insertStringList( prefs ); glay->addWidget( cb, row, 1 ); cb->setCurrentItem( pref2cb( it->pref ) ); - connect( cb, TQT_SIGNAL(activated(int)), TQT_SLOT(slotPrefsChanged()) ); + connect( cb, TQ_SIGNAL(activated(int)), TQ_SLOT(slotPrefsChanged()) ); d->preferences.push_back( cb ); } diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp index 00f69500b..af067b1ed 100644 --- a/certmanager/lib/ui/keylistview.cpp +++ b/certmanager/lib/ui/keylistview.cpp @@ -123,14 +123,14 @@ static const struct { const char * source; const char * target; } signalReplacements[] = { - { TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), - TQT_SLOT(slotEmitDoubleClicked(TQListViewItem*,const TQPoint&,int)) }, - { TQT_SIGNAL(returnPressed(TQListViewItem*)), - TQT_SLOT(slotEmitReturnPressed(TQListViewItem*)) }, - { TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(slotEmitSelectionChanged(TQListViewItem*)) }, - { TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*,const TQPoint&)), - TQT_SLOT(slotEmitContextMenu(TDEListView*, TQListViewItem*,const TQPoint&)) }, + { TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), + TQ_SLOT(slotEmitDoubleClicked(TQListViewItem*,const TQPoint&,int)) }, + { TQ_SIGNAL(returnPressed(TQListViewItem*)), + TQ_SLOT(slotEmitReturnPressed(TQListViewItem*)) }, + { TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(slotEmitSelectionChanged(TQListViewItem*)) }, + { TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*,const TQPoint&)), + TQ_SLOT(slotEmitContextMenu(TDEListView*, TQListViewItem*,const TQPoint&)) }, }; static const int numSignalReplacements = sizeof signalReplacements / sizeof *signalReplacements; @@ -146,7 +146,7 @@ Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const Dis d = new Private(); d->updateTimer = new TQTimer( this ); - connect( d->updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdateTimeout()) ); + connect( d->updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotUpdateTimeout()) ); if ( !columnStrategy ) { kdWarning(5150) << "Kleo::KeyListView: need a column strategy to work with!" << endl; diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp index e245898e9..6dd1b05e5 100644 --- a/certmanager/lib/ui/keyrequester.cpp +++ b/certmanager/lib/ui/keyrequester.cpp @@ -130,8 +130,8 @@ void Kleo::KeyRequester::init() hlay->addWidget( mEraseButton ); hlay->addWidget( mDialogButton ); - connect( mEraseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEraseButtonClicked()) ); - connect( mDialogButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDialogButtonClicked()) ); + connect( mEraseButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEraseButtonClicked()) ); + connect( mDialogButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDialogButtonClicked()) ); setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); @@ -264,10 +264,10 @@ void Kleo::KeyRequester::startKeyListJob( const TQStringList & fingerprints ) { "Check your installation."), i18n("Key Listing Failed") ); } else { - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), - TQT_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + TQ_SLOT(slotNextKey(const GpgME::Key&)) ); const GpgME::Error err = job->start( fingerprints, mKeyUsage & Kleo::KeySelectionDialog::SecretKeys && @@ -288,10 +288,10 @@ void Kleo::KeyRequester::startKeyListJob( const TQStringList & fingerprints ) { "Check your installation."), i18n("Key Listing Failed") ); } else { - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), - TQT_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + TQ_SLOT(slotNextKey(const GpgME::Key&)) ); const GpgME::Error err = job->start( fingerprints, mKeyUsage & Kleo::KeySelectionDialog::SecretKeys && diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index 25a1a2256..1de21dc0c 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/certmanager/lib/ui/keyselectiondialog.cpp @@ -377,8 +377,8 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection if ( !text.isEmpty() ) { if ( text.startsWith( "<qt>" ) ) { KActiveLabel *textLabel = new KActiveLabel( text, page ); - disconnect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), textLabel, TQT_SLOT(openLink(const TQString&)) ); - connect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), TQT_SLOT(slotStartCertificateManager(const TQString&)) ); + disconnect( textLabel, TQ_SIGNAL(linkClicked(const TQString&)), textLabel, TQ_SLOT(openLink(const TQString&)) ); + connect( textLabel, TQ_SIGNAL(linkClicked(const TQString&)), TQ_SLOT(slotStartCertificateManager(const TQString&)) ); textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak ); mTopLayout->addWidget( textLabel ); } else { @@ -391,7 +391,7 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection TQPushButton * const searchExternalPB = new TQPushButton( i18n("Search for &External Certificates"), page ); mTopLayout->addWidget( searchExternalPB, 0, TQt::AlignLeft ); - connect( searchExternalPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStartSearchForExternalCertificates()) ); + connect( searchExternalPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStartSearchForExternalCertificates()) ); if ( initialQuery.isEmpty() ) searchExternalPB->hide(); @@ -406,10 +406,10 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection hlay->addWidget( le, 1 ); le->setFocus(); - connect( clearButton, TQT_SIGNAL( clicked() ), le, TQT_SLOT( clear() ) ); - connect( le, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotSearch(const TQString&)) ); - connect( mStartSearchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotFilter()) ); + connect( clearButton, TQ_SIGNAL( clicked() ), le, TQ_SLOT( clear() ) ); + connect( le, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotSearch(const TQString&)) ); + connect( mStartSearchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotFilter()) ); mKeyListView = new KeyListView( new ColumnStrategy( mKeyUsage ), 0, page, "mKeyListView" ); mKeyListView->setResizeMode( TQListView::LastColumn ); @@ -430,21 +430,21 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection "</p></qt>") ); } - connect( mCheckSelectionTimer, TQT_SIGNAL(timeout()), - TQT_SLOT(slotCheckSelection()) ); + connect( mCheckSelectionTimer, TQ_SIGNAL(timeout()), + TQ_SLOT(slotCheckSelection()) ); connectSignals(); connect( mKeyListView, - TQT_SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const TQPoint&,int)), - TQT_SLOT(slotTryOk()) ); + TQ_SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const TQPoint&,int)), + TQ_SLOT(slotTryOk()) ); connect( mKeyListView, - TQT_SIGNAL(contextMenu(Kleo::KeyListViewItem*,const TQPoint&)), - TQT_SLOT(slotRMB(Kleo::KeyListViewItem*,const TQPoint&)) ); + TQ_SIGNAL(contextMenu(Kleo::KeyListViewItem*,const TQPoint&)), + TQ_SLOT(slotRMB(Kleo::KeyListViewItem*,const TQPoint&)) ); setButtonText( KDialogBase::Default, i18n("&Reread Keys") ); setButtonGuiItem( KDialogBase::Help, i18n("&Start Certificate Manager") ); - connect( this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(slotRereadKeys()) ); - connect( this, TQT_SIGNAL(helpClicked()), this, TQT_SLOT(slotStartCertificateManager()) ); + connect( this, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(slotRereadKeys()) ); + connect( this, TQ_SIGNAL(helpClicked()), this, TQ_SLOT(slotStartCertificateManager()) ); slotRereadKeys(); mTopLayout->activate(); @@ -468,20 +468,20 @@ Kleo::KeySelectionDialog::~KeySelectionDialog() { void Kleo::KeySelectionDialog::connectSignals() { if ( mKeyListView->isMultiSelection() ) - connect( mKeyListView, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(slotSelectionChanged()) ); + connect( mKeyListView, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(slotSelectionChanged()) ); else - connect( mKeyListView, TQT_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)), - TQT_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) ); + connect( mKeyListView, TQ_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)), + TQ_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) ); } void Kleo::KeySelectionDialog::disconnectSignals() { if ( mKeyListView->isMultiSelection() ) - disconnect( mKeyListView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged()) ); + disconnect( mKeyListView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged()) ); else - disconnect( mKeyListView, TQT_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)), - this, TQT_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) ); + disconnect( mKeyListView, TQ_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)), + this, TQ_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) ); } const GpgME::Key & Kleo::KeySelectionDialog::selectedKey() const { @@ -593,12 +593,12 @@ void Kleo::KeySelectionDialog::startKeyListJobForBackend( const CryptoBackend::P return; } - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), mKeyListView, validate ? - TQT_SLOT(slotRefreshKey(const GpgME::Key&)) : - TQT_SLOT(slotAddKey(const GpgME::Key&)) ); + TQ_SLOT(slotRefreshKey(const GpgME::Key&)) : + TQ_SLOT(slotAddKey(const GpgME::Key&)) ); TQStringList fprs; std::transform( keys.begin(), keys.end(), std::back_inserter( fprs ), ExtractFingerprint() ); @@ -756,7 +756,7 @@ void Kleo::KeySelectionDialog::slotRMB( Kleo::KeyListViewItem * item, const TQPo mCurrentContextMenuItem = item; TQPopupMenu menu; - menu.insertItem( i18n( "Recheck Key" ), this, TQT_SLOT(slotRecheckKey()) ); + menu.insertItem( i18n( "Recheck Key" ), this, TQ_SLOT(slotRecheckKey()) ); menu.exec( p ); } diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp index f2771201d..68837d38b 100644 --- a/certmanager/lib/ui/passphrasedialog.cpp +++ b/certmanager/lib/ui/passphrasedialog.cpp @@ -90,7 +90,7 @@ Kleo::PassphraseDialog::PassphraseDialog( const TQString & msg, const TQString & vlay->addWidget( d->lineedit ); - connect( d->lineedit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotOk()) ); + connect( d->lineedit, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotOk()) ); disableResize(); } diff --git a/certmanager/lib/ui/progressbar.cpp b/certmanager/lib/ui/progressbar.cpp index 6fe2f5311..8c530a563 100644 --- a/certmanager/lib/ui/progressbar.cpp +++ b/certmanager/lib/ui/progressbar.cpp @@ -44,7 +44,7 @@ Kleo::ProgressBar::ProgressBar( TQWidget * parent, const char * name, WFlags f ) mRealProgress( -1 ) { mBusyTimer = new TQTimer( this ); - connect( mBusyTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotBusyTimerTick()) ); + connect( mBusyTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotBusyTimerTick()) ); fixup( true ); } diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp index 692ee4cbf..b99db7cb6 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/storedtransferjob.cpp b/certmanager/storedtransferjob.cpp index b9816c897..3803502de 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 ) |