diff options
Diffstat (limited to 'src/async')
44 files changed, 58 insertions, 19 deletions
diff --git a/src/async/imap/MCIMAPAppendMessageOperation.h b/src/async/imap/MCIMAPAppendMessageOperation.h index 90834c1f..4f210ac8 100644 --- a/src/async/imap/MCIMAPAppendMessageOperation.h +++ b/src/async/imap/MCIMAPAppendMessageOperation.h @@ -32,13 +32,14 @@ namespace mailcore { public: // subclass behavior virtual void main(); - + private: Data * mMessageData; MessageFlag mFlags; uint32_t mCreatedUID; }; + } #endif diff --git a/src/async/imap/MCIMAPAsyncConnection.cc b/src/async/imap/MCIMAPAsyncConnection.cc index 4909310f..8403b3ed 100755 --- a/src/async/imap/MCIMAPAsyncConnection.cc +++ b/src/async/imap/MCIMAPAsyncConnection.cc @@ -43,7 +43,8 @@ using namespace mailcore; namespace mailcore { - class IMAPOperationQueueCallback : public Object, public OperationQueueCallback { + + class IMAPOperationQueueCallback : public Object, public OperationQueueCallback { public: IMAPOperationQueueCallback(IMAPAsyncConnection * connection) { mConnection = connection; @@ -86,6 +87,7 @@ namespace mailcore { private: IMAPAsyncConnection * mConnection; }; + } IMAPAsyncConnection::IMAPAsyncConnection() diff --git a/src/async/imap/MCIMAPAsyncConnection.h b/src/async/imap/MCIMAPAsyncConnection.h index b975ed69..ef6893c8 100755 --- a/src/async/imap/MCIMAPAsyncConnection.h +++ b/src/async/imap/MCIMAPAsyncConnection.h @@ -178,6 +178,7 @@ namespace mailcore { virtual bool isQueueRunning(); virtual void setQueueRunning(bool running); }; + } #endif diff --git a/src/async/imap/MCIMAPAsyncSession.h b/src/async/imap/MCIMAPAsyncSession.h index fa29131a..6870d739 100755 --- a/src/async/imap/MCIMAPAsyncSession.h +++ b/src/async/imap/MCIMAPAsyncSession.h @@ -184,6 +184,7 @@ namespace mailcore { virtual IMAPAsyncConnection * matchingSessionForFolder(String * folder); virtual IMAPAsyncConnection * availableSession(); }; + } #endif diff --git a/src/async/imap/MCIMAPCapabilityOperation.h b/src/async/imap/MCIMAPCapabilityOperation.h index 82a51d93..7e1e7386 100644 --- a/src/async/imap/MCIMAPCapabilityOperation.h +++ b/src/async/imap/MCIMAPCapabilityOperation.h @@ -30,6 +30,7 @@ namespace mailcore { private: IndexSet * mCapabilities; }; + } #endif diff --git a/src/async/imap/MCIMAPCheckAccountOperation.h b/src/async/imap/MCIMAPCheckAccountOperation.h index 78c95d52..a1525500 100644 --- a/src/async/imap/MCIMAPCheckAccountOperation.h +++ b/src/async/imap/MCIMAPCheckAccountOperation.h @@ -20,6 +20,7 @@ namespace mailcore { public: // subclass behavior virtual void main(); }; + } #endif diff --git a/src/async/imap/MCIMAPConnectOperation.h b/src/async/imap/MCIMAPConnectOperation.h index a5d3c035..e2ecebb0 100644 --- a/src/async/imap/MCIMAPConnectOperation.h +++ b/src/async/imap/MCIMAPConnectOperation.h @@ -19,6 +19,7 @@ namespace mailcore { public: // subclass behavior virtual void main(); }; + } #endif diff --git a/src/async/imap/MCIMAPCopyMessagesOperation.h b/src/async/imap/MCIMAPCopyMessagesOperation.h index 06f1eff8..4267d348 100644 --- a/src/async/imap/MCIMAPCopyMessagesOperation.h +++ b/src/async/imap/MCIMAPCopyMessagesOperation.h @@ -38,6 +38,7 @@ namespace mailcore { String * mDestFolder; IndexSet * mDestUids; }; + } #endif diff --git a/src/async/imap/MCIMAPCreateFolderOperation.h b/src/async/imap/MCIMAPCreateFolderOperation.h index 8aa360ca..2116df08 100644 --- a/src/async/imap/MCIMAPCreateFolderOperation.h +++ b/src/async/imap/MCIMAPCreateFolderOperation.h @@ -23,6 +23,7 @@ namespace mailcore { public: // subclass behavior virtual void main(); }; + } #endif diff --git a/src/async/imap/MCIMAPDeleteFolderOperation.h b/src/async/imap/MCIMAPDeleteFolderOperation.h index 5644cf84..3d350eb0 100644 --- a/src/async/imap/MCIMAPDeleteFolderOperation.h +++ b/src/async/imap/MCIMAPDeleteFolderOperation.h @@ -23,6 +23,7 @@ namespace mailcore { public: // subclass behavior virtual void main(); }; + } #endif diff --git a/src/async/imap/MCIMAPDisconnectOperation.h b/src/async/imap/MCIMAPDisconnectOperation.h index 5d572def..2bd00c5e 100644 --- a/src/async/imap/MCIMAPDisconnectOperation.h +++ b/src/async/imap/MCIMAPDisconnectOperation.h @@ -25,6 +25,7 @@ namespace mailcore { public: // subclass behavior virtual void main(); }; + } #endif diff --git a/src/async/imap/MCIMAPExpungeOperation.h b/src/async/imap/MCIMAPExpungeOperation.h index 270eac60..7e9df62e 100644 --- a/src/async/imap/MCIMAPExpungeOperation.h +++ b/src/async/imap/MCIMAPExpungeOperation.h @@ -24,6 +24,7 @@ namespace mailcore { public: // subclass behavior virtual void main(); }; + } #endif diff --git a/src/async/imap/MCIMAPFetchContentOperation.h b/src/async/imap/MCIMAPFetchContentOperation.h index 7de797ae..0e3718d4 100644 --- a/src/async/imap/MCIMAPFetchContentOperation.h +++ b/src/async/imap/MCIMAPFetchContentOperation.h @@ -43,6 +43,7 @@ namespace mailcore { Data * mData; }; + } #endif diff --git a/src/async/imap/MCIMAPFetchFoldersOperation.h b/src/async/imap/MCIMAPFetchFoldersOperation.h index 057df493..09d724aa 100644 --- a/src/async/imap/MCIMAPFetchFoldersOperation.h +++ b/src/async/imap/MCIMAPFetchFoldersOperation.h @@ -37,6 +37,7 @@ namespace mailcore { Array * mFolders; }; + } #endif diff --git a/src/async/imap/MCIMAPFetchMessagesOperation.h b/src/async/imap/MCIMAPFetchMessagesOperation.h index 2a57e44c..ec9aa0c4 100644 --- a/src/async/imap/MCIMAPFetchMessagesOperation.h +++ b/src/async/imap/MCIMAPFetchMessagesOperation.h @@ -53,6 +53,7 @@ namespace mailcore { uint64_t mModSequenceValue; }; + } #endif diff --git a/src/async/imap/MCIMAPFetchNamespaceOperation.h b/src/async/imap/MCIMAPFetchNamespaceOperation.h index a1e32ec7..1138e62f 100644 --- a/src/async/imap/MCIMAPFetchNamespaceOperation.h +++ b/src/async/imap/MCIMAPFetchNamespaceOperation.h @@ -31,6 +31,7 @@ namespace mailcore { HashMap * mNamespaces; }; + } #endif diff --git a/src/async/imap/MCIMAPFolderInfoOperation.cc b/src/async/imap/MCIMAPFolderInfoOperation.cc index c6bba891..8ca500f3 100644 --- a/src/async/imap/MCIMAPFolderInfoOperation.cc +++ b/src/async/imap/MCIMAPFolderInfoOperation.cc @@ -73,7 +73,7 @@ void IMAPFolderInfoOperation::main() mModSequenceValue = session()->session()->modSequenceValue(); mMessageCount = session()->session()->lastFolderMessageCount(); mFirstUnseenUid = session()->session()->firstUnseenUid(); - + setError(error); } diff --git a/src/async/imap/MCIMAPIdentityOperation.h b/src/async/imap/MCIMAPIdentityOperation.h index 16f592a5..9426e092 100644 --- a/src/async/imap/MCIMAPIdentityOperation.h +++ b/src/async/imap/MCIMAPIdentityOperation.h @@ -37,6 +37,7 @@ namespace mailcore { IMAPIdentity * mServerIdentity; }; + } #endif diff --git a/src/async/imap/MCIMAPIdleOperation.cc b/src/async/imap/MCIMAPIdleOperation.cc index f10518f5..7e7eaeb3 100644 --- a/src/async/imap/MCIMAPIdleOperation.cc +++ b/src/async/imap/MCIMAPIdleOperation.cc @@ -49,11 +49,11 @@ void IMAPIdleOperation::main() { ErrorCode error; session()->session()->selectIfNeeded(folder(), &error); - if (error != ErrorNone) { + if (error != ErrorNone) { setError(error); return; } - + performMethodOnMainThread((Object::Method) &IMAPIdleOperation::prepare, NULL, true); if (!mSetupSuccess) { diff --git a/src/async/imap/MCIMAPIdleOperation.h b/src/async/imap/MCIMAPIdleOperation.h index 32ed0877..37e550b5 100644 --- a/src/async/imap/MCIMAPIdleOperation.h +++ b/src/async/imap/MCIMAPIdleOperation.h @@ -35,6 +35,7 @@ namespace mailcore { void prepare(); void unprepare(); }; + } #endif diff --git a/src/async/imap/MCIMAPMessageRenderingOperation.h b/src/async/imap/MCIMAPMessageRenderingOperation.h index 9840fd88..6c75c373 100644 --- a/src/async/imap/MCIMAPMessageRenderingOperation.h +++ b/src/async/imap/MCIMAPMessageRenderingOperation.h @@ -40,6 +40,7 @@ namespace mailcore { IMAPMessage * mMessage; }; + } #endif diff --git a/src/async/imap/MCIMAPMultiDisconnectOperation.h b/src/async/imap/MCIMAPMultiDisconnectOperation.h index 673d19e3..d2d132c0 100644 --- a/src/async/imap/MCIMAPMultiDisconnectOperation.h +++ b/src/async/imap/MCIMAPMultiDisconnectOperation.h @@ -33,6 +33,7 @@ namespace mailcore { Array * _operations; unsigned int _count; }; + } #endif diff --git a/src/async/imap/MCIMAPNoopOperation.h b/src/async/imap/MCIMAPNoopOperation.h index 4ceff687..935f977d 100644 --- a/src/async/imap/MCIMAPNoopOperation.h +++ b/src/async/imap/MCIMAPNoopOperation.h @@ -24,6 +24,7 @@ namespace mailcore { public: // subclass behavior virtual void main(); }; + } #endif diff --git a/src/async/imap/MCIMAPOperation.h b/src/async/imap/MCIMAPOperation.h index e7dcb9a5..29b0782c 100644 --- a/src/async/imap/MCIMAPOperation.h +++ b/src/async/imap/MCIMAPOperation.h @@ -50,7 +50,7 @@ namespace mailcore { ErrorCode mError; private: - virtual void bodyProgress(IMAPSession * session, unsigned int current, unsigned int maximum); + virtual void bodyProgress(IMAPSession * session, unsigned int current, unsigned int maximum); virtual void bodyProgressOnMainThread(void * context); virtual void itemsProgress(IMAPSession * session, unsigned int current, unsigned int maximum); virtual void itemsProgressOnMainThread(void * context); diff --git a/src/async/imap/MCIMAPQuotaOperation.h b/src/async/imap/MCIMAPQuotaOperation.h index 5cef943c..1c8b737a 100644 --- a/src/async/imap/MCIMAPQuotaOperation.h +++ b/src/async/imap/MCIMAPQuotaOperation.h @@ -32,6 +32,7 @@ namespace mailcore { uint32_t mLimit; uint32_t mUsage; }; + } #endif diff --git a/src/async/imap/MCIMAPRenameFolderOperation.h b/src/async/imap/MCIMAPRenameFolderOperation.h index 5db74d4b..dff944c4 100644 --- a/src/async/imap/MCIMAPRenameFolderOperation.h +++ b/src/async/imap/MCIMAPRenameFolderOperation.h @@ -31,6 +31,7 @@ namespace mailcore { String * mOtherName; }; + } #endif diff --git a/src/async/imap/MCIMAPSearchOperation.h b/src/async/imap/MCIMAPSearchOperation.h index ca0c174d..4cacf576 100644 --- a/src/async/imap/MCIMAPSearchOperation.h +++ b/src/async/imap/MCIMAPSearchOperation.h @@ -46,6 +46,7 @@ namespace mailcore { IndexSet * mUids; }; + } #endif diff --git a/src/async/imap/MCIMAPStoreFlagsOperation.h b/src/async/imap/MCIMAPStoreFlagsOperation.h index e4f0f074..0048283c 100644 --- a/src/async/imap/MCIMAPStoreFlagsOperation.h +++ b/src/async/imap/MCIMAPStoreFlagsOperation.h @@ -39,6 +39,7 @@ namespace mailcore { MessageFlag mFlags; }; + } #endif diff --git a/src/async/imap/MCIMAPStoreLabelsOperation.h b/src/async/imap/MCIMAPStoreLabelsOperation.h index 117a0a83..77d94cab 100644 --- a/src/async/imap/MCIMAPStoreLabelsOperation.h +++ b/src/async/imap/MCIMAPStoreLabelsOperation.h @@ -39,6 +39,7 @@ namespace mailcore { Array * /* String */ mLabels; }; + } #endif diff --git a/src/async/imap/MCIMAPSubscribeFolderOperation.h b/src/async/imap/MCIMAPSubscribeFolderOperation.h index 56a6a39a..7cd79eab 100644 --- a/src/async/imap/MCIMAPSubscribeFolderOperation.h +++ b/src/async/imap/MCIMAPSubscribeFolderOperation.h @@ -31,6 +31,7 @@ namespace mailcore { bool mUnsubscribeEnabled; }; + } #endif diff --git a/src/async/pop/MCPOPAsyncSession.cc b/src/async/pop/MCPOPAsyncSession.cc index bb7425e2..07420c0c 100644 --- a/src/async/pop/MCPOPAsyncSession.cc +++ b/src/async/pop/MCPOPAsyncSession.cc @@ -59,6 +59,7 @@ namespace mailcore { private: POPAsyncSession * mSession; }; + } POPAsyncSession::POPAsyncSession() diff --git a/src/async/pop/MCPOPAsyncSession.h b/src/async/pop/MCPOPAsyncSession.h index a37b80ea..b863be11 100644 --- a/src/async/pop/MCPOPAsyncSession.h +++ b/src/async/pop/MCPOPAsyncSession.h @@ -85,6 +85,7 @@ namespace mailcore { virtual POPSession * session(); virtual void logConnection(ConnectionLogType logType, Data * buffer); }; + } #endif diff --git a/src/async/pop/MCPOPFetchHeaderOperation.h b/src/async/pop/MCPOPFetchHeaderOperation.h index d3635eb9..65a86849 100644 --- a/src/async/pop/MCPOPFetchHeaderOperation.h +++ b/src/async/pop/MCPOPFetchHeaderOperation.h @@ -36,6 +36,7 @@ namespace mailcore { MessageHeader * mHeader; }; + } #endif diff --git a/src/async/pop/MCPOPFetchMessageOperation.h b/src/async/pop/MCPOPFetchMessageOperation.h index 877e4380..79f9c7f4 100644 --- a/src/async/pop/MCPOPFetchMessageOperation.h +++ b/src/async/pop/MCPOPFetchMessageOperation.h @@ -33,6 +33,7 @@ namespace mailcore { Data * mData; }; + } #endif diff --git a/src/async/pop/MCPOPFetchMessagesOperation.h b/src/async/pop/MCPOPFetchMessagesOperation.h index 74c97d4d..08ac8b59 100644 --- a/src/async/pop/MCPOPFetchMessagesOperation.h +++ b/src/async/pop/MCPOPFetchMessagesOperation.h @@ -15,6 +15,7 @@ #ifdef __cplusplus namespace mailcore { + class POPFetchMessagesOperation : public POPOperation { public: POPFetchMessagesOperation(); @@ -28,6 +29,7 @@ namespace mailcore { private: Array * /* POPMessageInfo */ mMessages; }; + } #endif diff --git a/src/async/pop/MCPOPOperation.h b/src/async/pop/MCPOPOperation.h index 8134d6a5..ca791fbe 100644 --- a/src/async/pop/MCPOPOperation.h +++ b/src/async/pop/MCPOPOperation.h @@ -41,7 +41,7 @@ namespace mailcore { POPOperationCallback * mPopCallback; ErrorCode mError; private: - virtual void bodyProgress(POPSession * session, unsigned int current, unsigned int maximum); + virtual void bodyProgress(POPSession * session, unsigned int current, unsigned int maximum); virtual void bodyProgressOnMainThread(void * context); }; diff --git a/src/async/smtp/MCSMTPAsyncSession.cc b/src/async/smtp/MCSMTPAsyncSession.cc index 6fda09e1..e24efc09 100644 --- a/src/async/smtp/MCSMTPAsyncSession.cc +++ b/src/async/smtp/MCSMTPAsyncSession.cc @@ -11,6 +11,7 @@ using namespace mailcore; namespace mailcore { + class SMTPOperationQueueCallback : public Object, public OperationQueueCallback { public: SMTPOperationQueueCallback(SMTPAsyncSession * session) { @@ -50,6 +51,7 @@ namespace mailcore { private: SMTPAsyncSession * mSession; }; + } SMTPAsyncSession::SMTPAsyncSession() diff --git a/src/async/smtp/MCSMTPAsyncSession.h b/src/async/smtp/MCSMTPAsyncSession.h index d5e93ecf..63630b77 100644 --- a/src/async/smtp/MCSMTPAsyncSession.h +++ b/src/async/smtp/MCSMTPAsyncSession.h @@ -8,14 +8,14 @@ #ifdef __cplusplus namespace mailcore { - + class MessageBuilder; class SMTPOperation; class SMTPSession; class Address; class SMTPOperationQueueCallback; class SMTPConnectionLogger; - + class SMTPAsyncSession : public Object { public: SMTPAsyncSession(); @@ -67,7 +67,7 @@ namespace mailcore { virtual void tryAutomaticDisconnect(); virtual void logConnection(ConnectionLogType logType, Data * buffer); - private: + private: SMTPSession * mSession; OperationQueue * mQueue; SMTPOperationQueueCallback * mQueueCallback; diff --git a/src/async/smtp/MCSMTPDisconnectOperation.h b/src/async/smtp/MCSMTPDisconnectOperation.h index 8f160029..bd35674f 100644 --- a/src/async/smtp/MCSMTPDisconnectOperation.h +++ b/src/async/smtp/MCSMTPDisconnectOperation.h @@ -25,6 +25,7 @@ namespace mailcore { public: // subclass behavior virtual void main(); }; + } #endif diff --git a/src/async/smtp/MCSMTPNoopOperation.h b/src/async/smtp/MCSMTPNoopOperation.h index 8c97fa0e..53c5d864 100644 --- a/src/async/smtp/MCSMTPNoopOperation.h +++ b/src/async/smtp/MCSMTPNoopOperation.h @@ -16,7 +16,7 @@ #ifdef __cplusplus namespace mailcore { - + class SMTPNoopOperation : public SMTPOperation { public: SMTPNoopOperation(); diff --git a/src/async/smtp/MCSMTPOperation.cc b/src/async/smtp/MCSMTPOperation.cc index 0661ce9f..c0430340 100644 --- a/src/async/smtp/MCSMTPOperation.cc +++ b/src/async/smtp/MCSMTPOperation.cc @@ -82,7 +82,7 @@ void SMTPOperation::bodyProgressOnMainThread(void * ctx) release(); return; } - + struct progressContext * context = (struct progressContext *) ctx; if (mSmtpCallback != NULL) { mSmtpCallback->bodyProgress(this, context->current, context->maximum); diff --git a/src/async/smtp/MCSMTPOperation.h b/src/async/smtp/MCSMTPOperation.h index 1f7a2c79..7f6c9e7b 100644 --- a/src/async/smtp/MCSMTPOperation.h +++ b/src/async/smtp/MCSMTPOperation.h @@ -16,7 +16,7 @@ #ifdef __cplusplus namespace mailcore { - + class SMTPAsyncSession; class SMTPOperationCallback; diff --git a/src/async/smtp/MCSMTPOperationCallback.h b/src/async/smtp/MCSMTPOperationCallback.h index 37a2b486..cf5630ec 100644 --- a/src/async/smtp/MCSMTPOperationCallback.h +++ b/src/async/smtp/MCSMTPOperationCallback.h @@ -14,12 +14,13 @@ namespace mailcore { - class SMTPOperation; + class SMTPOperation; + + class SMTPOperationCallback { + public: + virtual void bodyProgress(SMTPOperation * session, unsigned int current, unsigned int maximum) {}; + }; - class SMTPOperationCallback { - public: - virtual void bodyProgress(SMTPOperation * session, unsigned int current, unsigned int maximum) {}; - }; } #endif diff --git a/src/async/smtp/MCSMTPSendWithDataOperation.h b/src/async/smtp/MCSMTPSendWithDataOperation.h index 6c407bb3..ee325b54 100644 --- a/src/async/smtp/MCSMTPSendWithDataOperation.h +++ b/src/async/smtp/MCSMTPSendWithDataOperation.h @@ -17,7 +17,7 @@ #ifdef __cplusplus namespace mailcore { - + class SMTPSendWithDataOperation : public SMTPOperation { public: SMTPSendWithDataOperation(); @@ -41,6 +41,7 @@ namespace mailcore { Address * mFrom; }; + } #endif |