From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 14 Apr 2011 20:16:30 +0000
Subject: 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
---
 kmail/kmfoldermbox.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'kmail/kmfoldermbox.cpp')

diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp
index 287ce576..b9bbd1a6 100644
--- a/kmail/kmfoldermbox.cpp
+++ b/kmail/kmfoldermbox.cpp
@@ -109,7 +109,7 @@ int KMFolderMbox::open(const char *owner)
   if (!mStream)
   {
     KNotifyClient::event( 0, "warning",
-    i18n("Cannot open file \"%1\":\n%2").arg(location()).arg(strerror(errno)));
+    i18n("Cannot open file \"%1\":\n%2").tqarg(location()).tqarg(strerror(errno)));
     kdDebug(5006) << "Cannot open folder `" << location() << "': " << strerror(errno) << endl;
     mOpenCount = 0;
     return errno;
@@ -137,8 +137,8 @@ int KMFolderMbox::open(const char *owner)
                            "of KMail</a> for "
                            "information about how to prevent this "
                            "problem from happening again.</p></qt>")
-                      .arg("help:/kmail/faq.html#faq-index-regeneration")
-                      .arg(name());
+                      .tqarg("help:/kmail/faq.html#faq-index-regeneration")
+                      .tqarg(name());
         // When KMail is starting up we have to show a non-blocking message
         // box so that the initialization can continue. We don't show a
         // queued message box when KMail isn't starting up because queued
@@ -164,7 +164,7 @@ int KMFolderMbox::open(const char *owner)
        TQString str;
        mIndexStream = 0;
        str = i18n("Folder `%1' changed. Recreating index.")
-             .arg(name());
+             .tqarg(name());
        emit statusMsg(str);
      } else {
        mIndexStream = fopen(TQFile::encodeName(indexLocation()), "r+"); // index file
@@ -297,7 +297,7 @@ void KMFolderMbox::sync()
   if (mOpenCount > 0)
     if (!mStream || fsync(fileno(mStream)) ||
         !mIndexStream || fsync(fileno(mIndexStream))) {
-    kmkernel->emergencyExit( i18n("Could not sync index file <b>%1</b>: %2").arg( indexLocation() ).arg(errno ? TQString::fromLocal8Bit(strerror(errno)) : i18n("Internal error. Please copy down the details and report a bug.")));
+    kmkernel->emergencyExit( i18n("Could not sync index file <b>%1</b>: %2").tqarg( indexLocation() ).tqarg(errno ? TQString::fromLocal8Bit(strerror(errno)) : i18n("Internal error. Please copy down the details and report a bug.")));
     }
 }
 
@@ -625,7 +625,7 @@ int KMFolderMbox::createIndexFromContents()
           referencesStr = referencesStr.stripWhiteSpace();
           if( !referencesStr.isEmpty() ) {
             int leftAngle, rightAngle;
-            leftAngle = referencesStr.findRev( '<' );
+            leftAngle = referencesStr.tqfindRev( '<' );
             if( ( leftAngle != -1 )
                 && ( replyToIdStr.isEmpty() || ( replyToIdStr[0] != '<' ) ) ) {
               // use the last reference, instead of missing In-Reply-To
@@ -633,10 +633,10 @@ int KMFolderMbox::createIndexFromContents()
             }
 
             // find second last reference
-            leftAngle = referencesStr.findRev( '<', leftAngle - 1 );
+            leftAngle = referencesStr.tqfindRev( '<', leftAngle - 1 );
             if( leftAngle != -1 )
               referencesStr = referencesStr.mid( leftAngle );
-            rightAngle = referencesStr.findRev( '>' );
+            rightAngle = referencesStr.tqfindRev( '>' );
             if( rightAngle != -1 )
               referencesStr.truncate( rightAngle + 1 );
 
@@ -683,7 +683,7 @@ int KMFolderMbox::createIndexFromContents()
                     KMMsgEncryptionStateUnknown, KMMsgSignatureStateUnknown,
                     KMMsgMDNStateUnknown, charset, offs, size, sizeServer, uid );
           mi->setqStatus(status, xstatus);
-          mi->setDate( dateStr.stripWhiteSpace() );
+          mi->setDate( dateStr.stripWhiteSpace().data() );
           mi->setDirty(false);
           mMsgList.append(mi, mExportsSernums );
 
-- 
cgit v1.2.3