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, 23 insertions, 23 deletions

diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index f0b3f0cec..94bd09b20 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -215,7 +215,7 @@ KMFolderCachedImap::KMFolderCachedImap( KMFolder* folder, const char* aName )
         KMessageBox::error( 0,
         i18n( "The UID cache file for folder %1 could not be read. There "
               "could be a problem with file system permission, or it is corrupted."
-              ).arg( folder->prettyURL() ) );
+              ).tqarg( folder->prettyURL() ) );
         // try to unlink it, in case it was corruped. If it couldn't be read
         // because of permissions, this will fail, which is fine
         unlink( TQFile::encodeName( uidCacheLocation() ) );
@@ -442,14 +442,14 @@ int KMFolderCachedImap::readUidCache()
       if( cacheVersion == UIDCACHE_VERSION ) {
         len = uidcache.readLine( buf, sizeof(buf) );
         if( len > 0 ) {
-          setUidValidity( TQString::fromLocal8Bit(buf).stripWhiteSpace() );
+          setUidValidity( TQString(TQString::fromLocal8Bit(buf)).stripWhiteSpace() );
           len = uidcache.readLine( buf, sizeof(buf) );
           if( len > 0 ) {
 #if MAIL_LOSS_DEBUGGING
             kdDebug(5006) << "Reading in last uid from cache: " << TQString::fromLocal8Bit(buf).stripWhiteSpace() << " in " << folder()->prettyURL() << endl;
 #endif
             // load the last known highest uid from the on disk cache
-            setLastUid( TQString::fromLocal8Bit(buf).stripWhiteSpace().toULong() );
+            setLastUid( TQString(TQString::fromLocal8Bit(buf)).stripWhiteSpace().toULong() );
             return 0;
           }
         }
@@ -486,7 +486,7 @@ int KMFolderCachedImap::writeUidCache()
   }
   KMessageBox::error( 0,
         i18n( "The UID cache file for folder %1 could not be written. There "
-              "could be a problem with file system permission." ).arg( folder()->prettyURL() ) );
+              "could be a problem with file system permission." ).tqarg( folder()->prettyURL() ) );
 
   return -1;
 }
@@ -739,7 +739,7 @@ void KMFolderCachedImap::slotTroubleshoot()
     TQString str = i18n("Are you sure you want to refresh the IMAP cache of "
                        "the folder %1 and all its subfolders?\nThis will "
                        "remove all changes you have done locally to your "
-                       "folders.").arg( label() );
+                       "folders.").tqarg( label() );
     TQString s1 = i18n("Refresh IMAP Cache");
     TQString s2 = i18n("&Refresh");
     if( KMessageBox::warningContinueCancel( 0, str, s1, s2 ) ==
@@ -774,7 +774,7 @@ void KMFolderCachedImap::slotTroubleshoot()
 void KMFolderCachedImap::serverSync( bool recurse, bool quotaOnly )
 {
   if( mSyncState != SYNC_STATE_INITIAL ) {
-    if( KMessageBox::warningYesNo( 0, i18n("Folder %1 is not in initial sync state (state was %2). Do you want to reset it to initial sync state and sync anyway?" ).arg( imapPath() ).arg( mSyncState ), TQString(), i18n("Reset && Sync"), KStdGuiItem::cancel() ) == KMessageBox::Yes ) {
+    if( KMessageBox::warningYesNo( 0, i18n("Folder %1 is not in initial sync state (state was %2). Do you want to reset it to initial sync state and sync anyway?" ).tqarg( imapPath() ).tqarg( mSyncState ), TQString(), i18n("Reset && Sync"), KStdGuiItem::cancel() ) == KMessageBox::Yes ) {
       mSyncState = SYNC_STATE_INITIAL;
     } else return;
   }
@@ -899,14 +899,14 @@ void KMFolderCachedImap::serverSyncInternal()
       // Cancelled by user, or slave can't start
       // kdDebug(5006) << "makeConnection said Error, aborting." << endl;
       // We stop here. We're already in SYNC_STATE_INITIAL for the next time.
-      newState( mProgress, i18n( "Error connecting to server %1" ).arg( mAccount->host() ) );
+      newState( mProgress, i18n( "Error connecting to server %1" ).tqarg( mAccount->host() ) );
       close("cachedimap");
       emit folderComplete(this, false);
       break;
     } else if ( cs == ImapAccountBase::Connecting ) {
       mAccount->setAnnotationCheckPassed( false );
       // kdDebug(5006) << "makeConnection said Connecting, waiting for signal." << endl;
-      newState( mProgress, i18n("Connecting to %1").arg( mAccount->host() ) );
+      newState( mProgress, i18n("Connecting to %1").tqarg( mAccount->host() ) );
       // We'll wait for the connectionResult signal from the account.
       connect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ),
                this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
@@ -1478,7 +1478,7 @@ void KMFolderCachedImap::uploadNewMessages()
          && !(mUserRights & KMail::ACLJobs::Insert) ) {
       // write access revoked
       KMessageBox::information( 0, i18n("<p>Your access rights to folder <b>%1</b> have been restricted, "
-          "it will no longer be possible to add messages to this folder.</p>").arg( folder()->prettyURL() ),
+          "it will no longer be possible to add messages to this folder.</p>").tqarg( folder()->prettyURL() ),
           i18n("Acces rights revoked"), "KMailACLRevocationNotification" );
     }
   }
@@ -1511,7 +1511,7 @@ void KMFolderCachedImap::uploadFlags()
       if( !msg || msg->UID() == 0 )
         // Either not a valid message or not one that is on the server yet
         continue;
-      if ( mUIDsOfLocallyChangedStatuses.tqfind( msg->UID() ) == mUIDsOfLocallyChangedStatuses.end()
+      if ( mUIDsOfLocallyChangedStatuses.find( msg->UID() ) == mUIDsOfLocallyChangedStatuses.end()
            && !mStatusChangedLocally ) {
         // This message has not had its status changed locally
         continue;
@@ -1559,7 +1559,7 @@ void KMFolderCachedImap::uploadSeenFlags()
         // Either not a valid message or not one that is on the server yet
         continue;
 
-      if ( mUIDsOfLocallyChangedStatuses.tqfind( msg->UID() ) == mUIDsOfLocallyChangedStatuses.end()
+      if ( mUIDsOfLocallyChangedStatuses.find( msg->UID() ) == mUIDsOfLocallyChangedStatuses.end()
            && !mStatusChangedLocally ) {
         // This message has not had its status changed locally
         continue;
@@ -1706,7 +1706,7 @@ bool KMFolderCachedImap::deleteMessages()
       if ( KMessageBox::warningYesNo(
              0, i18n( "<qt><p>Mails on the server in folder <b>%1</b> were deleted. "
                  "Do you want to delete them locally?<br>UIDs: %2</p></qt>" )
-             .arg( folder()->prettyURL() ).arg( uids.join(",") ) ) == KMessageBox::Yes )
+             .tqarg( folder()->prettyURL() ).tqarg( uids.join(",") ) ) == KMessageBox::Yes )
 #endif
         removeMsg( msgsForDeletion );
   }
@@ -2055,7 +2055,7 @@ void KMFolderCachedImap::listNamespaces()
   mNamespacesToList.pop_front();
 
   mSyncState = SYNC_STATE_LIST_SUBFOLDERS2;
-  newState( mProgress, i18n("Retrieving folders for namespace %1").arg(ns));
+  newState( mProgress, i18n("Retrieving folders for namespace %1").tqarg(ns));
   KMail::ListJob* job = new KMail::ListJob( mAccount, type, this,
       mAccount->addPathToNamespace( ns ) );
   job->setNamespace( ns );
@@ -2184,7 +2184,7 @@ void KMFolderCachedImap::slotListResult( const TQStringList& folderNames,
       if (!node->isDir() ) {
         KMFolderCachedImap *f = static_cast<KMFolderCachedImap*>(static_cast<KMFolder*>(node)->storage());
 
-        if ( mSubfolderNames.findIndex(node->name()) == -1 ) {
+        if ( mSubfolderNames.tqfindIndex(node->name()) == -1 ) {
           TQString name = node->name();
           // as more than one namespace can be listed in the root folder we need to make sure
           // that the folder is within the current namespace
@@ -2207,7 +2207,7 @@ void KMFolderCachedImap::slotListResult( const TQStringList& folderNames,
           /**
            * Store the folder attributes for every subfolder.
            */
-          int index = mSubfolderNames.findIndex( node->name() );
+          int index = mSubfolderNames.tqfindIndex( node->name() );
           f->mFolderAttributes = folderAttributes[ index ];
         }
       } else {
@@ -2297,7 +2297,7 @@ void KMFolderCachedImap::listDirectory2()
       // (could be that the folder was deleted & recreated meanwhile from another client...)
       if ( !locallyDeleted && mAccount->isPreviouslyDeletedFolder( subfolderPath ) ) {
            locallyDeleted = KMessageBox::warningYesNo(
-             0, i18n( "<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it from the server?</p></qt>" ).arg( mSubfolderNames[i] ), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel() ) == KMessageBox::Yes;
+             0, i18n( "<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it from the server?</p></qt>" ).tqarg( mSubfolderNames[i] ), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel() ) == KMessageBox::Yes;
       }
 
       if ( locallyDeleted ) {
@@ -2618,7 +2618,7 @@ void KMFolderCachedImap::newState( int progress, const TQString& synctqStatus )
     if ( mAccount->imapFolder() == this )
       str = synctqStatus;
     else
-      str = TQString( "%1: %2" ).arg( label() ).arg( synctqStatus );
+      str = TQString( "%1: %2" ).tqarg( label() ).tqarg( synctqStatus );
     if( progressItem )
       progressItem->setqStatus( str );
     emit statusMsg( str );
@@ -2809,7 +2809,7 @@ void KMFolderCachedImap::slotGetAnnotationResult( KIO::Job* job )
       // that's when the imap server doesn't support annotations
       if ( GlobalSettings::self()->theIMAPResourceStorageFormat() == GlobalSettings::EnumTheIMAPResourceStorageFormat::XML
            && (uint)GlobalSettings::self()->theIMAPResourceAccount() == mAccount->id() )
-	KMessageBox::error( 0, i18n( "The IMAP server %1 does not have support for IMAP annotations. The XML storage cannot be used on this server; please re-configure KMail differently." ).arg( mAccount->host() ) );
+	KMessageBox::error( 0, i18n( "The IMAP server %1 does not have support for IMAP annotations. The XML storage cannot be used on this server; please re-configure KMail differently." ).tqarg( mAccount->host() ) );
       mAccount->setHasNoAnnotationSupport();
     }
     else
@@ -2837,7 +2837,7 @@ void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job )
       // that's when the imap server doesn't support annotations
       if ( GlobalSettings::self()->theIMAPResourceStorageFormat() == GlobalSettings::EnumTheIMAPResourceStorageFormat::XML
            && (uint)GlobalSettings::self()->theIMAPResourceAccount() == mAccount->id() )
-        KMessageBox::error( 0, i18n( "The IMAP server %1 doesn't have support for imap annotations. The XML storage cannot be used on this server, please re-configure KMail differently" ).arg( mAccount->host() ) );
+        KMessageBox::error( 0, i18n( "The IMAP server %1 doesn't have support for imap annotations. The XML storage cannot be used on this server, please re-configure KMail differently" ).tqarg( mAccount->host() ) );
       mAccount->setHasNoAnnotationSupport();
     }
     else
@@ -2856,7 +2856,7 @@ void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job )
       if ( dot != -1 ) type.truncate( dot );
       type = type.simplifyWhiteSpace();
 
-      const int idx = mSubfolderPaths.findIndex( folderPath );
+      const int idx = mSubfolderPaths.tqfindIndex( folderPath );
       const bool isNoContent =  mSubfolderMimeTypes[idx] == "inode/directory";
       if ( ( isNoContent && type.isEmpty() )
         || ( !type.isEmpty() && type != KMailICalIfaceImpl::annotationForContentsType( ContentsTypeMail ) ) ) {
@@ -3063,7 +3063,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages()
   bool manualMove = true;
   while ( GlobalSettings::autoLostFoundMove() ) {
     // find the inbox of this account
-    KMFolder *inboxFolder = kmkernel->findFolderById( TQString(".%1.directory/INBOX").arg( account()->id() ) );
+    KMFolder *inboxFolder = kmkernel->findFolderById( TQString(".%1.directory/INBOX").tqarg( account()->id() ) );
     if ( !inboxFolder ) {
       kdWarning(5006) << k_funcinfo << "inbox not found!" << endl;
       break;
@@ -3119,7 +3119,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages()
           "on the server or you do not "
           "have sufficient access rights on the folder to upload them.</p>"
           "<p>All affected messages will therefore be moved to <b>%2</b> "
-          "to avoid data loss.</p>").arg( folder()->prettyURL() ).arg( dest->prettyURL() ),
+          "to avoid data loss.</p>").tqarg( folder()->prettyURL() ).tqarg( dest->prettyURL() ),
           i18n("Insufficient access rights") );
     manualMove = false;
     break;
@@ -3132,7 +3132,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages()
           "have sufficient access rights on the folder now to upload them. "
           "Please contact your administrator to allow upload of new messages "
           "to you, or move them out of this folder.</p> "
-          "<p>Do you want to move these messages to another folder now?</p>").arg( folder()->prettyURL() ) );
+          "<p>Do you want to move these messages to another folder now?</p>").tqarg( folder()->prettyURL() ) );
     if ( KMessageBox::warningYesNo( 0, msg, TQString(), i18n("Move"), i18n("Do Not Move") ) == KMessageBox::Yes ) {
       KMail::KMFolderSelDlg dlg( kmkernel->getKMMainWidget(),
           i18n("Move Messages to Folder"), true );