Initial conversion of kdepim to TQt

This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK.  Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 17 insertions, 17 deletions

diff --git a/kmail/kmmsginfo.cpp b/kmail/kmmsginfo.cpp
index 9a7b1ed88..2d678bf19 100644
--- a/kmail/kmmsginfo.cpp
+++ b/kmail/kmmsginfo.cpp
@@ -154,7 +154,7 @@ KMMsgInfo& KMMsgInfo::operator=(const KMMsgInfo& other)
         delete kd;
         kd = 0;
     }
-    mStatus = other.status();
+    mtqStatus = other.status();
     return *this;
 }
 #endif
@@ -174,7 +174,7 @@ KMMsgInfo& KMMsgInfo::operator=(const KMMessage& msg)
     kd->strippedSubjectMD5 = msg.strippedSubjectMD5();
     kd->msgIdMD5 = msg.msgIdMD5();
     kd->xmark = msg.xmark();
-    mStatus = msg.status();
+    mtqStatus = msg.status();
     kd->folderOffset = msg.folderOffset();
     kd->msgSize = msg.msgSize();
     kd->date = msg.date();
@@ -192,7 +192,7 @@ KMMsgInfo& KMMsgInfo::operator=(const KMMessage& msg)
 //-----------------------------------------------------------------------------
 void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom,
                      const TQCString& aTo, time_t aDate,
-                     KMMsgStatus aStatus, const TQCString& aXMark,
+                     KMMsgtqStatus atqStatus, const TQCString& aXMark,
                      const TQCString& replyToId, const TQCString& replyToAuxId,
                      const TQCString& msgId,
                      KMMsgEncryptionState encryptionState,
@@ -216,7 +216,7 @@ void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom,
     kd->msgIdMD5 = base64EncodedMD5( msgId );
     kd->xmark = aXMark;
     kd->folderOffset = aFolderOffset;
-    mStatus    = aStatus;
+    mtqStatus    = atqStatus;
     kd->msgSize = aMsgSize;
     kd->date = aDate;
     kd->file = "";
@@ -232,7 +232,7 @@ void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom,
 
 void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom,
                      const TQCString& aTo, time_t aDate,
-                     KMMsgStatus aStatus, const TQCString& aXMark,
+                     KMMsgtqStatus atqStatus, const TQCString& aXMark,
                      const TQCString& replyToId, const TQCString& replyToAuxId,
                      const TQCString& msgId,
                      const TQCString& aFileName,
@@ -244,7 +244,7 @@ void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom,
              size_t aMsgSizeServer, ulong aUID)
 {
   // use the "normal" init for most stuff
-  init( aSubject, aFrom, aTo, aDate, aStatus, aXMark, replyToId, replyToAuxId,
+  init( aSubject, aFrom, aTo, aDate, atqStatus, aXMark, replyToId, replyToAuxId,
         msgId, encryptionState, signatureState, mdnSentState, prefCharset,
         (unsigned long)0, aMsgSize, aMsgSizeServer, aUID );
   kd->file = aFileName;
@@ -477,16 +477,16 @@ void KMMsgInfo::setMDNSentState( const KMMsgMDNSentState s, int idx )
 }
 
 //-----------------------------------------------------------------------------
-KMMsgStatus KMMsgInfo::status(void) const
+KMMsgtqStatus KMMsgInfo::status(void) const
 {
-    if (mStatus == KMMsgStatusUnknown) {
-        KMMsgStatus st = (KMMsgStatus)getLongPart(MsgStatusPart);
+    if (mtqStatus == KMMsgStatusUnknown) {
+        KMMsgtqStatus st = (KMMsgtqStatus)getLongPart(MsgStatusPart);
         if (!st) {
             // We are opening an old index for the first time, get the legacy
             // status and merge it in.
-            mLegacyStatus = (KMLegacyMsgStatus)getLongPart(MsgLegacyStatusPart);
+            mLegacytqStatus = (KMLegacyMsgtqStatus)getLongPart(MsgLegacyStatusPart);
             st = KMMsgStatusRead;
-            switch (mLegacyStatus) {
+            switch (mLegacytqStatus) {
                 case KMLegacyMsgStatusUnknown:
                     st = KMMsgStatusUnknown;
                     break;
@@ -525,9 +525,9 @@ KMMsgStatus KMMsgInfo::status(void) const
             }
 
         }
-        mStatus = st;
+        mtqStatus = st;
     }
-    return mStatus;
+    return mtqStatus;
 }
 
 
@@ -666,11 +666,11 @@ void KMMsgInfo::setFileName(const TQString& file)
 }
 
 //-----------------------------------------------------------------------------
-void KMMsgInfo::seStatus(const KMMsgStatus aStatus, int idx)
+void KMMsgInfo::setqStatus(const KMMsgtqStatus atqStatus, int idx)
 {
-    if(aStatus == status())
+    if(atqStatus == status())
         return;
-    KMMsgBase::seStatus(aStatus, idx); //base does more "stuff"
+    KMMsgBase::setqStatus(atqStatus, idx); //base does more "stuff"
 }
 
 //-----------------------------------------------------------------------------
@@ -716,7 +716,7 @@ void KMMsgInfo::compat_fromOldIndexString(const TQCString& str, bool toUtf8)
     kd->folderOffset = str.mid(2,9).toULong();
     kd->msgSize = str.mid(12,9).toULong();
     kd->date = (time_t)str.mid(22,10).toULong();
-    mStatus = (KMMsgStatus)str.at(0);
+    mtqStatus = (KMMsgtqStatus)str.at(0);
     if (toUtf8) {
         kd->subject = str.mid(37, 100).stripWhiteSpace();
         kd->fromStrip = str.mid(138, 50).stripWhiteSpace();