From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 14 Apr 2011 20:16:30 +0000 Subject: Enable kdepim compilation under Qt4 This will likely break Qt3 compilation temporarily, which is an unintended side effect. A third and final kdepim commit will repair Qt3 compilation shortly. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- certmanager/certificateinfowidgetimpl.cpp | 14 +-- certmanager/certificatewizardimpl.cpp | 18 +-- certmanager/certmanager.cpp | 128 ++++++++++----------- certmanager/conf/appearanceconfigwidgetbase.ui | 6 +- certmanager/conf/dirservconfigpage.cpp | 4 +- certmanager/hierarchyanalyser.cpp | 2 +- certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp | 28 ++--- .../lib/backends/chiasmus/chiasmusbackend.cpp | 8 +- certmanager/lib/backends/chiasmus/chiasmusjob.cpp | 4 +- .../lib/backends/chiasmus/chiasmuslibrary.cpp | 4 +- .../lib/backends/chiasmus/obtainkeysjob.cpp | 2 +- certmanager/lib/backends/qgpgme/qgpgmebackend.cpp | 10 +- .../lib/backends/qgpgme/qgpgmecryptoconfig.cpp | 8 +- certmanager/lib/backends/qgpgme/qgpgmejob.cpp | 10 +- .../lib/backends/qgpgme/qgpgmekeylistjob.cpp | 2 +- .../backends/qgpgme/qgpgmeprogresstokenmapper.cpp | 10 +- certmanager/lib/cryptplugwrapper.cpp | 2 +- certmanager/lib/kleo/cryptobackendfactory.cpp | 10 +- certmanager/lib/kleo/dn.cpp | 2 +- certmanager/lib/kleo/hierarchicalkeylistjob.cpp | 4 +- certmanager/lib/kleo/multideletejob.cpp | 2 +- certmanager/lib/tests/test_keygen.cpp | 2 +- certmanager/lib/tests/test_keylister.cpp | 2 +- .../lib/ui/adddirectoryservicedialogimpl.cpp | 2 +- certmanager/lib/ui/backendconfigwidget.cpp | 2 +- certmanager/lib/ui/cryptoconfigmodule.cpp | 6 +- certmanager/lib/ui/directoryserviceswidgetbase.ui | 16 +-- certmanager/lib/ui/kdhorizontalline.cpp | 10 +- certmanager/lib/ui/keyapprovaldialog.cpp | 2 +- certmanager/lib/ui/keylistview.cpp | 4 +- certmanager/lib/ui/keyrequester.cpp | 2 +- certmanager/lib/ui/keyselectiondialog.cpp | 8 +- certmanager/lib/ui/messagebox.cpp | 8 +- certmanager/lib/ui/progressdialog.cpp | 2 +- certmanager/storedtransferjob.cpp | 2 +- 35 files changed, 173 insertions(+), 173 deletions(-) (limited to 'certmanager') diff --git a/certmanager/certificateinfowidgetimpl.cpp b/certmanager/certificateinfowidgetimpl.cpp index 8ce43aa53..9067672e2 100644 --- a/certmanager/certificateinfowidgetimpl.cpp +++ b/certmanager/certificateinfowidgetimpl.cpp @@ -126,7 +126,7 @@ void CertificateInfoWidgetImpl::setKey( const GpgME::Key & key ) { TQListViewItem * item = 0; item = new TQListViewItem( listView, item, i18n("Valid"), TQString("From %1 to %2") - .arg( time_t2string( key.subkey(0).creationTime() ), + .tqarg( time_t2string( key.subkey(0).creationTime() ), time_t2string( key.subkey(0).expirationTime() ) ) ); item = new TQListViewItem( listView, item, i18n("Can be used for signing"), key.canSign() ? i18n("Yes") : i18n("No") ); @@ -187,7 +187,7 @@ static void showChainListError( TQWidget * tqparent, const GpgME::Error & err, c const TQString msg = i18n("

An error occurred while fetching " "the certificate %1 from the backend:

" "

%2

") - .arg( subject ? TQString::fromUtf8( subject ) : TQString(), + .tqarg( subject ? TQString::fromUtf8( subject ) : TQString(), TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( tqparent, msg, i18n("Certificate Listing Failed" ) ); } @@ -253,7 +253,7 @@ void CertificateInfoWidgetImpl::startCertificateChainListing() { } void CertificateInfoWidgetImpl::startCertificateDump() { - KProcess* proc = new KProcess( this ); + KProcess* proc = new KProcess( TQT_TQOBJECT(this) ); (*proc) << "gpgsm"; // must be in the PATH (*proc) << "--dump-keys"; (*proc) << mChain.front().primaryFingerprint(); @@ -266,7 +266,7 @@ void CertificateInfoWidgetImpl::startCertificateDump() { this, TQT_SLOT( slotDumpProcessExited(KProcess*) ) ); if ( !proc->start( KProcess::NotifyOnExit, (KProcess::Communication)(KProcess::Stdout | KProcess::Stderr) ) ) { - TQString wmsg = i18n("Failed to execute gpgsm:\n%1").arg( i18n( "program not found" ) ); + TQString wmsg = i18n("Failed to execute gpgsm:\n%1").tqarg( i18n( "program not found" ) ); dumpView->setText( TQStyleSheet::escape( wmsg ) ); delete proc; } @@ -294,9 +294,9 @@ void CertificateInfoWidgetImpl::slotDumpProcessExited(KProcess* proc) { { TQString wmsg = i18n("Failed to execute gpgsm:\n%1"); if ( rc == -1 ) - wmsg = wmsg.arg( i18n( "program cannot be executed" ) ); + wmsg = wmsg.tqarg( i18n( "program cannot be executed" ) ); else - wmsg = wmsg.arg( strerror(rc) ); + wmsg = wmsg.tqarg( strerror(rc) ); dumpView->setText( TQStyleSheet::escape( wmsg ) ); } } @@ -328,7 +328,7 @@ void CertificateInfoWidgetImpl::updateChainView() { item = new TQListViewItem( pathView, Kleo::DN( (*it++).userID(0).id() ).prettyDN() ); else { item = new TQListViewItem( pathView, i18n("Issuer certificate not found ( %1)") - .arg( Kleo::DN( (*it).issuerName() ).prettyDN() ) ); + .tqarg( Kleo::DN( (*it).issuerName() ).prettyDN() ) ); item->setOpen( true ); // TQt bug: doesn't open after setEnabled( false ) :/ item->setEnabled( false ); } diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp index 3c618e738..89f4d66eb 100644 --- a/certmanager/certificatewizardimpl.cpp +++ b/certmanager/certificatewizardimpl.cpp @@ -88,10 +88,10 @@ static TQString attributeLabel( const TQString & attr, bool required ) { if ( !label.isEmpty() ) if ( required ) return i18n("Format string for the labels in the \"Your Personal Data\" page - required field", - "*%1 (%2):").arg( label, attr ); + "*%1 (%2):").tqarg( label, attr ); else return i18n("Format string for the labels in the \"Your Personal Data\" page", - "%1 (%2):").arg( label, attr ); + "%1 (%2):").tqarg( label, attr ); else if ( required ) return '*' + attr + ':'; @@ -196,7 +196,7 @@ void CertificateWizardImpl::slotGenerateCertificate() TQString certParms; certParms += "\n"; certParms += "Key-Type: RSA\n"; - certParms += TQString( "Key-Length: %1\n" ).arg( keyLengths[keyLengthCB->currentItem()] ); + certParms += TQString( "Key-Length: %1\n" ).tqarg( keyLengths[keyLengthCB->currentItem()] ); certParms += "Key-Usage: "; if ( signOnlyCB->isChecked() ) certParms += "Sign"; @@ -255,7 +255,7 @@ void CertificateWizardImpl::slotGenerateCertificate() if ( err ) KMessageBox::error( this, i18n( "Could not start certificate generation: %1" ) - .arg( TQString::fromLocal8Bit( err.asString() ) ), + .tqarg( TQString::fromLocal8Bit( err.asString() ) ), i18n( "Certificate Manager Error" ) ); else { generatePB->setEnabled( false ); @@ -278,7 +278,7 @@ void CertificateWizardImpl::slotResult( const GpgME::KeyGenerationResult & res, if ( !res.error().isCanceled() ) KMessageBox::error( this, i18n( "Could not generate certificate: %1" ) - .arg( TQString::tqfromLatin1( res.error().asString() ) ), + .tqarg( TQString::tqfromLatin1( res.error().asString() ) ), i18n( "Certificate Manager Error" ) ); } else { // next will stay enabled until the user clicks Generate @@ -362,7 +362,7 @@ void CertificateWizardImpl::createPersonalDataPage() if ( config.entryIsImmutable( attr ) ) le->setEnabled( false ); - _attrPairList.append(qMakePair(key, le)); + _attrPairList.append(tqMakePair(key, le)); connect( le, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotEnablePersonalDataPageExit()) ); @@ -391,7 +391,7 @@ void CertificateWizardImpl::slotURLSelected( const TQString& _url ) // The application/pkcs10 mimetype didn't have a native extension, // so the filedialog didn't have the checkbox for auto-adding it. TQString fileName = url.fileName(); - int pos = fileName.findRev( '.' ); + int pos = fileName.tqfindRev( '.' ); if ( pos < 0 ) // no extension url.setFileName( fileName + ".p10" ); #endif @@ -434,7 +434,7 @@ void CertificateWizardImpl::sendCertificate( const TQString& email, const TQByte if ( result != 0 ) { kdDebug() << "Couldn't connect to KMail\n"; KMessageBox::error( this, - i18n( "DCOP Communication Error, unable to send certificate using KMail.\n%1" ).arg( error ) ); + i18n( "DCOP Communication Error, unable to send certificate using KMail.\n%1" ).tqarg( error ) ); return; } @@ -481,7 +481,7 @@ void CertificateWizardImpl::accept() if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel( this, i18n( "A file named \"%1\" already exists. " - "Are you sure you want to overwrite it?" ).arg( url.prettyURL() ), + "Are you sure you want to overwrite it?" ).tqarg( url.prettyURL() ), i18n( "Overwrite File?" ), i18n( "&Overwrite" ) ) ) return; diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp index 59fc73766..5f70bc220 100644 --- a/certmanager/certmanager.cpp +++ b/certmanager/certmanager.cpp @@ -2,7 +2,7 @@ certmanager.cpp This file is part of Kleopatra, the KDE keymanager - Copyright (c) 2001,2002,2004 Klarälvdalens Datakonsult AB + Copyright (c) 2001,2002,2004 Klar�lvdalens Datakonsult AB Kleopatra is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -252,23 +252,23 @@ static inline void connectEnableOperationSignal( TQObject * s, TQObject * d ) { void CertManager::createActions() { KAction * action = 0; - (void)KStdAction::quit( this, TQT_SLOT(close()), actionCollection() ); + (void)KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() ); - action = KStdAction::redisplay( this, TQT_SLOT(slotRedisplay()), actionCollection() ); + action = KStdAction::redisplay( TQT_TQOBJECT(this), TQT_SLOT(slotRedisplay()), actionCollection() ); // work around the fact that the stdaction has no shortcut KShortcut reloadShortcut = KStdAccel::shortcut(KStdAccel::Reload); reloadShortcut.append(KKey(CTRL + Key_R)); action->setShortcut( reloadShortcut ); - connectEnableOperationSignal( this, action ); + connectEnableOperationSignal( TQT_TQOBJECT(this), action ); action = new KAction( i18n("Stop Operation"), "stop", Key_Escape, - this, TQT_SIGNAL(stopOperations()), + TQT_TQOBJECT(this), TQT_SIGNAL(stopOperations()), actionCollection(), "view_stop_operations" ); action->setEnabled( false ); (void) new KAction( i18n("New Key Pair..."), "filenew", 0, - this, TQT_SLOT(newCertificate()), + TQT_TQOBJECT(this), TQT_SLOT(newCertificate()), actionCollection(), "file_new_certificate" ); connect( new KToggleAction( i18n("Hierarchical Key List"), 0, @@ -276,100 +276,100 @@ void CertManager::createActions() { TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleHierarchicalView(bool)) ); action = new KAction( i18n("Expand All"), 0, CTRL+Key_Period, - this, TQT_SLOT(slotExpandAll()), + TQT_TQOBJECT(this), TQT_SLOT(slotExpandAll()), actionCollection(), "view_expandall" ); action = new KAction( i18n("Collapse All"), 0, CTRL+Key_Comma, - this, TQT_SLOT(slotCollapseAll()), + TQT_TQOBJECT(this), TQT_SLOT(slotCollapseAll()), actionCollection(), "view_collapseall" ); (void) new KAction( i18n("Refresh CRLs"), 0, 0, - this, TQT_SLOT(slotRefreshKeys()), + TQT_TQOBJECT(this), TQT_SLOT(slotRefreshKeys()), actionCollection(), "certificates_refresh_clr" ); #ifdef NOT_IMPLEMENTED_ANYWAY mRevokeCertificateAction = new KAction( i18n("Revoke"), 0, - this, TQT_SLOT(revokeCertificate()), + TQT_TQOBJECT(this), TQT_SLOT(revokeCertificate()), actionCollection(), "edit_revoke_certificate" ); connectEnableOperationSignal( this, mRevokeCertificateAction ); mExtendCertificateAction = new KAction( i18n("Extend"), 0, - this, TQT_SLOT(extendCertificate()), + TQT_TQOBJECT(this), TQT_SLOT(extendCertificate()), actionCollection(), "edit_extend_certificate" ); connectEnableOperationSignal( this, mExtendCertificateAction ); #endif mDeleteCertificateAction = new KAction( i18n("Delete"), "editdelete", Key_Delete, - this, TQT_SLOT(slotDeleteCertificate()), + TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCertificate()), actionCollection(), "edit_delete_certificate" ); - connectEnableOperationSignal( this, mDeleteCertificateAction ); + connectEnableOperationSignal( TQT_TQOBJECT(this), mDeleteCertificateAction ); mValidateCertificateAction = new KAction( i18n("Validate"), "reload", SHIFT + Key_F5, - this, TQT_SLOT(slotValidate()), + TQT_TQOBJECT(this), TQT_SLOT(slotValidate()), actionCollection(), "certificates_validate" ); - connectEnableOperationSignal( this, mValidateCertificateAction ); + connectEnableOperationSignal( TQT_TQOBJECT(this), mValidateCertificateAction ); mImportCertFromFileAction = new KAction( i18n("Import Certificates..."), 0, - this, TQT_SLOT(slotImportCertFromFile()), + TQT_TQOBJECT(this), TQT_SLOT(slotImportCertFromFile()), actionCollection(), "file_import_certificates" ); - connectEnableOperationSignal( this, mImportCertFromFileAction ); + connectEnableOperationSignal( TQT_TQOBJECT(this), mImportCertFromFileAction ); mImportCRLFromFileAction = new KAction( i18n("Import CRLs..."), 0, - this, TQT_SLOT(importCRLFromFile()), + TQT_TQOBJECT(this), TQT_SLOT(importCRLFromFile()), actionCollection(), "file_import_crls" ); - connectEnableOperationSignal( this, mImportCRLFromFileAction ); + connectEnableOperationSignal( TQT_TQOBJECT(this), mImportCRLFromFileAction ); mExportCertificateAction = new KAction( i18n("Export Certificates..."), "export", 0, - this, TQT_SLOT(slotExportCertificate()), + TQT_TQOBJECT(this), TQT_SLOT(slotExportCertificate()), actionCollection(), "file_export_certificate" ); mExportSecretKeyAction = new KAction( i18n("Export Secret Key..."), "export", 0, - this, TQT_SLOT(slotExportSecretKey()), + TQT_TQOBJECT(this), TQT_SLOT(slotExportSecretKey()), actionCollection(), "file_export_secret_keys" ); - connectEnableOperationSignal( this, mExportSecretKeyAction ); + connectEnableOperationSignal( TQT_TQOBJECT(this), mExportSecretKeyAction ); mViewCertDetailsAction = new KAction( i18n("Certificate Details..."), 0, 0, - this, TQT_SLOT(slotViewDetails()), actionCollection(), + TQT_TQOBJECT(this), TQT_SLOT(slotViewDetails()), actionCollection(), "view_certificate_details" ); mDownloadCertificateAction = new KAction( i18n( "Download"), 0, 0, - this, TQT_SLOT(slotDownloadCertificate()), actionCollection(), + TQT_TQOBJECT(this), TQT_SLOT(slotDownloadCertificate()), actionCollection(), "download_certificate" ); const TQString dirmngr = KStandardDirs::findExe( "gpgsm" ); mDirMngrFound = !dirmngr.isEmpty(); action = new KAction( i18n("Dump CRL Cache..."), 0, - this, TQT_SLOT(slotViewCRLs()), + TQT_TQOBJECT(this), TQT_SLOT(slotViewCRLs()), actionCollection(), "crl_dump_crl_cache" ); action->setEnabled( mDirMngrFound ); // we also need dirmngr for this action = new KAction( i18n("Clear CRL Cache..."), 0, - this, TQT_SLOT(slotClearCRLs()), + TQT_TQOBJECT(this), TQT_SLOT(slotClearCRLs()), actionCollection(), "crl_clear_crl_cache" ); action->setEnabled( mDirMngrFound ); // we also need dirmngr for this - action = new KAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, this, + action = new KAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg"); // disable action if no kwatchgnupg binary is around if (KStandardDirs::findExe("kwatchgnupg").isEmpty()) action->setEnabled(false); (void)new LabelAction( i18n("Search:"), actionCollection(), "label_action" ); - mLineEditAction = new LineEditAction( TQString(), actionCollection(), this, + mLineEditAction = new LineEditAction( TQString(), actionCollection(), TQT_TQOBJECT(this), TQT_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(), TQT_TQOBJECT(this), TQT_SLOT( slotToggleRemote(int) ), "location_combo_action", mNextFindRemote? 1 : 0 ); - mFindAction = new KAction( i18n("Find"), "tqfind", 0, this, TQT_SLOT(slotSearch()), + mFindAction = new KAction( i18n("Find"), "tqfind", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearch()), actionCollection(), "tqfind" ); - KStdAction::keyBindings( this, TQT_SLOT(slotEditKeybindings()), actionCollection() ); - KStdAction::preferences( this, TQT_SLOT(slotShowConfigurationDialog()), actionCollection() ); + KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotEditKeybindings()), actionCollection() ); + KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotShowConfigurationDialog()), actionCollection() ); - new KAction( i18n( "Configure &GpgME Backend" ), 0, 0, this, TQT_SLOT(slotConfigureGpgME()), + new KAction( i18n( "Configure &GpgME Backend" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureGpgME()), actionCollection(), "configure_gpgme" ); createStandardStatusBarAction(); @@ -523,7 +523,7 @@ void CertManager::slotRefreshKeysResult( const GpgME::Error & err ) { return; if ( err ) KMessageBox::error( this, i18n("An error occurred while trying to refresh " - "keys:\n%1").arg( TQString::fromLocal8Bit( err.asString() ) ), + "keys:\n%1").tqarg( TQString::fromLocal8Bit( err.asString() ) ), i18n("Refreshing Keys Failed") ); } @@ -532,7 +532,7 @@ static void showKeyListError( TQWidget * tqparent, const GpgME::Error & err ) { const TQString msg = i18n( "

An error occurred while fetching " "the certificates from the backend:

" "

%1

" ) - .arg( TQString::fromLocal8Bit( err.asString() ) ); + .tqarg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( tqparent, msg, i18n( "Certificate Listing Failed" ) ); } @@ -592,7 +592,7 @@ static void selectKeys( Kleo::KeyListView * lv, const std::set & fp for ( TQListViewItemIterator it( lv ) ; it.current() ; ++it ) if ( Kleo::KeyListViewItem * item = Kleo::lvi_cast( it.current() ) ) { const char * fpr = item->key().primaryFingerprint(); - item->setSelected( fpr && fprs.tqfind( fpr ) != fprs.end() ); + item->setSelected( fpr && fprs.find( fpr ) != fprs.end() ); } } @@ -705,8 +705,8 @@ static void showCertificateDownloadError( TQWidget * tqparent, const GpgME::Erro const TQString msg = i18n( "

An error occurred while trying " "to download the certificate %1:

" "

%2

" ) - .arg( certDisplayName ) - .arg( TQString::fromLocal8Bit( err.asString() ) ); + .tqarg( certDisplayName ) + .tqarg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( tqparent, msg, i18n( "Certificate Download Failed" ) ); } @@ -773,8 +773,8 @@ static void showCertificateImportError( TQWidget * tqparent, const GpgME::Error const TQString msg = i18n( "

An error occurred while trying " "to import the certificate %1:

" "

%2

" ) - .arg( certDisplayName ) - .arg( TQString::fromLocal8Bit( err.asString() ) ); + .tqarg( certDisplayName ) + .tqarg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( tqparent, msg, i18n( "Certificate Import Failed" ) ); } @@ -810,50 +810,50 @@ void CertManager::slotCertificateImportResult( const GpgME::ImportResult & res ) const TQString boldLine = i18n("%1%2"); TQStringList lines; - lines.push_back( normalLine.arg( i18n("Total number processed:"), + lines.push_back( normalLine.tqarg( i18n("Total number processed:"), TQString::number( res.numConsidered() ) ) ); - lines.push_back( normalLine.arg( i18n("Imported:"), + lines.push_back( normalLine.tqarg( i18n("Imported:"), TQString::number( res.numImported() ) ) ); if ( res.newSignatures() ) - lines.push_back( normalLine.arg( i18n("New signatures:"), + lines.push_back( normalLine.tqarg( i18n("New signatures:"), TQString::number( res.newSignatures() ) ) ); if ( res.newUserIDs() ) - lines.push_back( normalLine.arg( i18n("New user IDs:"), + lines.push_back( normalLine.tqarg( i18n("New user IDs:"), TQString::number( res.newUserIDs() ) ) ); if ( res.numKeysWithoutUserID() ) - lines.push_back( normalLine.arg( i18n("Keys without user IDs:"), + lines.push_back( normalLine.tqarg( i18n("Keys without user IDs:"), TQString::number( res.numKeysWithoutUserID() ) ) ); if ( res.newSubkeys() ) - lines.push_back( normalLine.arg( i18n("New subkeys:"), + lines.push_back( normalLine.tqarg( i18n("New subkeys:"), TQString::number( res.newSubkeys() ) ) ); if ( res.newRevocations() ) - lines.push_back( boldLine.arg( i18n("Newly revoked:"), + lines.push_back( boldLine.tqarg( i18n("Newly revoked:"), TQString::number( res.newRevocations() ) ) ); if ( res.notImported() ) - lines.push_back( boldLine.arg( i18n("Not imported:"), + lines.push_back( boldLine.tqarg( i18n("Not imported:"), TQString::number( res.notImported() ) ) ); if ( res.numUnchanged() ) - lines.push_back( normalLine.arg( i18n("Unchanged:"), + lines.push_back( normalLine.tqarg( i18n("Unchanged:"), TQString::number( res.numUnchanged() ) ) ); if ( res.numSecretKeysConsidered() ) - lines.push_back( normalLine.arg( i18n("Secret keys processed:"), + lines.push_back( normalLine.tqarg( i18n("Secret keys processed:"), TQString::number( res.numSecretKeysConsidered() ) ) ); if ( res.numSecretKeysImported() ) - lines.push_back( normalLine.arg( i18n("Secret keys imported:"), + lines.push_back( normalLine.tqarg( i18n("Secret keys imported:"), TQString::number( res.numSecretKeysImported() ) ) ); if ( res.numSecretKeysConsidered() - res.numSecretKeysImported() - res.numSecretKeysUnchanged() > 0 ) - lines.push_back( boldLine.arg( i18n("Secret keys not imported:"), + lines.push_back( boldLine.tqarg( i18n("Secret keys not imported:"), TQString::number( res.numSecretKeysConsidered() - res.numSecretKeysImported() - res.numSecretKeysUnchanged() ) ) ); if ( res.numSecretKeysUnchanged() ) - lines.push_back( normalLine.arg( i18n("Secret keys unchanged:"), + lines.push_back( normalLine.tqarg( i18n("Secret keys unchanged:"), TQString::number( res.numSecretKeysUnchanged() ) ) ); KMessageBox::information( this, i18n( "

Detailed results of importing %1:

" "%2
" ) - .arg( displayName ).arg( lines.join( TQString() ) ), + .tqarg( displayName ).tqarg( lines.join( TQString() ) ), i18n( "Certificate Import Result" ) ); disconnectJobFromStatusBarProgress( res.error() ); @@ -875,7 +875,7 @@ void CertManager::slotDirmngrExited() { if ( !mDirmngrProc->normalExit() ) KMessageBox::error( this, i18n( "The GpgSM process that tried to import the CRL file ended prematurely because of an unexpected error." ), i18n( "Certificate Manager Error" ) ); else if ( mDirmngrProc->exitStatus() ) - KMessageBox::error( this, i18n( "An error occurred when trying to import the CRL file. The output from GpgSM was:\n%1").arg( mErrorbuffer ), i18n( "Certificate Manager Error" ) ); + KMessageBox::error( this, i18n( "An error occurred when trying to import the CRL file. The output from GpgSM was:\n%1").tqarg( mErrorbuffer ), i18n( "Certificate Manager Error" ) ); else KMessageBox::information( this, i18n( "CRL file imported successfully." ), i18n( "Certificate Manager Information" ) ); @@ -935,7 +935,7 @@ bool CertManager::connectAndStartDirmngr( const char * slot, const char * proces this, TQT_SLOT(slotStderr(KProcess*,char*,int)) ); if( !mDirmngrProc->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) { delete mDirmngrProc; mDirmngrProc = 0; - KMessageBox::error( this, i18n( "Unable to start %1 process. Please check your installation." ).arg( processname ), i18n( "Certificate Manager Error" ) ); + KMessageBox::error( this, i18n( "Unable to start %1 process. Please check your installation." ).tqarg( processname ), i18n( "Certificate Manager Error" ) ); return false; } return true; @@ -992,7 +992,7 @@ void CertManager::slotClearCRLsResult() { if ( !mDirmngrProc->normalExit() ) KMessageBox::error( this, i18n( "The DirMngr process that tried to clear the CRL cache ended prematurely because of an unexpected error." ), i18n( "Certificate Manager Error" ) ); else if ( mDirmngrProc->exitStatus() ) - KMessageBox::error( this, i18n( "An error occurred when trying to clear the CRL cache. The output from DirMngr was:\n%1").arg( mErrorbuffer ), i18n( "Certificate Manager Error" ) ); + KMessageBox::error( this, i18n( "An error occurred when trying to clear the CRL cache. The output from DirMngr was:\n%1").tqarg( mErrorbuffer ), i18n( "Certificate Manager Error" ) ); else KMessageBox::information( this, i18n( "CRL cache cleared successfully." ), i18n( "Certificate Manager Information" ) ); delete mDirmngrProc; mDirmngrProc = 0; @@ -1003,7 +1003,7 @@ static void showDeleteError( TQWidget * tqparent, const GpgME::Error & err ) { const TQString msg = i18n("

An error occurred while trying to delete " "the certificates:

" "

%1

") - .arg( TQString::fromLocal8Bit( err.asString() ) ); + .tqarg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( tqparent, msg, i18n("Certificate Deletion Failed") ); } @@ -1031,7 +1031,7 @@ void CertManager::slotDeleteCertificate() { return; if ( !mHierarchyAnalyser ) { - mHierarchyAnalyser = new HierarchyAnalyser( this, "mHierarchyAnalyser" ); + mHierarchyAnalyser = new HierarchyAnalyser( TQT_TQOBJECT(this), "mHierarchyAnalyser" ); Kleo::KeyListJob * job = Kleo::CryptoBackendFactory::instance()->smime()->keyListJob(); assert( job ); connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), @@ -1076,7 +1076,7 @@ void CertManager::slotDeleteCertificate() { const TQString msg = keysToDelete.size() > keys.size() ? i18n("Do you really want to delete this certificate and the %1 certificates it certified?", "Do you really want to delete these %n certificates and the %1 certificates they certified?", - keys.size() ).arg( keysToDelete.size() - keys.size() ) + keys.size() ).tqarg( keysToDelete.size() - keys.size() ) : i18n("Do you really want to delete this certificate?", "Do you really want to delete these %n certificates?", keys.size() ) ; @@ -1098,7 +1098,7 @@ void CertManager::slotDeleteCertificate() { "the certificates:

" "

%1

" ); KMessageBox::error( this, - str.arg( i18n("Operation not supported by the backend.") ), + str.tqarg( i18n("Operation not supported by the backend.") ), i18n("Certificate Deletion Failed") ); } @@ -1206,7 +1206,7 @@ static void showCertificateExportError( TQWidget * tqparent, const GpgME::Error const TQString msg = i18n("

An error occurred while trying to export " "the certificate:

" "

%1

") - .arg( TQString::fromLocal8Bit( err.asString() ) ); + .tqarg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( tqparent, msg, i18n("Certificate Export Failed") ); } @@ -1239,7 +1239,7 @@ static bool checkOverwrite( const KURL& url, bool& overwrite, TQWidget* w ) KMessageBox::warningContinueCancel( w, i18n( "A file named \"%1\" already exists. " - "Are you sure you want to overwrite it?" ).arg( url.prettyURL() ), + "Are you sure you want to overwrite it?" ).tqarg( url.prettyURL() ), i18n( "Overwrite File?" ), i18n( "&Overwrite" ) ) ) return false; @@ -1301,7 +1301,7 @@ static void showSecretKeyExportError( TQWidget * tqparent, const GpgME::Error & const TQString msg = i18n("

An error occurred while trying to export " "the secret key:

" "

%1

") - .arg( TQString::fromLocal8Bit( err.asString() ) ); + .tqarg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( tqparent, msg, i18n("Secret-Key Export Failed") ); } diff --git a/certmanager/conf/appearanceconfigwidgetbase.ui b/certmanager/conf/appearanceconfigwidgetbase.ui index 9fb7af203..0d059cf64 100644 --- a/certmanager/conf/appearanceconfigwidgetbase.ui +++ b/certmanager/conf/appearanceconfigwidgetbase.ui @@ -162,9 +162,9 @@ categoriesLV - selectionChanged(QListViewItem*) + selectionChanged(TQListViewItem*) AppearanceConfigWidgetBase - slotSelectionChanged(QListViewItem*) + slotSelectionChanged(TQListViewItem*) defaultLookPB @@ -205,7 +205,7 @@ slotForegroundClicked() slotBackgroundClicked() slotFontClicked() - slotSelectionChanged( QListViewItem * ) + slotSelectionChanged( TQListViewItem * ) slotDefaultClicked() slotItalicClicked() slotBoldClicked() diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp index fb367fd32..9647f6b81 100644 --- a/certmanager/conf/dirservconfigpage.cpp +++ b/certmanager/conf/dirservconfigpage.cpp @@ -283,11 +283,11 @@ Kleo::CryptoConfigEntry* DirectoryServicesConfigurationPage::configEntry( const { Kleo::CryptoConfigEntry* entry = mConfig->entry( componentName, groupName, entryName ); if ( !entry ) { - KMessageBox::error( this, i18n( "Backend error: gpgconf does not seem to know the entry for %1/%2/%3" ).arg( componentName, groupName, entryName ) ); + KMessageBox::error( this, i18n( "Backend error: gpgconf does not seem to know the entry for %1/%2/%3" ).tqarg( componentName, groupName, entryName ) ); return 0; } if( entry->argType() != argType || entry->isList() != isList ) { - KMessageBox::error( this, i18n( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).arg( componentName, groupName, entryName ).arg( entry->argType() ).arg( entry->isList() ) ); + KMessageBox::error( this, i18n( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).tqarg( componentName, groupName, entryName ).tqarg( entry->argType() ).tqarg( entry->isList() ) ); return 0; } return entry; diff --git a/certmanager/hierarchyanalyser.cpp b/certmanager/hierarchyanalyser.cpp index 96979adf4..39322abce 100644 --- a/certmanager/hierarchyanalyser.cpp +++ b/certmanager/hierarchyanalyser.cpp @@ -63,7 +63,7 @@ void HierarchyAnalyser::slotNextKey( const GpgME::Key & key ) { const std::vector & HierarchyAnalyser::subjectsForIssuer( const char * issuer_dn ) const { static const std::vector empty; std::map< TQCString, std::vector >::const_iterator it = - mSubjectsByIssuer.tqfind( issuer_dn ); + mSubjectsByIssuer.find( issuer_dn ); return it == mSubjectsByIssuer.end() ? empty : it->second ; } diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp index 01340ecd2..4c6ecbfb5 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp @@ -90,20 +90,20 @@ KWatchGnuPGMainWindow::~KWatchGnuPGMainWindow() void KWatchGnuPGMainWindow::slotClear() { mCentralWidget->clear(); - mCentralWidget->append( tr("[%1] Log cleared").arg( TQDateTime::tqcurrentDateTime().toString(TQt::ISODate) ) ); + mCentralWidget->append( tqtr("[%1] Log cleared").tqarg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) ) ); } void KWatchGnuPGMainWindow::createActions() { (void)new KAction( i18n("C&lear History"), "history_clear", CTRL+Key_L, - this, TQT_SLOT( slotClear() ), + TQT_TQOBJECT(this), TQT_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( 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()); #if 0 (void)new KAction( i18n("Configure KWatchGnuPG..."), TQString::tqfromLatin1("configure"), @@ -134,8 +134,8 @@ void KWatchGnuPGMainWindow::startWatcher() while( mWatcher->isRunning() ) { kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput); } - mCentralWidget->append(tr("[%1] Log stopped") - .arg( TQDateTime::tqcurrentDateTime().toString(TQt::ISODate))); + mCentralWidget->append(tqtr("[%1] Log stopped") + .tqarg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate))); } mWatcher->clearArguments(); KConfig* config = kapp->config(); @@ -147,8 +147,8 @@ 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( tr("[%1] Log started") - .arg( TQDateTime::tqcurrentDateTime().toString(TQt::ISODate) ) ); + mCentralWidget->append( tqtr("[%1] Log started") + .tqarg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) ) ); } connect( mWatcher, TQT_SIGNAL( processExited(KProcess*) ), this, TQT_SLOT( slotWatcherExited() ) ); @@ -176,7 +176,7 @@ void KWatchGnuPGMainWindow::setGnuPGConfig() entry->setStringValue( TQString("socket://")+ config->readEntry("Socket", WATCHGNUPGSOCKET )); - logclients << TQString("%1 (%2)").arg(*it).arg(comp->description()); + logclients << TQString("%1 (%2)").tqarg(*it).tqarg(comp->description()); } entry = group->entry("debug-level"); if( entry ) { @@ -237,7 +237,7 @@ void KWatchGnuPGMainWindow::slotSaveAs() if( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("The file named \"%1\" already " "exists. Are you sure you want " - "to overwrite it?").arg(filename), + "to overwrite it?").tqarg(filename), i18n("Overwrite File"), i18n("Overwrite"), KStdGuiItem::cancel() ) ) { return; } diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp index 5ce7f617f..f27dad3b6 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp @@ -432,13 +432,13 @@ Kleo::CryptoBackend::Protocol * Kleo::ChiasmusBackend::protocol( const char * na bool Kleo::ChiasmusBackend::checkForOpenPGP( TQString * reason ) const { if ( reason ) - *reason = i18n( "Unsupported protocol \"%1\"" ).arg( "OpenPGP" ); + *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( "OpenPGP" ); return false; } bool Kleo::ChiasmusBackend::checkForSMIME( TQString * reason ) const { if ( reason ) - *reason = i18n( "Unsupported protocol \"%1\"" ).arg( "SMIME" ); + *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( "SMIME" ); return false; } @@ -454,7 +454,7 @@ bool Kleo::ChiasmusBackend::checkForChiasmus( TQString * reason ) const { const TQFileInfo fi( KShell::tildeExpand( chiasmus ) ); if ( !fi.isExecutable() ) { if ( reason ) - *reason = i18n( "File \"%1\" does not exist or is not executable." ).arg( chiasmus ); + *reason = i18n( "File \"%1\" does not exist or is not executable." ).tqarg( chiasmus ); return false; } @@ -467,7 +467,7 @@ bool Kleo::ChiasmusBackend::checkForProtocol( const char * name, TQString * reas if ( qstricmp( name, "Chiasmus" ) == 0 ) return checkForChiasmus( reason ); if ( reason ) - *reason = i18n( "Unsupported protocol \"%1\"" ).arg( name ); + *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( name ); return 0; } diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp index c6b718ca8..eb5a5ea38 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp @@ -208,9 +208,9 @@ void Kleo::ChiasmusJob::showErrorDialog( TQWidget * tqparent, const TQString & c const TQString msg = ( mMode == Encrypt ? i18n( "Encryption failed: %1" ) : i18n( "Decryption failed: %1" ) ) - .arg( TQString::fromLocal8Bit( mError.asString() ) ); + .tqarg( TQString::fromLocal8Bit( mError.asString() ) ); if ( !mStderr.isEmpty() ) { - const TQString details = i18n( "The following was received on stderr:\n%1" ).arg( mStderr ); + const TQString details = i18n( "The following was received on stderr:\n%1" ).tqarg( mStderr ); KMessageBox::detailedError( tqparent, msg, details, caption ); } else { KMessageBox::error( tqparent, msg, caption ); diff --git a/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp b/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp index 002bf0182..a57685f28 100644 --- a/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp @@ -71,7 +71,7 @@ Kleo::ChiasmusLibrary::main_func Kleo::ChiasmusLibrary::chiasmus( TQString * rea if ( !mXiaLibrary ) { if ( reason ) *reason = i18n( "Failed to load %1: %2" ) - .arg( libfile,KLibLoader::self()->lastErrorMessage() ); + .tqarg( libfile,KLibLoader::self()->lastErrorMessage() ); kdDebug(5150) << "ChiasmusLibrary: loading \"" << libfile << "\" failed: " << KLibLoader::self()->lastErrorMessage() << endl; return 0; @@ -79,7 +79,7 @@ Kleo::ChiasmusLibrary::main_func Kleo::ChiasmusLibrary::chiasmus( TQString * rea if ( !mXiaLibrary->hasSymbol( "Chiasmus" ) ) { if ( reason ) *reason = i18n( "Failed to load %1: %2" ) - .arg( libfile, i18n( "Library does not contain the symbol \"Chiasmus\"." ) ); + .tqarg( libfile, i18n( "Library does not contain the symbol \"Chiasmus\"." ) ); kdDebug(5150) << "ChiasmusLibrary: loading \"" << libfile << "\" failed: " << "Library does not contain the symbol \"Chiasmus\"." << endl; return 0; diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp index fe0b19b1e..497a5a54d 100644 --- a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp +++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp @@ -96,7 +96,7 @@ void Kleo::ObtainKeysJob::slotPerform( bool async ) { return; } - emit progress( i18n( "Scanning directory %1..." ).arg( mKeyPaths[mIndex] ), + emit progress( i18n( "Scanning directory %1..." ).tqarg( mKeyPaths[mIndex] ), mIndex, mKeyPaths.size() ); const TQDir dir( KShell::tildeExpand( mKeyPaths[mIndex] ) ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp index 27680585b..9594edfa2 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp @@ -88,15 +88,15 @@ static bool check( GpgME::Context::Protocol proto, TQString * reason ) { // error, check why: const GpgME::EngineInfo ei = GpgME::engineInfo( proto ); if ( ei.isNull() ) - *reason = i18n("GPGME was compiled without support for %1.").arg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" ); + *reason = i18n("GPGME was compiled without support for %1.").tqarg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" ); else if ( ei.fileName() && !ei.version() ) - *reason = i18n("Engine %1 is not installed properly.").arg( TQFile::decodeName( ei.fileName() ) ); + *reason = i18n("Engine %1 is not installed properly.").tqarg( TQFile::decodeName( ei.fileName() ) ); else if ( ei.fileName() && ei.version() && ei.requiredVersion() ) *reason = i18n("Engine %1 version %2 installed, " "but at least version %3 is required.") - .arg( TQFile::decodeName( ei.fileName() ), ei.version(), ei.requiredVersion() ); + .tqarg( TQFile::decodeName( ei.fileName() ), ei.version(), ei.requiredVersion() ); else - *reason = i18n("Unknown problem with engine for protocol %1.").arg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" ); + *reason = i18n("Unknown problem with engine for protocol %1.").tqarg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" ); return false; } @@ -114,7 +114,7 @@ bool Kleo::QGpgMEBackend::checkForProtocol( const char * name, TQString * reason if ( qstricmp( name, SMIME ) == 0 ) return check( GpgME::Context::CMS, reason ); if ( reason ) - *reason = i18n( "Unsupported protocol \"%1\"" ).arg( name ); + *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( name ); return false; } diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp index 3aa3b336b..312246851 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp @@ -89,11 +89,11 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors ) if ( showErrors && rc != 0 ) { TQString wmsg = i18n("Failed to execute gpgconf:
%1"); if ( rc == -1 ) - wmsg = wmsg.arg( i18n( "program not found" ) ); + wmsg = wmsg.tqarg( i18n( "program not found" ) ); else if ( rc == -2 ) - wmsg = wmsg.arg( i18n( "program cannot be executed" ) ); + wmsg = wmsg.tqarg( i18n( "program cannot be executed" ) ); else - wmsg = wmsg.arg( strerror(rc) ); + wmsg = wmsg.tqarg( strerror(rc) ); kdWarning(5150) << wmsg << endl; // to see it from test_cryptoconfig.cpp KMessageBox::error(0, wmsg); } @@ -306,7 +306,7 @@ void QGpgMECryptoConfigComponent::sync( bool runtime ) } else if( rc != 0 ) // Happens due to bugs in gpgconf (e.g. issues 104/115) { - TQString wmsg = i18n( "Error from gpgconf while saving configuration: %1" ).arg( TQString::fromLocal8Bit( strerror( rc ) ) ); + TQString wmsg = i18n( "Error from gpgconf while saving configuration: %1" ).tqarg( TQString::fromLocal8Bit( strerror( rc ) ) ); kdWarning(5150) << k_funcinfo << ":" << strerror( rc ) << endl; KMessageBox::error(0, wmsg); } diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp index 61da793ed..e55f237dc 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp @@ -276,21 +276,21 @@ char * Kleo::QGpgMEJob::getPassphrase( const char * useridHint, const char * /*d TQString msg = previousWasBad ? i18n( "You need a passphrase to unlock the secret key for user:
%1 (retry)" ) : i18n( "You need a passphrase to unlock the secret key for user:
%1" ); - msg = msg.arg( TQString::fromUtf8( useridHint ) ) + "

"; + msg = msg.tqarg( TQString::fromUtf8( useridHint ) ) + "

"; msg.prepend( "" ); msg += i18n( "This dialog will reappear every time the passphrase is needed. For a more secure solution that also allows caching the passphrase, use gpg-agent." ) + "
"; const TQString gpgAgent = KStandardDirs::findExe( "gpg-agent" ); if ( !gpgAgent.isEmpty() ) { msg += i18n( "gpg-agent was found in %1, but does not appear to be running." ) - .arg( gpgAgent ); + .tqarg( gpgAgent ); } else { msg += i18n( "gpg-agent is part of gnupg-%1, which you can download from %2" ) - .arg( "1.9" ) - .arg( "http://www.gnupg.org/download" ); // add #gnupg2 if you can make this a real link + .tqarg( "1.9" ) + .tqarg( "http://www.gnupg.org/download" ); // add #gnupg2 if you can make this a real link } msg += "
"; msg += i18n( "For information on how to set up gpg-agent, see %1" ) - .arg( "http://kmail.kde.org/kmail-pgpmime-howto.html" ); + .tqarg( "http://kmail.kde.org/kmail-pgpmime-howto.html" ); msg += "

"; msg += i18n( "Enter passphrase:" ); Kleo::PassphraseDialog dlg( msg, i18n("Passphrase Dialog") ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp index 2634579f2..57afed412 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp @@ -196,7 +196,7 @@ void Kleo::QGpgMEKeyListJob::showErrorDialog( TQWidget * tqparent, const TQStrin const TQString msg = i18n( "

An error occurred while fetching " "the keys from the backend:

" "

%1

" ) - .arg( TQString::fromLocal8Bit( mResult.error().asString() ) ); + .tqarg( TQString::fromLocal8Bit( mResult.error().asString() ) ); KMessageBox::error( tqparent, msg, caption ); } diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp index 5f6296781..de673faf1 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp @@ -140,20 +140,20 @@ TQString Kleo::QGpgMEProgressTokenMapper::map( const TQString & token, int subto static const Map & tokenMap = makeMap(); - const Map::const_iterator it1 = tokenMap.tqfind( token.lower() ); + const Map::const_iterator it1 = tokenMap.find( token.lower() ); if ( it1 == tokenMap.end() ) return token; - std::map::const_iterator it2 = it1->second.tqfind( subtoken ); + std::map::const_iterator it2 = it1->second.find( subtoken ); if ( it2 == it1->second.end() ) - it2 = it1->second.tqfind( 0 ); + it2 = it1->second.find( 0 ); if ( it2 == it1->second.end() ) return token; const Desc & desc = it2->second; TQString result = i18n( desc.display ); if ( desc.useCur ) - result = result.arg( cur ); + result = result.tqarg( cur ); if ( desc.useTot ) - result = result.arg( tot ); + result = result.tqarg( tot ); return result; } diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp index f15ab747d..1d35f1c1b 100644 --- a/certmanager/lib/cryptplugwrapper.cpp +++ b/certmanager/lib/cryptplugwrapper.cpp @@ -522,7 +522,7 @@ bool CryptPlugWrapper::initialize( InitqStatus* initqStatus, TQString* errorMsg if( !_cp->initialize() ) { _initqStatus = IniStatus_InitError; kdDebug(5150) << "Error while executing function 'initialize' on plugin " << _libName << endl; - _lastError = i18n("Error while initializing plugin \"%1\"").arg( _libName ); + _lastError = i18n("Error while initializing plugin \"%1\"").tqarg( _libName ); if ( errorMsg ) *errorMsg = _lastError; delete _cp; _cp = 0; diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp index c6ce40fd8..f4db77ea3 100644 --- a/certmanager/lib/kleo/cryptobackendfactory.cpp +++ b/certmanager/lib/kleo/cryptobackendfactory.cpp @@ -111,7 +111,7 @@ Kleo::CryptoBackendFactory * Kleo::CryptoBackendFactory::instance() { // } const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::smime() const { - const BackendMap::const_iterator it = mBackends.tqfind( "SMIME" ); + const BackendMap::const_iterator it = mBackends.find( "SMIME" ); if ( it == mBackends.end() ) return 0; if ( !it->second ) @@ -120,7 +120,7 @@ const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::smime() const } const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::openpgp() const { - const BackendMap::const_iterator it = mBackends.tqfind( "OpenPGP" ); + const BackendMap::const_iterator it = mBackends.find( "OpenPGP" ); if ( it == mBackends.end() ) return 0; if ( !it->second ) @@ -129,7 +129,7 @@ const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::openpgp() cons } const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::protocol( const char * name ) const { - const BackendMap::const_iterator it = mBackends.tqfind( name ); + const BackendMap::const_iterator it = mBackends.find( name ); if ( it == mBackends.end() ) return 0; if ( !it->second ) @@ -154,7 +154,7 @@ void Kleo::CryptoBackendFactory::scanForBackends( TQStringList * reasons ) { if ( (*it)->supportsProtocol( protocol ) && !(*it)->checkForProtocol( protocol, &reason ) ) { if ( reasons ) { reasons->push_back( i18n("While scanning for %1 support in backend %2:") - .arg( protocol, (*it)->displayName() ) ); + .tqarg( protocol, (*it)->displayName() ) ); reasons->push_back( " " + reason ); } } @@ -267,7 +267,7 @@ namespace { } bool Kleo::CryptoBackendFactory::knowsAboutProtocol( const char * name ) const { - return std::tqfind( mAvailableProtocols.begin(), mAvailableProtocols.end(), + return std::find( mAvailableProtocols.begin(), mAvailableProtocols.end(), CaseInsensitiveString( name ) ) != mAvailableProtocols.end(); } diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp index e82b02dee..0f0c357d2 100644 --- a/certmanager/lib/kleo/dn.cpp +++ b/certmanager/lib/kleo/dn.cpp @@ -507,7 +507,7 @@ const Kleo::DNAttributeMapper * Kleo::DNAttributeMapper::instance() { TQString Kleo::DNAttributeMapper::name2label( const TQString & s ) const { const std::map::const_iterator it - = d->map.tqfind( s.stripWhiteSpace().upper().latin1() ); + = d->map.find( s.stripWhiteSpace().upper().latin1() ); if ( it == d->map.end() ) return TQString(); return i18n( it->second ); diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp index e94f97005..a5944315a 100644 --- a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp +++ b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp @@ -93,7 +93,7 @@ void Kleo::HierarchicalKeyListJob::slotNextKey( const GpgME::Key & key ) { if ( const char * chain_id = key.chainID() ) mNextSet.insert( chain_id ); if ( const char * fpr = key.primaryFingerprint() ) - if ( mSentSet.tqfind( fpr ) == mSentSet.end() ) { + if ( mSentSet.find( fpr ) == mSentSet.end() ) { mSentSet.insert( fpr ); emit nextKey( key ); } @@ -131,7 +131,7 @@ void Kleo::HierarchicalKeyListJob::slotResult( const GpgME::KeyListResult & res #if 0 // FIXME const int current = mIt - mKeys.begin(); const int total = mKeys.size(); - emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").arg( current ).arg( total ), current, total ); + emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").tqarg( current ).tqarg( total ), current, total ); #endif } diff --git a/certmanager/lib/kleo/multideletejob.cpp b/certmanager/lib/kleo/multideletejob.cpp index 7d1a27302..e83f923ee 100644 --- a/certmanager/lib/kleo/multideletejob.cpp +++ b/certmanager/lib/kleo/multideletejob.cpp @@ -92,7 +92,7 @@ void Kleo::MultiDeleteJob::slotResult( const GpgME::Error & err ) { const int current = mIt - mKeys.begin(); const int total = mKeys.size(); - emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").arg( current ).arg( total ), current, total ); + emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").tqarg( current ).tqarg( total ), current, total ); } GpgME::Error Kleo::MultiDeleteJob::startAJob() { diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp index 090c3f3ae..b95ad74bd 100644 --- a/certmanager/lib/tests/test_keygen.cpp +++ b/certmanager/lib/tests/test_keygen.cpp @@ -137,7 +137,7 @@ void KeyGenerator::slotResult( const GpgME::KeyGenerationResult & res, const TQB if ( res.error() ) showError( res.error() ); else - KMessageBox::information( this, TQString("Key generated successfully, %1 bytes long").arg( keyData.size() ), + KMessageBox::information( this, TQString("Key generated successfully, %1 bytes long").tqarg( keyData.size() ), "Key Generation Finished" ); } diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp index 212d0228f..6667b2e7c 100644 --- a/certmanager/lib/tests/test_keylister.cpp +++ b/certmanager/lib/tests/test_keylister.cpp @@ -104,7 +104,7 @@ void CertListView::slotResult( const GpgME::KeyListResult & result ) { TQMessageBox::information( this, "Key Listing Result", "KeyListResult is null!" ); else if ( result.error() ) TQMessageBox::critical( this, "Key Listing Result", - TQString("KeyListResult Error: %1").arg( result.error().asString() ) ); + TQString("KeyListResult Error: %1").tqarg( result.error().asString() ) ); else if ( result.isTruncated() ) TQMessageBox::information( this, "Key Listing Result", "KeyListResult is truncated!" ); else diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp index a6210cabe..a8d48a007 100644 --- a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp +++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp @@ -49,7 +49,7 @@ AddDirectoryServiceDialogImpl::AddDirectoryServiceDialogImpl( TQWidget* tqparent, const char* name, bool modal, WFlags fl ) : AddDirectoryServiceDialog( tqparent, name, modal, fl ) { - portED->setValidator( new TQIntValidator( 0, 65535, portED ) ); + portED->setValidator( new TQIntValidator( 0, 65535, TQT_TQOBJECT(portED) ) ); } /* diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp index b1a135a9f..d257cc6a8 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -150,7 +150,7 @@ private: // second one is implementation name (gpg, gpgsm...) const TQString impName = protocol ? protocol->displayName() : i18n( "failed" ); return i18n( "Items in Kleo::BackendConfigWidget listview (1: protocol; 2: implementation name)", - "%1 (%2)" ).arg( protoName, impName ); + "%1 (%2)" ).tqarg( protoName, impName ); } const CryptoBackend::Protocol* mProtocol; // can be 0 diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp index dd92b1604..c5ed43b1c 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.cpp +++ b/certmanager/lib/ui/cryptoconfigmodule.cpp @@ -124,7 +124,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg dialogHeight = 400; TQSize sz = scrollView->tqsizeHint(); scrollView->setMinimumSize( sz.width() - + scrollView->style().tqpixelMetric(TQStyle::PM_ScrollBarExtent), + + scrollView->tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent), TQMIN( compGUI->tqsizeHint().height(), dialogHeight ) ); } if ( mComponentGUIs.empty() ) { @@ -134,7 +134,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg "properly. It did not return any components. " "Try running \"%1\" on the command line for more " "information.") - .arg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" ); + .tqarg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" ); TQLabel * label = new TQLabel( msg, vbox ); label->tqsetAlignment( TQt::WordBreak ); label->setMinimumHeight( fontMetrics().lineSpacing() * 5 ); @@ -356,7 +356,7 @@ TQString Kleo::CryptoConfigEntryGUI::description() const { TQString descr = mEntry->description(); if ( descr.isEmpty() ) // shouldn't happen - descr = TQString( "<%1>" ).arg( mName ); + descr = TQString( "<%1>" ).tqarg( mName ); return descr; } diff --git a/certmanager/lib/ui/directoryserviceswidgetbase.ui b/certmanager/lib/ui/directoryserviceswidgetbase.ui index 9ecc87f1b..e35e2bb26 100644 --- a/certmanager/lib/ui/directoryserviceswidgetbase.ui +++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui @@ -295,21 +295,21 @@ By clicking this button, you can remove the currently selected directory service x500LV - returnPressed(QListViewItem*) + returnPressed(TQListViewItem*) DirectoryServicesWidgetBase - slotServiceSelected(QListViewItem*) + slotServiceSelected(TQListViewItem*) x500LV - doubleClicked(QListViewItem*) + doubleClicked(TQListViewItem*) DirectoryServicesWidgetBase - slotServiceSelected(QListViewItem*) + slotServiceSelected(TQListViewItem*) x500LV - selectionChanged(QListViewItem*) + selectionChanged(TQListViewItem*) DirectoryServicesWidgetBase - slotServiceChanged(QListViewItem*) + slotServiceChanged(TQListViewItem*) addServicePB @@ -333,8 +333,8 @@ By clicking this button, you can remove the currently selected directory service slotAddService() slotDeleteService() - slotServiceChanged( QListViewItem* ) - slotServiceSelected( QListViewItem* ) + slotServiceChanged( TQListViewItem* ) + slotServiceSelected( TQListViewItem* ) slotMoveUp() slotMoveDown() diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp index 4f212517f..ee809df77 100644 --- a/certmanager/lib/ui/kdhorizontalline.cpp +++ b/certmanager/lib/ui/kdhorizontalline.cpp @@ -97,7 +97,7 @@ void KDHorizontalLine::calculateFrame() { qDebug( "mLenVisible = %d (of %d)", mLenVisible, mTitle.length() ); if ( mLenVisible ) { // but do we also have a visible label? TQRect r = rect(); - const int va = style().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); + const int va = tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); if( va & AlignVCenter ) r.setTop( fm.height() / 2 ); // frame rect should be else if( va & AlignTop ) @@ -147,13 +147,13 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) { x = 0; } TQRect r( x, 0, tw, h ); - int va = style().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); + int va = tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); if ( va & AlignTop ) r.moveBy( 0, fm.descent() ); - const TQColor pen( (TQRgb) style().tqstyleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) ); - if ( !style().tqstyleHint( TQStyle::SH_UnderlineAccelerator, this ) ) + const TQColor pen( (TQRgb) tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) ); + if ( !tqstyle().tqstyleHint( TQStyle::SH_UnderlineAccelerator, this ) ) va |= NoAccel; - style().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, tqcolorGroup(), + tqstyle().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, tqcolorGroup(), isEnabled(), 0, mTitle, -1, ownPalette() ? 0 : &pen ); paint.setClipRegion( e->region().subtract( r ) ); // clip everything but title } diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp index 5bdadfd0c..e81adc438 100644 --- a/certmanager/lib/ui/keyapprovaldialog.cpp +++ b/certmanager/lib/ui/keyapprovaldialog.cpp @@ -139,7 +139,7 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector & recipients d->selfRequester->setKeys( sender ); glay->addWidget( d->selfRequester, row, 1 ); ++row; - glay->addMultiCellWidget( new KSeparator( Horizontal, view ), row, row, 0, 1 ); + glay->addMultiCellWidget( new KSeparator( Qt::Horizontal, view ), row, row, 0, 1 ); } const TQStringList prefs = preferencesStrings(); diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp index 7519f7e81..f1641339d 100644 --- a/certmanager/lib/ui/keylistview.cpp +++ b/certmanager/lib/ui/keylistview.cpp @@ -261,7 +261,7 @@ void Kleo::KeyListView::deregisterItem( const KeyListViewItem * item ) { if ( !item ) return; std::map::iterator it - = d->itemMap.tqfind( item->key().primaryFingerprint() ); + = d->itemMap.find( item->key().primaryFingerprint() ); if ( it == d->itemMap.end() ) return; Q_ASSERT( it->second == item ); @@ -324,7 +324,7 @@ void Kleo::KeyListView::scatterGathered( TQListViewItem * start ) { Kleo::KeyListViewItem * Kleo::KeyListView::itemByFingerprint( const TQCString & s ) const { if ( s.isEmpty() ) return 0; - const std::map::const_iterator it = d->itemMap.tqfind( s ); + const std::map::const_iterator it = d->itemMap.find( s ); if ( it == d->itemMap.end() ) return 0; return it->second; diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp index 7a56ab5af..16efbd46f 100644 --- a/certmanager/lib/ui/keyrequester.cpp +++ b/certmanager/lib/ui/keyrequester.cpp @@ -231,7 +231,7 @@ static void showKeyListError( TQWidget * tqparent, const GpgME::Error & err ) { const TQString msg = i18n( "

An error occurred while fetching " "the keys from the backend:

" "

%1

" ) - .arg( TQString::fromLocal8Bit( err.asString() ) ); + .tqarg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( tqparent, msg, i18n( "Key Listing Failed" ) ); } diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index 22737199e..141e9e989 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/certmanager/lib/ui/keyselectiondialog.cpp @@ -248,7 +248,7 @@ namespace { "Created: %2\n" "Expiry: %3\n" "Fingerprint: %4" ) - .arg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"), + .tqarg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"), creation, expiry, fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") ); else @@ -257,10 +257,10 @@ namespace { "Expiry: %3\n" "Fingerprint: %4\n" "Issuer: %5" ) - .arg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"), + .tqarg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"), creation, expiry, fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") ) - .arg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") ); + .tqarg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") ); } const TQPixmap * ColumnStrategy::pixmap( const GpgME::Key & key, int col ) const { @@ -567,7 +567,7 @@ static void showKeyListError( TQWidget * tqparent, const GpgME::Error & err ) { const TQString msg = i18n( "

An error occurred while fetching " "the keys from the backend:

" "

%1

" ) - .arg( TQString::fromLocal8Bit( err.asString() ) ); + .tqarg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( tqparent, msg, i18n( "Key Listing Failed" ) ); } diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp index 824600f17..0cef145b2 100644 --- a/certmanager/lib/ui/messagebox.cpp +++ b/certmanager/lib/ui/messagebox.cpp @@ -127,7 +127,7 @@ private: if ( const int err = file.status() ) KMessageBox::error( this, i18n("Couldn't save to file \"%1\": %2") - .arg( file.name(), TQString::fromLocal8Bit( strerror( err ) ) ), + .tqarg( file.name(), TQString::fromLocal8Bit( strerror( err ) ) ), i18n("File Save Error") ); } void slotUser2() { @@ -159,7 +159,7 @@ void MessageBox::auditLog( TQWidget * tqparent, const Job * job, const TQString if ( err.code() != GPG_ERR_NO_DATA ) { KMessageBox::information( tqparent, i18n("An error occurred while trying to retrieve the GnuPG Audit Log:\n%1") - .arg( TQString::fromLocal8Bit( err.asString() ) ), + .tqarg( TQString::fromLocal8Bit( err.asString() ) ), i18n("GnuPG Audit Log Error") ); return; } @@ -194,7 +194,7 @@ void MessageBox::auditLog( TQWidget * tqparent, const TQString & log ) { static TQString to_information_string( const SigningResult & result ) { return result.error() - ? i18n("Signing failed: %1").arg( TQString::fromLocal8Bit( result.error().asString() ) ) + ? i18n("Signing failed: %1").tqarg( TQString::fromLocal8Bit( result.error().asString() ) ) : i18n("Signing successful") ; } @@ -204,7 +204,7 @@ static TQString to_error_string( const SigningResult & result ) { static TQString to_information_string( const EncryptionResult & result ) { return result.error() - ? i18n("Encryption failed: %1").arg( TQString::fromLocal8Bit( result.error().asString() ) ) + ? i18n("Encryption failed: %1").tqarg( TQString::fromLocal8Bit( result.error().asString() ) ) : i18n("Encryption successful") ; } diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp index d6552922c..e0149b8f3 100644 --- a/certmanager/lib/ui/progressdialog.cpp +++ b/certmanager/lib/ui/progressdialog.cpp @@ -83,7 +83,7 @@ void Kleo::ProgressDialog::slotProgress( const TQString & what, int current, int else if ( what.isEmpty() ) setLabelText( mBaseText ); else - setLabelText( i18n( "%1: %2" ).arg( mBaseText, what ) ); + setLabelText( i18n( "%1: %2" ).tqarg( mBaseText, what ) ); setProgress( current, total ); } diff --git a/certmanager/storedtransferjob.cpp b/certmanager/storedtransferjob.cpp index fd9e601b8..b111b081f 100644 --- a/certmanager/storedtransferjob.cpp +++ b/certmanager/storedtransferjob.cpp @@ -49,7 +49,7 @@ void StoredTransferJob::slotData( KIO::Job *, const TQByteArray &data ) if ( data.size() == 0 ) return; unsigned int oldSize = m_data.size(); - m_data.resize( oldSize + data.size(), TQGArray::SpeedOptim ); + m_data.tqresize( oldSize + data.size(), TQGArray::SpeedOptim ); memcpy( m_data.data() + oldSize, data.data(), data.size() ); } -- cgit v1.2.1