summaryrefslogtreecommitdiffstats
path: root/kmail/kmfolderindex.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
commitcc29364f06178f8f6b457384f2ec37a042bd9d43 (patch)
tree7c77a3184c698bbf9d98cef09fb1ba8124daceba /kmail/kmfolderindex.h
parent4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff)
downloadtdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz
tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip
* 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
Diffstat (limited to 'kmail/kmfolderindex.h')
-rw-r--r--kmail/kmfolderindex.h24
1 files changed, 15 insertions, 9 deletions
diff --git a/kmail/kmfolderindex.h b/kmail/kmfolderindex.h
index 05453bb68..29039765d 100644
--- a/kmail/kmfolderindex.h
+++ b/kmail/kmfolderindex.h
@@ -48,6 +48,7 @@ public:
*/
enum IndexStatus { IndexOk,
IndexMissing,
+ IndexCorrupt,
IndexTooOld
};
@@ -80,7 +81,16 @@ public:
virtual TQString indexLocation() const;
virtual int writeIndex( bool createEmptyIndex = false );
- void recreateIndex();
+ void recreateIndex( bool readIndexAfterwards = true );
+ void silentlyRecreateIndex();
+
+ /** Tests whether the contents of this folder is newer than the index.
+ Should return IndexTooOld if the index is older than the contents.
+ Should return IndexMissing if there is contents but no index.
+ Should return IndexOk if the folder doesn't exist anymore "physically"
+ or if the index is not older than the contents.
+ */
+ virtual IndexStatus indexStatus() = 0;
public slots:
/** Incrementally update the index if possible else call writeIndex */
@@ -99,14 +109,6 @@ protected:
bool updateIndexStreamPtr(bool just_close=FALSE);
- /** Tests whether the contents of this folder is newer than the index.
- Should return IndexTooOld if the index is older than the contents.
- Should return IndexMissing if there is contents but no index.
- Should return IndexOk if the folder doesn't exist anymore "physically"
- or if the index is not older than the contents.
- */
- virtual IndexStatus indexStatus() = 0;
-
/** Inserts messages into the message dictionary by iterating over the
* message list. The messages will get new serial numbers. This is only
* used on newly appeared folders, where there is no .ids file yet, or
@@ -125,6 +127,10 @@ protected:
int mIndexStreamPtrLength, mIndexId;
bool mIndexSwapByteOrder; // Index file was written with swapped byte order
int mIndexSizeOfLong; // Index file was written with longs of this size
+
+private:
+ void updateInvitationAndAddressFieldsFromContents();
+
};
#endif /*kmfolderindex_h*/