diff options
author | Hoa V. DINH <dinh.viet.hoa@gmail.com> | 2013-06-12 07:48:54 -0700 |
---|---|---|
committer | Hoa V. DINH <dinh.viet.hoa@gmail.com> | 2013-06-12 07:48:54 -0700 |
commit | 18c3bf6e36664d19d1e9fc4ae95f699406ac72f6 (patch) | |
tree | 0f673ca33f0fe1b6a1d75445ed494b052cfa2b7b | |
parent | a17b5f3dda61452934acf70f1756e8ea2ecc6f30 (diff) |
Renamed unread -> unseen. Fixed indentation.
-rw-r--r-- | src/async/imap/MCIMAPAsyncConnection.h | 66 | ||||
-rw-r--r-- | src/async/imap/MCIMAPAsyncSession.h | 44 | ||||
-rw-r--r-- | src/async/imap/MCIMAPFolderInfoOperation.h | 1 | ||||
-rw-r--r-- | src/async/imap/MCIMAPFolderStatusOperation.cc | 11 | ||||
-rw-r--r-- | src/async/imap/MCIMAPFolderStatusOperation.h | 4 | ||||
-rw-r--r-- | src/core/imap/MCIMAPFolderStatus.cc | 12 | ||||
-rw-r--r-- | src/core/imap/MCIMAPFolderStatus.h | 41 | ||||
-rw-r--r-- | src/core/imap/MCIMAPSession.cc | 2 | ||||
-rw-r--r-- | src/core/imap/MCIMAPSession.h | 74 | ||||
-rw-r--r-- | src/objc/imap/MCOIMAPFolderStatusOperation.mm | 2 |
10 files changed, 123 insertions, 134 deletions
diff --git a/src/async/imap/MCIMAPAsyncConnection.h b/src/async/imap/MCIMAPAsyncConnection.h index e7b9e79e..4843702b 100644 --- a/src/async/imap/MCIMAPAsyncConnection.h +++ b/src/async/imap/MCIMAPAsyncConnection.h @@ -14,18 +14,18 @@ namespace mailcore { class IMAPAppendMessageOperation; class IMAPCopyMessagesOperation; class IMAPFetchMessagesOperation; - class IMAPFetchContentOperation; + class IMAPFetchContentOperation; class IMAPIdleOperation; - class IMAPFolderInfoOperation; - class IMAPFolderStatusOperation; + class IMAPFolderInfoOperation; + class IMAPFolderStatusOperation; class IMAPSession; class IMAPNamespace; - class IMAPSearchOperation; - class IMAPSearchExpression; - class IMAPFetchNamespaceOperation; - class IMAPIdentityOperation; - class IMAPCapabilityOperation; - + class IMAPSearchOperation; + class IMAPSearchExpression; + class IMAPFetchNamespaceOperation; + class IMAPIdentityOperation; + class IMAPCapabilityOperation; + class IMAPAsyncConnection : public Object { public: IMAPAsyncConnection(); @@ -33,50 +33,50 @@ namespace mailcore { virtual void setHostname(String * hostname); virtual String * hostname(); - + virtual void setPort(unsigned int port); virtual unsigned int port(); - + virtual void setUsername(String * username); virtual String * username(); - + virtual void setPassword(String * password); virtual String * password(); - + virtual void setAuthType(AuthType authType); virtual AuthType authType(); - + virtual void setConnectionType(ConnectionType connectionType); virtual ConnectionType connectionType(); - + virtual void setTimeout(time_t timeout); virtual time_t timeout(); virtual void setCheckCertificateEnabled(bool enabled); virtual bool isCheckCertificateEnabled(); - + virtual void setVoIPEnabled(bool enabled); virtual bool isVoIPEnabled(); - + virtual void setDelimiter(char delimiter); virtual char delimiter(); - + virtual void setDefaultNamespace(IMAPNamespace * ns); virtual IMAPNamespace * defaultNamespace(); - + virtual IMAPFolderInfoOperation * folderInfoOperation(String * folder); - virtual IMAPFolderStatusOperation * folderStatusOperation(String * folder); + virtual IMAPFolderStatusOperation * folderStatusOperation(String * folder); virtual IMAPFetchFoldersOperation * fetchSubscribedFoldersOperation(); virtual IMAPFetchFoldersOperation * fetchAllFoldersOperation(); - + virtual IMAPOperation * renameFolderOperation(String * folder, String * otherName); virtual IMAPOperation * deleteFolderOperation(String * folder); virtual IMAPOperation * createFolderOperation(String * folder); - + virtual IMAPOperation * subscribeFolderOperation(String * folder); virtual IMAPOperation * unsubscribeFolderOperation(String * folder); - + virtual IMAPAppendMessageOperation * appendMessageOperation(String * folder, Data * messageData, MessageFlag flags); virtual IMAPCopyMessagesOperation * copyMessagesOperation(String * folder, IndexSet * uids, String * destFolder); @@ -87,12 +87,12 @@ namespace mailcore { IndexSet * uids); virtual IMAPFetchMessagesOperation * fetchMessagesByNumberOperation(String * folder, IMAPMessagesRequestKind requestKind, IndexSet * numbers); - virtual IMAPFetchMessagesOperation * syncMessagesByUID(String * folder, IMAPMessagesRequestKind requestKind, + virtual IMAPFetchMessagesOperation * syncMessagesByUID(String * folder, IMAPMessagesRequestKind requestKind, IndexSet * uids, uint64_t modSeq); virtual IMAPFetchContentOperation * fetchMessageByUIDOperation(String * folder, uint32_t uid); virtual IMAPFetchContentOperation * fetchMessageAttachmentByUIDOperation(String * folder, uint32_t uid, String * partID, - Encoding encoding); + Encoding encoding); virtual IMAPOperation * storeFlagsOperation(String * folder, IndexSet * uids, IMAPStoreFlagsRequestKind kind, MessageFlag flags); virtual IMAPOperation * storeLabelsOperation(String * folder, IndexSet * uids, IMAPStoreFlagsRequestKind kind, Array * labels); @@ -106,24 +106,24 @@ namespace mailcore { virtual IMAPIdentityOperation * identityOperation(String * vendor, String * name, String * version); - virtual IMAPOperation * checkAccountOperation(); + virtual IMAPOperation * checkAccountOperation(); - virtual IMAPCapabilityOperation * capabilityOperation(); + virtual IMAPCapabilityOperation * capabilityOperation(); private: IMAPSession * mSession; OperationQueue * mQueue; - char mDelimiter; - IMAPNamespace * mDefaultNamespace; - String * mLastFolder; + char mDelimiter; + IMAPNamespace * mDefaultNamespace; + String * mLastFolder; void queue(IMAPOperation * op); public: // private - virtual void runOperation(IMAPOperation * operation); - virtual IMAPSession * session(); + virtual void runOperation(IMAPOperation * operation); + virtual IMAPSession * session(); - virtual unsigned int operationsCount(); + virtual unsigned int operationsCount(); virtual void setLastFolder(String * folder); virtual String * lastFolder(); diff --git a/src/async/imap/MCIMAPAsyncSession.h b/src/async/imap/MCIMAPAsyncSession.h index b2fd8904..a2bc05f8 100644 --- a/src/async/imap/MCIMAPAsyncSession.h +++ b/src/async/imap/MCIMAPAsyncSession.h @@ -24,15 +24,15 @@ namespace mailcore { class IMAPFetchMessagesOperation; class IMAPFetchContentOperation; class IMAPIdleOperation; - class IMAPFolderInfoOperation; - class IMAPFolderStatusOperation; + class IMAPFolderInfoOperation; + class IMAPFolderStatusOperation; class IMAPNamespace; - class IMAPSearchOperation; - class IMAPSearchExpression; - class IMAPFetchNamespaceOperation; - class IMAPIdentityOperation; - class IMAPAsyncConnection; - class IMAPCapabilityOperation; + class IMAPSearchOperation; + class IMAPSearchExpression; + class IMAPFetchNamespaceOperation; + class IMAPIdentityOperation; + class IMAPAsyncConnection; + class IMAPCapabilityOperation; class IMAPAsyncSession : public Object { public: @@ -72,15 +72,14 @@ namespace mailcore { virtual void setDefaultNamespace(IMAPNamespace * ns); virtual IMAPNamespace * defaultNamespace(); - virtual void setAllowsFolderConcurrentAccessEnabled(bool enabled); - virtual bool allowsFolderConcurrentAccessEnabled(); + virtual void setAllowsFolderConcurrentAccessEnabled(bool enabled); + virtual bool allowsFolderConcurrentAccessEnabled(); - virtual void setMaximumConnections(unsigned int maxConnections); - virtual unsigned int maximumConnections(); + virtual void setMaximumConnections(unsigned int maxConnections); + virtual unsigned int maximumConnections(); virtual IMAPFolderInfoOperation * folderInfoOperation(String * folder); - virtual IMAPFolderStatusOperation * folderStatusOperation(String * folder); - + virtual IMAPFolderStatusOperation * folderStatusOperation(String * folder); virtual IMAPFetchFoldersOperation * fetchSubscribedFoldersOperation(); virtual IMAPFetchFoldersOperation * fetchAllFoldersOperation(); @@ -102,7 +101,7 @@ namespace mailcore { IndexSet * indexes); virtual IMAPFetchMessagesOperation * fetchMessagesByNumberOperation(String * folder, IMAPMessagesRequestKind requestKind, IndexSet * indexes); - virtual IMAPFetchMessagesOperation * syncMessagesByUID(String * folder, IMAPMessagesRequestKind requestKind, + virtual IMAPFetchMessagesOperation * syncMessagesByUID(String * folder, IMAPMessagesRequestKind requestKind, IndexSet * indexes, uint64_t modSeq); virtual IMAPFetchContentOperation * fetchMessageByUIDOperation(String * folder, uint32_t uid, bool urgent = false); @@ -122,9 +121,9 @@ namespace mailcore { virtual IMAPIdentityOperation * identityOperation(String * vendor, String * name, String * version); - virtual IMAPOperation * checkAccountOperation(); + virtual IMAPOperation * checkAccountOperation(); - virtual IMAPCapabilityOperation * capabilityOperation(); + virtual IMAPCapabilityOperation * capabilityOperation(); private: Array * mSessions; @@ -140,14 +139,13 @@ namespace mailcore { char mDelimiter; IMAPNamespace * mDefaultNamespace; time_t mTimeout; - bool mAllowsFolderConcurrentAccessEnabled; + bool mAllowsFolderConcurrentAccessEnabled; unsigned int mMaximumConnections; - IMAPAsyncConnection * sessionForFolder(String * folder, bool urgent = false); - IMAPAsyncConnection * session(); - IMAPAsyncConnection * matchingSessionForFolder(String * folder); - IMAPAsyncConnection * availableSession(); - + IMAPAsyncConnection * sessionForFolder(String * folder, bool urgent = false); + IMAPAsyncConnection * session(); + IMAPAsyncConnection * matchingSessionForFolder(String * folder); + IMAPAsyncConnection * availableSession(); }; } diff --git a/src/async/imap/MCIMAPFolderInfoOperation.h b/src/async/imap/MCIMAPFolderInfoOperation.h index 2ec29be2..cf733b32 100644 --- a/src/async/imap/MCIMAPFolderInfoOperation.h +++ b/src/async/imap/MCIMAPFolderInfoOperation.h @@ -21,7 +21,6 @@ namespace mailcore { IMAPFolderInfoOperation(); virtual ~IMAPFolderInfoOperation(); - virtual uint32_t uidNext(); virtual uint32_t uidValidity(); virtual uint64_t modSequenceValue(); diff --git a/src/async/imap/MCIMAPFolderStatusOperation.cc b/src/async/imap/MCIMAPFolderStatusOperation.cc index 2a631873..89484624 100644 --- a/src/async/imap/MCIMAPFolderStatusOperation.cc +++ b/src/async/imap/MCIMAPFolderStatusOperation.cc @@ -20,11 +20,12 @@ IMAPFolderStatusOperation::IMAPFolderStatusOperation() mUidValidity = 0; mMessageCount = 0; mRecentCount = 0; - mUnreadCount = 0; + mUnseenCount = 0; } IMAPFolderStatusOperation::~IMAPFolderStatusOperation() -{} +{ +} uint32_t IMAPFolderStatusOperation::uidNext() { @@ -46,9 +47,9 @@ uint32_t IMAPFolderStatusOperation::recentCount() return mRecentCount; } -uint32_t IMAPFolderStatusOperation::unreadCount() +uint32_t IMAPFolderStatusOperation::unseenCount() { - return mUnreadCount; + return mUnseenCount; } void IMAPFolderStatusOperation::main() @@ -72,7 +73,7 @@ void IMAPFolderStatusOperation::main() mUidValidity = status->uidValidity(); mMessageCount = status->messageCount(); mRecentCount = status->recentCount(); - mUnreadCount = status->unreadCount(); + mUnseenCount = status->unseenCount(); setError(error); } diff --git a/src/async/imap/MCIMAPFolderStatusOperation.h b/src/async/imap/MCIMAPFolderStatusOperation.h index 21b69edf..71811ca7 100644 --- a/src/async/imap/MCIMAPFolderStatusOperation.h +++ b/src/async/imap/MCIMAPFolderStatusOperation.h @@ -26,7 +26,7 @@ namespace mailcore { virtual uint32_t uidValidity(); virtual uint32_t messageCount(); virtual uint32_t recentCount(); - virtual uint32_t unreadCount(); + virtual uint32_t unseenCount(); public: // subclass behavior virtual void main(); @@ -37,7 +37,7 @@ namespace mailcore { uint32_t mUidValidity; uint32_t mMessageCount; uint32_t mRecentCount; - uint32_t mUnreadCount; + uint32_t mUnseenCount; }; } diff --git a/src/core/imap/MCIMAPFolderStatus.cc b/src/core/imap/MCIMAPFolderStatus.cc index cd5bd57d..7b6a8bbd 100644 --- a/src/core/imap/MCIMAPFolderStatus.cc +++ b/src/core/imap/MCIMAPFolderStatus.cc @@ -12,7 +12,7 @@ using namespace mailcore; void IMAPFolderStatus::init() { - mUnreadCount = 0; + mUnseenCount = 0; mMessageCount = 0; mRecentCount = 0; mUidNext = 0; @@ -28,7 +28,7 @@ IMAPFolderStatus::IMAPFolderStatus() IMAPFolderStatus::IMAPFolderStatus(IMAPFolderStatus * other) { init(); - setUnreadCount(other->unreadCount()); + setUnseenCount(other->unseenCount()); setMessageCount(other->messageCount()); setRecentCount(other->recentCount()); setUidNext(other->uidNext()); @@ -43,14 +43,14 @@ Object * IMAPFolderStatus::copy() return new IMAPFolderStatus(this); } -void IMAPFolderStatus::setUnreadCount(u_int32_t unseen) +void IMAPFolderStatus::setUnseenCount(u_int32_t unseen) { - mUnreadCount = unseen; + mUnseenCount = unseen; } -u_int32_t IMAPFolderStatus::unreadCount() +u_int32_t IMAPFolderStatus::unseenCount() { - return mUnreadCount; + return mUnseenCount; } void IMAPFolderStatus::setMessageCount(u_int32_t messages) diff --git a/src/core/imap/MCIMAPFolderStatus.h b/src/core/imap/MCIMAPFolderStatus.h index c9b3664f..818cd790 100644 --- a/src/core/imap/MCIMAPFolderStatus.h +++ b/src/core/imap/MCIMAPFolderStatus.h @@ -19,37 +19,36 @@ namespace mailcore { class IMAPFolderStatus : public Object { public: - - IMAPFolderStatus(); - virtual ~IMAPFolderStatus(); - - virtual void setUnreadCount(u_int32_t unread); - virtual u_int32_t unreadCount(); - + + IMAPFolderStatus(); + virtual ~IMAPFolderStatus(); + + virtual void setUnseenCount(u_int32_t unseen); + virtual u_int32_t unseenCount(); + virtual void setMessageCount(u_int32_t messages); virtual u_int32_t messageCount(); - - virtual void setRecentCount(u_int32_t recent); + + virtual void setRecentCount(u_int32_t recent); virtual u_int32_t recentCount(); - - virtual void setUidNext(u_int32_t uidNext); + + virtual void setUidNext(u_int32_t uidNext); virtual u_int32_t uidNext(); - - virtual void setUidValidity(u_int32_t uidValidity); + + virtual void setUidValidity(u_int32_t uidValidity); virtual u_int32_t uidValidity(); - public: // subclass behavior IMAPFolderStatus(IMAPFolderStatus * other); virtual Object * copy(); - + private: - u_int32_t mUnreadCount; - u_int32_t mMessageCount; - u_int32_t mRecentCount; - u_int32_t mUidNext; - u_int32_t mUidValidity; - + u_int32_t mUnseenCount; + u_int32_t mMessageCount; + u_int32_t mRecentCount; + u_int32_t mUidNext; + u_int32_t mUidValidity; + void init(); }; diff --git a/src/core/imap/MCIMAPSession.cc b/src/core/imap/MCIMAPSession.cc index 60d2e851..9fc8aa21 100644 --- a/src/core/imap/MCIMAPSession.cc +++ b/src/core/imap/MCIMAPSession.cc @@ -914,7 +914,7 @@ IMAPFolderStatus * IMAPSession::folderStatus(String * folder, ErrorCode * pError switch (status_info->st_att) { case MAILIMAP_STATUS_ATT_UNSEEN: - fs->setUnreadCount(status_info->st_value); + fs->setUnseenCount(status_info->st_value); break; case MAILIMAP_STATUS_ATT_MESSAGES: fs->setMessageCount(status_info->st_value); diff --git a/src/core/imap/MCIMAPSession.h b/src/core/imap/MCIMAPSession.h index 305baa87..40e3a1da 100644 --- a/src/core/imap/MCIMAPSession.h +++ b/src/core/imap/MCIMAPSession.h @@ -10,11 +10,11 @@ #ifdef __cplusplus namespace mailcore { - + extern String * IMAPNamespacePersonal; extern String * IMAPNamespaceOther; extern String * IMAPNamespaceShared; - + class IMAPNamespace; class IMAPSearchExpression; class IMAPFolder; @@ -26,63 +26,60 @@ namespace mailcore { public: IMAPSession(); virtual ~IMAPSession(); - - - virtual void setHostname(String * hostname); virtual String * hostname(); - + virtual void setPort(unsigned int port); virtual unsigned int port(); - + virtual void setUsername(String * username); virtual String * username(); - + virtual void setPassword(String * password); virtual String * password(); - + virtual void setAuthType(AuthType authType); virtual AuthType authType(); - + virtual void setConnectionType(ConnectionType connectionType); virtual ConnectionType connectionType(); - + virtual void setTimeout(time_t timeout); virtual time_t timeout(); virtual void setCheckCertificateEnabled(bool enabled); virtual bool isCheckCertificateEnabled(); - + virtual void setVoIPEnabled(bool enabled); virtual bool isVoIPEnabled(); - + // Needed for fetchSubscribedFolders() and fetchAllFolders(). virtual void setDelimiter(char delimiter); virtual char delimiter(); - + // Needed for fetchSubscribedFolders() and fetchAllFolders(). virtual void setDefaultNamespace(IMAPNamespace * ns); virtual IMAPNamespace * defaultNamespace(); - + virtual void select(String * folder, ErrorCode * pError); virtual IMAPFolderStatus * folderStatus(String * folder, ErrorCode * pError); virtual Array * /* IMAPFolder */ fetchSubscribedFolders(ErrorCode * pError); virtual Array * /* IMAPFolder */ fetchAllFolders(ErrorCode * pError); // will use xlist if available - + virtual void renameFolder(String * folder, String * otherName, ErrorCode * pError); virtual void deleteFolder(String * folder, ErrorCode * pError); virtual void createFolder(String * folder, ErrorCode * pError); - + virtual void subscribeFolder(String * folder, ErrorCode * pError); virtual void unsubscribeFolder(String * folder, ErrorCode * pError); - + virtual void appendMessage(String * folder, Data * messageData, MessageFlag flags, - IMAPProgressCallback * progressCallback, uint32_t * createdUID, ErrorCode * pError); + IMAPProgressCallback * progressCallback, uint32_t * createdUID, ErrorCode * pError); virtual void copyMessages(String * folder, IndexSet * uidSet, String * destFolder, - IndexSet ** pDestUIDs, ErrorCode * pError); + IndexSet ** pDestUIDs, ErrorCode * pError); virtual void expunge(String * folder, ErrorCode * pError); @@ -92,11 +89,11 @@ namespace mailcore { IndexSet * numbers, IMAPProgressCallback * progressCallback, ErrorCode * pError); virtual Data * fetchMessageByUID(String * folder, uint32_t uid, - IMAPProgressCallback * progressCallback, ErrorCode * pError); + IMAPProgressCallback * progressCallback, ErrorCode * pError); virtual Data * fetchMessageAttachmentByUID(String * folder, uint32_t uid, String * partID, - Encoding encoding, IMAPProgressCallback * progressCallback, ErrorCode * pError); - virtual HashMap * fetchMessageNumberUIDMapping(String * folder, uint32_t fromUID, uint32_t toUID, - ErrorCode * pError); + Encoding encoding, IMAPProgressCallback * progressCallback, ErrorCode * pError); + virtual HashMap * fetchMessageNumberUIDMapping(String * folder, uint32_t fromUID, uint32_t toUID, + ErrorCode * pError); /* When CONDSTORE or QRESYNC is available */ virtual IMAPSyncResult * syncMessagesByUID(String * folder, IMAPMessagesRequestKind requestKind, @@ -131,17 +128,15 @@ namespace mailcore { virtual unsigned int lastFolderMessageCount(); virtual uint32_t firstUnseenUid(); - - - virtual bool isIdleEnabled(); - virtual bool isXListEnabled(); - virtual bool isCondstoreEnabled(); - virtual bool isQResyncEnabled(); - virtual bool isIdentityEnabled(); + virtual bool isIdleEnabled(); + virtual bool isXListEnabled(); + virtual bool isCondstoreEnabled(); + virtual bool isQResyncEnabled(); + virtual bool isIdentityEnabled(); public: // private virtual void loginIfNeeded(ErrorCode * pError); - virtual void connectIfNeeded(ErrorCode * pError); + virtual void connectIfNeeded(ErrorCode * pError); private: String * mHostname; @@ -156,21 +151,19 @@ namespace mailcore { IMAPNamespace * mDefaultNamespace; time_t mTimeout; - bool mBodyProgressEnabled; + bool mBodyProgressEnabled; bool mIdleEnabled; bool mXListEnabled; - bool mCondstoreEnabled; - bool mQResyncEnabled; - bool mIdentityEnabled; + bool mCondstoreEnabled; + bool mQResyncEnabled; + bool mIdentityEnabled; String * mWelcomeString; bool mNeedsMboxMailWorkaround; uint32_t mUIDValidity; uint32_t mUIDNext; - uint64_t mModSequenceValue; + uint64_t mModSequenceValue; unsigned int mFolderMsgCount; - uint32_t mFirstUnseenUid; - - + uint32_t mFirstUnseenUid; unsigned int mLastFetchedSequenceNumber; String * mCurrentFolder; @@ -193,7 +186,6 @@ namespace mailcore { IMAPSyncResult * fetchMessages(String * folder, IMAPMessagesRequestKind requestKind, bool fetchByUID, struct mailimap_set * imapset, uint64_t modseq, HashMap * mapping, uint32_t startUid, IMAPProgressCallback * progressCallback, ErrorCode * pError); - }; } diff --git a/src/objc/imap/MCOIMAPFolderStatusOperation.mm b/src/objc/imap/MCOIMAPFolderStatusOperation.mm index 990a71cc..21b937b9 100644 --- a/src/objc/imap/MCOIMAPFolderStatusOperation.mm +++ b/src/objc/imap/MCOIMAPFolderStatusOperation.mm @@ -55,7 +55,7 @@ typedef void (^CompletionType)(NSError *error, MCOIMAPFolderStatus *status); [status setUidValidity:MCO_NATIVE_INSTANCE->uidValidity()]; [status setTotalMessages:MCO_NATIVE_INSTANCE->messageCount()]; [status setTotalRecent:MCO_NATIVE_INSTANCE->recentCount()]; - [status setTotalUnseen:MCO_NATIVE_INSTANCE->unreadCount()]; + [status setTotalUnseen:MCO_NATIVE_INSTANCE->unseenCount()]; _completionBlock(nil, status); } else { |