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

9 files changed, 29 insertions, 29 deletions

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("<qt>Failed to execute gpgconf:<br>%1</qt>");
     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:<br/> %1 (retry)" ) :
                 i18n( "You need a passphrase to unlock the secret key for user:<br/> %1" );
-  msg = msg.arg( TQString::fromUtf8( useridHint ) ) + "<br/><br/>";
+  msg = msg.tqarg( TQString::fromUtf8( useridHint ) ) + "<br/><br/>";
   msg.prepend( "<qt>" );
   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." ) + "<br/>";
   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 += "<br/>";
   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 += "<br/><br/>";
   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( "<qt><p>An error occurred while fetching "
 			    "the keys from the backend:</p>"
 			    "<p><b>%1</b></p></qt>" )
-    .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<int,Desc>::const_iterator it2 = it1->second.tqfind( subtoken );
+  std::map<int,Desc>::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;
 }