summaryrefslogtreecommitdiffstats
path: root/kmail/keyresolver.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:50:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:50:21 -0600
commit3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (patch)
tree89de88213bd261e4ccaade899ab2d6ec34b3a5a7 /kmail/keyresolver.cpp
parent1dad5f662a09dfc5cc041caffe0f674044a4dcec (diff)
downloadtdepim-3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.tar.gz
tdepim-3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'kmail/keyresolver.cpp')
-rw-r--r--kmail/keyresolver.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp
index c6abdd95..a9f8dc6d 100644
--- a/kmail/keyresolver.cpp
+++ b/kmail/keyresolver.cpp
@@ -308,7 +308,7 @@ static std::vector<GpgME::Key> trustedOrConfirmed( const std::vector<GpgME::Key>
"for encryption.")
: i18n("One or more of the OpenPGP encryption keys or S/MIME "
"certificates for recipient \"%1\" is not fully trusted "
- "for encryption.").tqarg(address) ;
+ "for encryption.").arg(address) ;
if ( !fishies.empty() ) {
// certificates can't have marginal trust
@@ -651,7 +651,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons
"<p>expired less than a day ago.</p>",
"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
"<p>expired %n days ago.</p>",
- daysSinceExpiry ) ).tqarg( TQString::fromUtf8( key.userID(0).id() ),
+ daysSinceExpiry ) ).arg( TQString::fromUtf8( key.userID(0).id() ),
key.shortKeyID() )
: ( ca
? ( key.isRoot()
@@ -698,7 +698,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons
"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
"<p>expired %n days ago.</p>",
- daysSinceExpiry ) ) ).tqarg( Kleo::DN( orig.userID(0).id() ).prettyDN(),
+ daysSinceExpiry ) ) ).arg( Kleo::DN( orig.userID(0).id() ).prettyDN(),
orig.issuerSerial(),
Kleo::DN( key.userID(0).id() ).prettyDN() )
: ( mine ? sign
@@ -716,7 +716,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons
"<p>expired less than a day ago.</p>",
"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number %2)</p>"
"<p>expired %n days ago.</p>",
- daysSinceExpiry ) ).tqarg( Kleo::DN( key.userID(0).id() ).prettyDN(),
+ daysSinceExpiry ) ).arg( Kleo::DN( key.userID(0).id() ).prettyDN(),
key.issuerSerial() ) );
d->alreadyWarnedFingerprints.insert( subkey.fingerprint() );
if ( KMessageBox::warningContinueCancel( 0, msg,
@@ -759,7 +759,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons
"<p>expires in less than a day.</p>",
"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
"<p>expires in less than %n days.</p>",
- daysTillExpiry ) ).tqarg( TQString::fromUtf8( key.userID(0).id() ),
+ daysTillExpiry ) ).arg( TQString::fromUtf8( key.userID(0).id() ),
key.shortKeyID() )
: ( ca
? ( key.isRoot()
@@ -806,7 +806,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons
"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
"<p>expires in less than %n days.</p>",
- daysTillExpiry ) ) ).tqarg( Kleo::DN( orig.userID(0).id() ).prettyDN(),
+ daysTillExpiry ) ) ).arg( Kleo::DN( orig.userID(0).id() ).prettyDN(),
orig.issuerSerial(),
Kleo::DN( key.userID(0).id() ).prettyDN() )
: ( mine ? sign
@@ -824,7 +824,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons
"<p>expires in less than a day.</p>",
"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number %2)</p>"
"<p>expires in less than %n days.</p>",
- daysTillExpiry ) ).tqarg( Kleo::DN( key.userID(0).id() ).prettyDN(),
+ daysTillExpiry ) ).arg( Kleo::DN( key.userID(0).id() ).prettyDN(),
key.issuerSerial() ) );
d->alreadyWarnedFingerprints.insert( subkey.fingerprint() );
if ( KMessageBox::warningContinueCancel( 0, msg,
@@ -1628,7 +1628,7 @@ std::vector<GpgME::Key> Kleo::KeyResolver::getEncryptionKeys( const TQString & p
"There is a problem with the "
"encryption certificate(s) for \"%1\".\n\n"
"Please re-select the certificate(s) which should "
- "be used for this recipient.").tqarg(person),
+ "be used for this recipient.").arg(person),
keys );
}
bool canceled = false;
@@ -1680,13 +1680,13 @@ std::vector<GpgME::Key> Kleo::KeyResolver::getEncryptionKeys( const TQString & p
"Select the certificate(s) which should "
"be used for this recipient. If there is no suitable certificate in the list "
"you can also search for external certificates by clicking the button: search for external certificates.</qt>")
- .tqarg( TQStyleSheet::escape(person) )
+ .arg( TQStyleSheet::escape(person) )
: i18n("if in your language something like "
"'certificate(s)' isn't possible please "
"use the plural in the translation",
"More than one certificate matches \"%1\".\n\n"
"Select the certificate(s) which should "
- "be used for this recipient.").tqarg( TQStyleSheet::escape(person) ),
+ "be used for this recipient.").arg( TQStyleSheet::escape(person) ),
matchingKeys ), address, canceled );
// we can ignore 'canceled' here, since trustedOrConfirmed() returns
// an empty vector when canceled == true, and we'd just do the same
@@ -1797,7 +1797,7 @@ void Kleo::KeyResolver::saveContactPreference( const TQString& email, const Cont
KABC::Addressee addr;
if ( res.isEmpty() ) {
bool ok = true;
- TQString fullName = KInputDialog::getText( i18n( "Name Selection" ), i18n( "Which name shall the contact '%1' have in your addressbook?" ).tqarg( email ), TQString(), &ok );
+ TQString fullName = KInputDialog::getText( i18n( "Name Selection" ), i18n( "Which name shall the contact '%1' have in your addressbook?" ).arg( email ), TQString(), &ok );
if ( ok ) {
addr.setNameFromString( fullName );
addr.insertEmail( email, true );