diff options
Diffstat (limited to 'certmanager/certmanager.cpp')
-rw-r--r-- | certmanager/certmanager.cpp | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp index 6d9557031..fdf33f3a6 100644 --- a/certmanager/certmanager.cpp +++ b/certmanager/certmanager.cpp @@ -500,7 +500,7 @@ static TQStringList stringlistFromSet( const std::set<std::string> & set ) { TQStringList sl; for ( std::set<std::string>::const_iterator it = set.begin() ; it != set.end() ; ++it ) // let's make extra sure, maybe someone tries to make TQt not support std::string->TQString conversion - sl.push_back( TQString::tqfromLatin1( it->c_str() ) ); + sl.push_back( TQString::fromLatin1( it->c_str() ) ); return sl; } @@ -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").tqarg( TQString::fromLocal8Bit( err.asString() ) ), + "keys:\n%1").arg( TQString::fromLocal8Bit( err.asString() ) ), i18n("Refreshing Keys Failed") ); } @@ -532,7 +532,7 @@ static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) { const TQString msg = i18n( "<qt><p>An error occurred while fetching " "the certificates from the backend:</p>" "<p><b>%1</b></p></qt>" ) - .tqarg( TQString::fromLocal8Bit( err.asString() ) ); + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n( "Certificate Listing Failed" ) ); } @@ -705,8 +705,8 @@ static void showCertificateDownloadError( TQWidget * parent, const GpgME::Error const TQString msg = i18n( "<qt><p>An error occurred while trying " "to download the certificate %1:</p>" "<p><b>%2</b></p></qt>" ) - .tqarg( certDisplayName ) - .tqarg( TQString::fromLocal8Bit( err.asString() ) ); + .arg( certDisplayName ) + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n( "Certificate Download Failed" ) ); } @@ -773,8 +773,8 @@ static void showCertificateImportError( TQWidget * parent, const GpgME::Error & const TQString msg = i18n( "<qt><p>An error occurred while trying " "to import the certificate %1:</p>" "<p><b>%2</b></p></qt>" ) - .tqarg( certDisplayName ) - .tqarg( TQString::fromLocal8Bit( err.asString() ) ); + .arg( certDisplayName ) + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n( "Certificate Import Failed" ) ); } @@ -810,50 +810,50 @@ void CertManager::slotCertificateImportResult( const GpgME::ImportResult & res ) const TQString boldLine = i18n("<tr><td align=\"right\"><b>%1</b></td><td>%2</td></tr>"); TQStringList lines; - lines.push_back( normalLine.tqarg( i18n("Total number processed:"), + lines.push_back( normalLine.arg( i18n("Total number processed:"), TQString::number( res.numConsidered() ) ) ); - lines.push_back( normalLine.tqarg( i18n("Imported:"), + lines.push_back( normalLine.arg( i18n("Imported:"), TQString::number( res.numImported() ) ) ); if ( res.newSignatures() ) - lines.push_back( normalLine.tqarg( i18n("New signatures:"), + lines.push_back( normalLine.arg( i18n("New signatures:"), TQString::number( res.newSignatures() ) ) ); if ( res.newUserIDs() ) - lines.push_back( normalLine.tqarg( i18n("New user IDs:"), + lines.push_back( normalLine.arg( i18n("New user IDs:"), TQString::number( res.newUserIDs() ) ) ); if ( res.numKeysWithoutUserID() ) - lines.push_back( normalLine.tqarg( i18n("Keys without user IDs:"), + lines.push_back( normalLine.arg( i18n("Keys without user IDs:"), TQString::number( res.numKeysWithoutUserID() ) ) ); if ( res.newSubkeys() ) - lines.push_back( normalLine.tqarg( i18n("New subkeys:"), + lines.push_back( normalLine.arg( i18n("New subkeys:"), TQString::number( res.newSubkeys() ) ) ); if ( res.newRevocations() ) - lines.push_back( boldLine.tqarg( i18n("Newly revoked:"), + lines.push_back( boldLine.arg( i18n("Newly revoked:"), TQString::number( res.newRevocations() ) ) ); if ( res.notImported() ) - lines.push_back( boldLine.tqarg( i18n("Not imported:"), + lines.push_back( boldLine.arg( i18n("Not imported:"), TQString::number( res.notImported() ) ) ); if ( res.numUnchanged() ) - lines.push_back( normalLine.tqarg( i18n("Unchanged:"), + lines.push_back( normalLine.arg( i18n("Unchanged:"), TQString::number( res.numUnchanged() ) ) ); if ( res.numSecretKeysConsidered() ) - lines.push_back( normalLine.tqarg( i18n("Secret keys processed:"), + lines.push_back( normalLine.arg( i18n("Secret keys processed:"), TQString::number( res.numSecretKeysConsidered() ) ) ); if ( res.numSecretKeysImported() ) - lines.push_back( normalLine.tqarg( i18n("Secret keys imported:"), + lines.push_back( normalLine.arg( i18n("Secret keys imported:"), TQString::number( res.numSecretKeysImported() ) ) ); if ( res.numSecretKeysConsidered() - res.numSecretKeysImported() - res.numSecretKeysUnchanged() > 0 ) - lines.push_back( boldLine.tqarg( i18n("Secret keys <em>not</em> imported:"), + lines.push_back( boldLine.arg( i18n("Secret keys <em>not</em> imported:"), TQString::number( res.numSecretKeysConsidered() - res.numSecretKeysImported() - res.numSecretKeysUnchanged() ) ) ); if ( res.numSecretKeysUnchanged() ) - lines.push_back( normalLine.tqarg( i18n("Secret keys unchanged:"), + lines.push_back( normalLine.arg( i18n("Secret keys unchanged:"), TQString::number( res.numSecretKeysUnchanged() ) ) ); KMessageBox::information( this, i18n( "<qt><p>Detailed results of importing %1:</p>" "<table>%2</table></qt>" ) - .tqarg( displayName ).tqarg( lines.join( TQString() ) ), + .arg( displayName ).arg( 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").tqarg( 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").arg( 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." ).tqarg( processname ), i18n( "Certificate Manager Error" ) ); + KMessageBox::error( this, i18n( "Unable to start %1 process. Please check your installation." ).arg( 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").tqarg( 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").arg( 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 * parent, const GpgME::Error & err ) { const TQString msg = i18n("<qt><p>An error occurred while trying to delete " "the certificates:</p>" "<p><b>%1</b></p></qt>") - .tqarg( TQString::fromLocal8Bit( err.asString() ) ); + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n("Certificate Deletion Failed") ); } @@ -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() ).tqarg( keysToDelete.size() - keys.size() ) + keys.size() ).arg( 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:</p>" "<p><b>%1</b><p></qt>" ); KMessageBox::error( this, - str.tqarg( i18n("Operation not supported by the backend.") ), + str.arg( i18n("Operation not supported by the backend.") ), i18n("Certificate Deletion Failed") ); } @@ -1206,7 +1206,7 @@ static void showCertificateExportError( TQWidget * parent, const GpgME::Error & const TQString msg = i18n("<qt><p>An error occurred while trying to export " "the certificate:</p>" "<p><b>%1</b></p></qt>") - .tqarg( TQString::fromLocal8Bit( err.asString() ) ); + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, 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?" ).tqarg( url.prettyURL() ), + "Are you sure you want to overwrite it?" ).arg( url.prettyURL() ), i18n( "Overwrite File?" ), i18n( "&Overwrite" ) ) ) return false; @@ -1301,7 +1301,7 @@ static void showSecretKeyExportError( TQWidget * parent, const GpgME::Error & er const TQString msg = i18n("<qt><p>An error occurred while trying to export " "the secret key:</p>" "<p><b>%1</b></p></qt>") - .tqarg( TQString::fromLocal8Bit( err.asString() ) ); + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n("Secret-Key Export Failed") ); } @@ -1338,7 +1338,7 @@ void CertManager::startSecretKeyExport( const TQString & fingerprint ) { }; TQStringList charsetList; for ( const char** c = charsets; *c; ++c ) { - charsetList.append( TQString::tqfromLatin1( *c ) ); + charsetList.append( TQString::fromLatin1( *c ) ); } // TODO this selection could be done in a derived KeySelectionDialog which would add a combobox, |