* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


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

1 files changed, 4 insertions, 0 deletions

diff --git a/kmail/messageproperty.h b/kmail/messageproperty.h
index 4809cd7ad..91168e6f3 100644
--- a/kmail/messageproperty.h
+++ b/kmail/messageproperty.h
@@ -91,6 +91,7 @@ public:
   static bool transferInProgress( const KMMsgBase* );
   static void setTransferInProgress( Q_UINT32, bool, bool = false );
   static bool transferInProgress( Q_UINT32 );
+
   /** Some properties, namely complete, transferInProgress, and
       serialCache must be forgotten when a message class instance is
       destructed or assigned a new value */
@@ -99,10 +100,13 @@ public:
 private:
   // The folder a message is to be moved into once filtering is finished if any
   static TQMap<Q_UINT32, TQGuardedPtr<KMFolder> > sFolders;
+
   // The action scheduler currently processing a message if any
   static TQMap<Q_UINT32, TQGuardedPtr<ActionScheduler> > sHandlers;
+
   // The transferInProgres state of a message if any.
   static TQMap<Q_UINT32, int > sTransfers;
+
   // The cached serial number of a message if any.
   static TQMap<const KMMsgBase*, long > sSerialCache;
 };