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

1 files changed, 17 insertions, 17 deletions

diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp
index bd4d4a51..2135a9e7 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.").arg(address) ;
+             "for encryption.").tqarg(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 ) ).arg( TQString::fromUtf8( key.userID(0).id() ),
+                     daysSinceExpiry ) ).tqarg( 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 ) ) ).arg( Kleo::DN( orig.userID(0).id() ).prettyDN(),
+                             daysSinceExpiry ) ) ).tqarg( 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 ) ).arg( Kleo::DN( key.userID(0).id() ).prettyDN(),
+                         daysSinceExpiry ) ).tqarg( 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 ) ).arg( TQString::fromUtf8( key.userID(0).id() ),
+		 daysTillExpiry ) ).tqarg( 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 ) ) ).arg( Kleo::DN( orig.userID(0).id() ).prettyDN(),
+			 daysTillExpiry ) ) ).tqarg( 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 ) ).arg( Kleo::DN( key.userID(0).id() ).prettyDN(),
+		     daysTillExpiry ) ).tqarg( Kleo::DN( key.userID(0).id() ).prettyDN(),
 					     key.issuerSerial() ) );
     d->alreadyWarnedFingerprints.insert( subkey.fingerprint() );
     if ( KMessageBox::warningContinueCancel( 0, msg,
@@ -1370,7 +1370,7 @@ void Kleo::KeyResolver::collapseAllSplitInfos() {
   dump();
   for ( unsigned int i = 0 ; i < numConcreteCryptoMessageFormats ; ++i ) {
     std::map<CryptoMessageFormat,FormatInfo>::iterator pos =
-      d->mFormatInfoMap.tqfind( concreteCryptoMessageFormats[i] );
+      d->mFormatInfoMap.find( concreteCryptoMessageFormats[i] );
     if ( pos == d->mFormatInfoMap.end() )
       continue;
     std::vector<SplitInfo> & v = pos->second.splitInfos;
@@ -1394,7 +1394,7 @@ void Kleo::KeyResolver::addToAllSplitInfos( const std::vector<GpgME::Key> & keys
     if ( !( f & concreteCryptoMessageFormats[i] ) )
       continue;
     std::map<CryptoMessageFormat,FormatInfo>::iterator pos =
-      d->mFormatInfoMap.tqfind( concreteCryptoMessageFormats[i] );
+      d->mFormatInfoMap.find( concreteCryptoMessageFormats[i] );
     if ( pos == d->mFormatInfoMap.end() )
       continue;
     std::vector<SplitInfo> & v = pos->second.splitInfos;
@@ -1422,7 +1422,7 @@ void Kleo::KeyResolver::dump() const {
 	std::cerr << kit->shortKeyID() << " ";
       std::cerr << std::endl
 		<< "  SplitInfo #" << i << " recipients: "
-		<< sit->recipients.join(", ").utf8() << std::endl;
+		<< sit->recipients.join(", ").utf8().data() << std::endl;
     }
   }
 #endif
@@ -1560,14 +1560,14 @@ Kpgp::Result Kleo::KeyResolver::showKeyApprovalDialog() {
 std::vector<Kleo::KeyResolver::SplitInfo> Kleo::KeyResolver::encryptionItems( Kleo::CryptoMessageFormat f ) const {
   dump();
   std::map<CryptoMessageFormat,FormatInfo>::const_iterator it =
-    d->mFormatInfoMap.tqfind( f );
+    d->mFormatInfoMap.find( f );
   return it != d->mFormatInfoMap.end() ? it->second.splitInfos : std::vector<SplitInfo>() ;
 }
 
 std::vector<GpgME::Key> Kleo::KeyResolver::signingKeys( CryptoMessageFormat f ) const {
   dump();
   std::map<CryptoMessageFormat,FormatInfo>::const_iterator it =
-    d->mFormatInfoMap.tqfind( f );
+    d->mFormatInfoMap.find( f );
   return it != d->mFormatInfoMap.end() ? it->second.signKeys : std::vector<GpgME::Key>() ;
 }
 
@@ -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.").arg(person),
+              "be used for this recipient.").tqarg(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>")
-             .arg( TQStyleSheet::escape(person) )
+             .tqarg( 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.").arg( TQStyleSheet::escape(person) ),
+              "be used for this recipient.").tqarg( 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
@@ -1765,7 +1765,7 @@ void Kleo::KeyResolver::addKeys( const std::vector<Item> & items ) {
 Kleo::KeyResolver::ContactPreferences Kleo::KeyResolver::lookupContactPreferences( const TQString& address ) const
 {
   const Private::ContactPreferencesMap::iterator it =
-    d->mContactPreferencesMap.tqfind( address );
+    d->mContactPreferencesMap.find( address );
   if ( it != d->mContactPreferencesMap.end() )
     return it->second;
 
@@ -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?" ).arg( email ), TQString(), &ok );
+     TQString fullName = KInputDialog::getText( i18n( "Name Selection" ), i18n( "Which name shall the contact '%1' have in your addressbook?" ).tqarg( email ), TQString(), &ok );
     if ( ok ) {
       addr.setNameFromString( fullName );
       addr.insertEmail( email, true );