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

4 files changed, 9 insertions, 9 deletions

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 char*,const char*,ltstr>::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() {