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/kmfoldermaildir.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'kmail/kmfoldermaildir.cpp')

diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp
index ace5a6ddc..684af395d 100644
--- a/kmail/kmfoldermaildir.cpp
+++ b/kmail/kmfoldermaildir.cpp
@@ -87,11 +87,11 @@ int KMFolderMaildir::canAccess()
     KCursorSaver idle(KBusyPtr::idle());
     if ( nRetVal == ENOENT )
       KMessageBox::sorry(0, i18n("Error opening %1; this folder is missing.")
-                         .arg(sBadFolderName));
+                         .tqarg(sBadFolderName));
     else
       KMessageBox::sorry(0, i18n("Error opening %1; either this is not a valid "
                                  "maildir folder, or you do not have sufficient access permissions.")
-                         .arg(sBadFolderName));
+                         .tqarg(sBadFolderName));
     return nRetVal;
   }
 
@@ -122,7 +122,7 @@ int KMFolderMaildir::open(const char *)
       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
@@ -605,7 +605,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString&
   // open the file and get a pointer to it
   TQFile f(file);
   if ( f.open( IO_ReadOnly ) == false ) {
-    kdWarning(5006) << "The file '" << TQFile::encodeName(dir) << "/" << file
+    kdWarning(5006) << "The file '" << TQString(TQFile::encodeName(dir)) << "/" << file
                     << "' could not be opened for reading the message. "
                        "Please check ownership and permissions."
                     << endl;
@@ -652,7 +652,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString&
       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
@@ -660,10 +660,10 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString&
         }
 
         // 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 );
 
@@ -729,7 +729,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString&
 
       dateStr = dateStr.stripWhiteSpace();
       if (!dateStr.isEmpty())
-        mi->setDate(dateStr);
+        mi->setDate(dateStr.data());
       if ( !uidStr.isEmpty() )
          mi->setUID( uidStr.toULong() );
       mi->setDirty(false);
@@ -1046,7 +1046,7 @@ TQString KMFolderMaildir::constructValidFileName( const TQString & filename,
   if (!suffix_regex)
       suffix_regex_sd.setObject(suffix_regex, new TQRegExp(":2,?R?S?$"));
 
-  aFileName.truncate(aFileName.findRev(*suffix_regex));
+  aFileName.truncate(aFileName.tqfindRev(*suffix_regex));
 
   // only add status suffix if the message is neither new nor unread
   if (! ((status & KMMsgStatusNew) || (status & KMMsgStatusUnread)) )
@@ -1123,7 +1123,7 @@ TQ_INT64 KMFolderMaildir::doFolderSize() const
   item = new KFileItem( S_IFDIR, -1, location() + "/tmp" );
   list.append( item );
   s_DirSizeJobQueue.append(
-    qMakePair( TQGuardedPtr<const KMFolderMaildir>( this ), list ) );
+    tqMakePair( TQGuardedPtr<const KMFolderMaildir>( this ), list ) );
 
   // if there's only one entry in the queue then we can start
   // a dirSizeJob right away
-- 
cgit v1.2.1