summaryrefslogtreecommitdiffstats
path: root/kmail/kmfolderimap.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/kmfolderimap.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/kmfolderimap.h')
-rw-r--r--kmail/kmfolderimap.h19
1 files changed, 13 insertions, 6 deletions
diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h
index 7b25520f1..76a3db98d 100644
--- a/kmail/kmfolderimap.h
+++ b/kmail/kmfolderimap.h
@@ -24,6 +24,7 @@
#ifndef kmfolderimap_h
#define kmfolderimap_h
+#include "acljobs.h"
#include "kmacctimap.h"
#include "kmfoldermbox.h"
#include "kmmsgbase.h"
@@ -65,8 +66,8 @@ public:
KMMsgMetaData(KMMsgStatus aStatus, Q_UINT32 aSerNum)
:mStatus(aStatus), mSerNum(aSerNum) {}
~KMMsgMetaData() {};
- const KMMsgStatus status() const { return mStatus; }
- const Q_UINT32 serNum() const { return mSerNum; }
+ KMMsgStatus status() const { return mStatus; }
+ Q_UINT32 serNum() const { return mSerNum; }
private:
KMMsgStatus mStatus;
Q_UINT32 mSerNum;
@@ -91,7 +92,7 @@ public:
imapFinished = 3
};
- virtual imapState getContentState() { return mContentState; }
+ virtual imapState getContentState() const { return mContentState; }
virtual void setContentState(imapState state) { mContentState = state; }
virtual imapState getSubfolderState() { return mSubfolderState; }
@@ -250,7 +251,7 @@ public:
/**
* Get the serial number for the given UID (if available)
*/
- const ulong serNumForUID( ulong uid );
+ ulong serNumForUID( ulong uid );
/**
* Save the metadata for the UID
@@ -294,15 +295,18 @@ public:
/// Is the folder readonly?
bool isReadOnly() const { return KMFolderMbox::isReadOnly() || mReadOnly; }
+ bool canDeleteMessages() const;
/**
* The user's rights on this folder - see bitfield in ACLJobs namespace.
- * @return 0 when not known yet
+ * Note that the returned value is only valid if userRightsState() returns Ok, so
+ * that should be checked first.
*/
unsigned int userRights() const { return mUserRights; }
+ KMail::ACLJobs::ACLFetchState userRightsState() const { return mUserRightsState; }
/** Set the user's rights on this folder - called by getUserRights */
- void setUserRights( unsigned int userRights );
+ void setUserRights( unsigned int userRights, KMail::ACLJobs::ACLFetchState userRightsState );
/**
* Search for messages
@@ -321,6 +325,8 @@ public:
/** Returns the IMAP flags that can be stored on the server. */
int permanentFlags() const { return mPermanentFlags; }
+ virtual bool mailCheckInProgress() const;
+
signals:
void folderComplete(KMFolderImap *folder, bool success);
@@ -515,6 +521,7 @@ protected:
// the current uidvalidity
TQString mUidValidity;
unsigned int mUserRights;
+ KMail::ACLJobs::ACLFetchState mUserRightsState;
private:
// if we're checking validity currently