From 46242b129d4e22a0d95a23263339cb273c98b44d Mon Sep 17 00:00:00 2001 From: "Hoa V. DINH" Date: Fri, 24 Oct 2014 23:32:23 -0700 Subject: Memory usage optimization --- src/core/rfc822/MCMessageParser.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src/core/rfc822/MCMessageParser.h') diff --git a/src/core/rfc822/MCMessageParser.h b/src/core/rfc822/MCMessageParser.h index bf4687cb..3b34ab9e 100644 --- a/src/core/rfc822/MCMessageParser.h +++ b/src/core/rfc822/MCMessageParser.h @@ -5,6 +5,9 @@ #include #include #include +#ifdef __OBJC__ +#import +#endif #ifdef __cplusplus @@ -39,11 +42,23 @@ namespace mailcore { virtual HashMap * serializable(); +#ifdef __OBJC__ + public: + static MessageParser * messageParserWithData(NSData * data); + MessageParser(NSData * data); +#endif + private: Data * mData; AbstractPart * mMainPart; void init(); +#if __APPLE__ + void * mNSData; +#endif + private: + void setBytes(char * bytes, unsigned int length); + Data * dataFromNSData(); }; }; -- cgit v1.2.3 From 386f84abe048c4b37cef42195d612b480021df3f Mon Sep 17 00:00:00 2001 From: "Hoa V. DINH" Date: Fri, 24 Oct 2014 23:55:12 -0700 Subject: Fixed crash, additional memory usage optimization --- build-mac/mailcore2.xcodeproj/project.pbxproj | 6 +++++ src/cmake/core.cmake | 1 + src/core/basetypes/MCData.h | 7 ++++++ src/core/basetypes/MCDataMac.mm | 22 +++++++++++++++++ src/core/rfc822/MCMessageParser.cc | 6 ++--- src/core/rfc822/MCMessageParser.h | 10 ++++---- src/core/rfc822/MCMessageParserMac.mm | 34 +++++++++++++++++++++++++++ src/objc/imap/MCOIMAPFetchContentOperation.mm | 2 +- 8 files changed, 79 insertions(+), 9 deletions(-) create mode 100644 src/core/basetypes/MCDataMac.mm create mode 100644 src/core/rfc822/MCMessageParserMac.mm (limited to 'src/core/rfc822/MCMessageParser.h') diff --git a/build-mac/mailcore2.xcodeproj/project.pbxproj b/build-mac/mailcore2.xcodeproj/project.pbxproj index e4763f82..23efb138 100755 --- a/build-mac/mailcore2.xcodeproj/project.pbxproj +++ b/build-mac/mailcore2.xcodeproj/project.pbxproj @@ -1262,6 +1262,8 @@ C6D4FD3819FA9F57001F7E01 /* MCONNTPFetchServerTimeOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84CFA99319F725CB00FE35D2 /* MCONNTPFetchServerTimeOperation.h */; }; C6D4FD3F19FB7534001F7E01 /* MCMessageParserMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6D4FD3E19FB7534001F7E01 /* MCMessageParserMac.mm */; }; C6D4FD4019FB7786001F7E01 /* MCMessageParserMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6D4FD3E19FB7534001F7E01 /* MCMessageParserMac.mm */; }; + C6D4FD4319FB7DAA001F7E01 /* MCDataMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6D4FD4219FB7DAA001F7E01 /* MCDataMac.mm */; }; + C6D4FD4419FB7DB2001F7E01 /* MCDataMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6D4FD4219FB7DAA001F7E01 /* MCDataMac.mm */; }; C6D6F7F9171E595D006F5B28 /* MCJSON.cc in Sources */ = {isa = PBXBuildFile; fileRef = C6D6F7F7171E595D006F5B28 /* MCJSON.cc */; }; C6D6F7FA171E595D006F5B28 /* MCJSON.cc in Sources */ = {isa = PBXBuildFile; fileRef = C6D6F7F7171E595D006F5B28 /* MCJSON.cc */; }; C6D6F954171E5CB8006F5B28 /* MCMD5.cc in Sources */ = {isa = PBXBuildFile; fileRef = C6D6F950171E5CB8006F5B28 /* MCMD5.cc */; }; @@ -2258,6 +2260,7 @@ C6D42C1B16AE03D6002BB4F9 /* NSString+MCO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+MCO.h"; sourceTree = ""; }; C6D42C1C16AE03D6002BB4F9 /* NSString+MCO.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "NSString+MCO.mm"; sourceTree = ""; }; C6D4FD3E19FB7534001F7E01 /* MCMessageParserMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MCMessageParserMac.mm; sourceTree = ""; }; + C6D4FD4219FB7DAA001F7E01 /* MCDataMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MCDataMac.mm; sourceTree = ""; }; C6D6F7F7171E595D006F5B28 /* MCJSON.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCJSON.cc; sourceTree = ""; }; C6D6F7F8171E595D006F5B28 /* MCJSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCJSON.h; sourceTree = ""; }; C6D6F950171E5CB8006F5B28 /* MCMD5.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCMD5.cc; sourceTree = ""; }; @@ -2809,6 +2812,7 @@ C68B2AF617797389005E61EF /* MCConnectionLoggerUtils.h */, C64EA6A9169E847800778456 /* MCData.cc */, C64EA6AA169E847800778456 /* MCData.h */, + C6D4FD4219FB7DAA001F7E01 /* MCDataMac.mm */, C64EA6AB169E847800778456 /* MCHash.cc */, C64EA6AC169E847800778456 /* MCHash.h */, C64EA6AD169E847800778456 /* MCHashMap.cc */, @@ -4150,6 +4154,7 @@ C64BB23516EDAA17000DB34C /* MCOAbstractMessage.mm in Sources */, C64BB23916EDAA3F000DB34C /* MCOAbstractMessagePart.mm in Sources */, C64BB23C16EDAAC7000DB34C /* MCOAbstractMultipart.mm in Sources */, + C6D4FD4319FB7DAA001F7E01 /* MCDataMac.mm in Sources */, C64BB23F16EDAAE1000DB34C /* MCOAbstractPart.mm in Sources */, C64BB24216EDAAF4000DB34C /* MCOAddress.mm in Sources */, C64BB24516EDAAFE000DB34C /* MCOMessageHeader.mm in Sources */, @@ -4387,6 +4392,7 @@ 84D73765199BFFC7005124E5 /* MCONNTPSession.mm in Sources */, C6BA2BF01705F4E6003F0E9E /* MCOAbstractMessage.mm in Sources */, C6BA2BF11705F4E6003F0E9E /* MCOAbstractMessagePart.mm in Sources */, + C6D4FD4419FB7DB2001F7E01 /* MCDataMac.mm in Sources */, C6BA2BF21705F4E6003F0E9E /* MCOAbstractMultipart.mm in Sources */, C6BA2BF31705F4E6003F0E9E /* MCOAbstractPart.mm in Sources */, C6BA2BF41705F4E6003F0E9E /* MCOAddress.mm in Sources */, diff --git a/src/cmake/core.cmake b/src/cmake/core.cmake index 59139908..4b0782cf 100644 --- a/src/cmake/core.cmake +++ b/src/cmake/core.cmake @@ -14,6 +14,7 @@ IF(APPLE) core/basetypes/MCAutoreleasePoolMac.mm core/basetypes/MCMainThread.mm core/basetypes/MCObjectMac.mm + core/basetypes/MCDataMac.mm core/rfc822/MCMessageParserMac.mm ) ENDIF() diff --git a/src/core/basetypes/MCData.h b/src/core/basetypes/MCData.h index e7363644..131cb722 100644 --- a/src/core/basetypes/MCData.h +++ b/src/core/basetypes/MCData.h @@ -5,6 +5,10 @@ #include #include +#ifdef __APPLE__ +#import +#endif + #ifdef __cplusplus namespace mailcore { @@ -41,6 +45,9 @@ namespace mailcore { public: // private virtual String * charsetWithFilteredHTML(bool filterHTML, String * hintCharset = NULL); +#ifdef __APPLE__ + virtual CFDataRef destructiveNSData(); +#endif public: // subclass behavior Data(Data * otherData); diff --git a/src/core/basetypes/MCDataMac.mm b/src/core/basetypes/MCDataMac.mm new file mode 100644 index 00000000..8081b1f9 --- /dev/null +++ b/src/core/basetypes/MCDataMac.mm @@ -0,0 +1,22 @@ +// +// MCDataMac.m +// mailcore2 +// +// Created by Hoa V. DINH on 10/24/14. +// Copyright (c) 2014 MailCore. All rights reserved. +// + +#include "MCData.h" + +#import + +using namespace mailcore; + +CFDataRef Data::destructiveNSData() +{ + NSData * result = [NSData dataWithBytesNoCopy:(void *) mBytes length:mLength]; + mBytes = NULL; + mAllocated = 0; + mLength = 0; + return (CFDataRef) result; +} diff --git a/src/core/rfc822/MCMessageParser.cc b/src/core/rfc822/MCMessageParser.cc index f8a25bda..404bc862 100644 --- a/src/core/rfc822/MCMessageParser.cc +++ b/src/core/rfc822/MCMessageParser.cc @@ -105,12 +105,12 @@ AbstractPart * MessageParser::mainPart() Data * MessageParser::data() { +#if __APPLE__ if (mNSData != NULL) { return dataFromNSData(); } - else { - return mData; - } +#endif + return mData; } String * MessageParser::description() diff --git a/src/core/rfc822/MCMessageParser.h b/src/core/rfc822/MCMessageParser.h index 3b34ab9e..eba0e052 100644 --- a/src/core/rfc822/MCMessageParser.h +++ b/src/core/rfc822/MCMessageParser.h @@ -5,8 +5,8 @@ #include #include #include -#ifdef __OBJC__ -#import +#ifdef __APPLE__ +#import #endif #ifdef __cplusplus @@ -42,10 +42,10 @@ namespace mailcore { virtual HashMap * serializable(); -#ifdef __OBJC__ +#ifdef __APPLE__ public: - static MessageParser * messageParserWithData(NSData * data); - MessageParser(NSData * data); + static MessageParser * messageParserWithData(CFDataRef data); + MessageParser(CFDataRef data); #endif private: diff --git a/src/core/rfc822/MCMessageParserMac.mm b/src/core/rfc822/MCMessageParserMac.mm new file mode 100644 index 00000000..6748ed1a --- /dev/null +++ b/src/core/rfc822/MCMessageParserMac.mm @@ -0,0 +1,34 @@ +// +// MCMessageParserMac.m +// mailcore2 +// +// Created by Hoa V. DINH on 10/24/14. +// Copyright (c) 2014 MailCore. All rights reserved. +// + +#include "MCMessageParser.h" + +#import + +#import "NSData+MCO.h" + +using namespace mailcore; + +MessageParser * MessageParser::messageParserWithData(CFDataRef data) +{ + MessageParser * parser = new MessageParser(data); + return (MessageParser *) parser->autorelease(); +} + +MessageParser::MessageParser(CFDataRef data) +{ + init(); + + setBytes((char *) [(NSData *) data bytes], (unsigned int) [(NSData *) data length]); + mNSData = [(NSData *) data retain]; +} + +Data * MessageParser::dataFromNSData() +{ + return [(NSData *) mNSData mco_mcData]; +} diff --git a/src/objc/imap/MCOIMAPFetchContentOperation.mm b/src/objc/imap/MCOIMAPFetchContentOperation.mm index 791307ca..9ca4c1c4 100644 --- a/src/objc/imap/MCOIMAPFetchContentOperation.mm +++ b/src/objc/imap/MCOIMAPFetchContentOperation.mm @@ -61,7 +61,7 @@ typedef void (^CompletionType)(NSError *error, NSData * data); nativeType *op = MCO_NATIVE_INSTANCE; if (op->error() == mailcore::ErrorNone) { - _completionBlock(nil, MCO_TO_OBJC(op->data())); + _completionBlock(nil, (NSData *) op->data()->destructiveNSData()); } else { _completionBlock([NSError mco_errorWithErrorCode:op->error()], nil); } -- cgit v1.2.3 From b6c488d68dc17cddbf5806bd645e167488d50366 Mon Sep 17 00:00:00 2001 From: "Hoa V. DINH" Date: Sat, 22 Nov 2014 20:26:57 -0800 Subject: added export --- src/async/imap/MCIMAPAppendMessageOperation.h | 1 + src/async/imap/MCIMAPAsyncConnection.h | 1 + src/async/imap/MCIMAPAsyncSession.h | 1 + src/async/imap/MCIMAPCapabilityOperation.h | 1 + src/async/imap/MCIMAPCheckAccountOperation.h | 1 + src/async/imap/MCIMAPConnectOperation.h | 1 + src/async/imap/MCIMAPCopyMessagesOperation.h | 1 + src/async/imap/MCIMAPCreateFolderOperation.h | 1 + src/async/imap/MCIMAPDeleteFolderOperation.h | 1 + src/async/imap/MCIMAPDisconnectOperation.h | 1 + src/async/imap/MCIMAPExpungeOperation.h | 1 + src/async/imap/MCIMAPFetchContentOperation.h | 1 + src/async/imap/MCIMAPFetchFoldersOperation.h | 1 + src/async/imap/MCIMAPFetchMessagesOperation.h | 1 + src/async/imap/MCIMAPFetchNamespaceOperation.h | 1 + src/async/imap/MCIMAPFetchParsedContentOperation.h | 1 + src/async/imap/MCIMAPFolderInfoOperation.h | 1 + src/async/imap/MCIMAPFolderStatusOperation.h | 1 + src/async/imap/MCIMAPIdentityOperation.h | 1 + src/async/imap/MCIMAPIdleOperation.h | 1 + src/async/imap/MCIMAPMessageRenderingOperation.h | 1 + src/async/imap/MCIMAPMultiDisconnectOperation.h | 1 + src/async/imap/MCIMAPNoopOperation.h | 1 + src/async/imap/MCIMAPOperation.h | 1 + src/async/imap/MCIMAPOperationCallback.h | 1 + src/async/imap/MCIMAPQuotaOperation.h | 1 + src/async/imap/MCIMAPRenameFolderOperation.h | 1 + src/async/imap/MCIMAPSearchOperation.h | 1 + src/async/imap/MCIMAPStoreFlagsOperation.h | 1 + src/async/imap/MCIMAPStoreLabelsOperation.h | 1 + src/async/imap/MCIMAPSubscribeFolderOperation.h | 1 + src/async/nntp/MCNNTPAsyncSession.h | 1 + src/async/nntp/MCNNTPCheckAccountOperation.h | 1 + src/async/nntp/MCNNTPDisconnectOperation.h | 1 + src/async/nntp/MCNNTPFetchAllArticlesOperation.h | 1 + src/async/nntp/MCNNTPFetchArticleOperation.h | 1 + src/async/nntp/MCNNTPFetchHeaderOperation.h | 1 + src/async/nntp/MCNNTPFetchOverviewOperation.h | 1 + src/async/nntp/MCNNTPFetchServerTimeOperation.h | 1 + src/async/nntp/MCNNTPListNewsgroupsOperation.h | 1 + src/async/nntp/MCNNTPOperation.h | 1 + src/async/nntp/MCNNTPOperationCallback.h | 1 + src/async/pop/MCPOPAsyncSession.h | 1 + src/async/pop/MCPOPCheckAccountOperation.h | 1 + src/async/pop/MCPOPDeleteMessagesOperation.h | 1 + src/async/pop/MCPOPFetchHeaderOperation.h | 1 + src/async/pop/MCPOPFetchMessageOperation.h | 1 + src/async/pop/MCPOPFetchMessagesOperation.h | 1 + src/async/pop/MCPOPNoopOperation.h | 1 + src/async/pop/MCPOPOperation.h | 1 + src/async/pop/MCPOPOperationCallback.h | 1 + src/async/smtp/MCSMTPAsyncSession.h | 1 + src/async/smtp/MCSMTPCheckAccountOperation.h | 1 + src/async/smtp/MCSMTPDisconnectOperation.h | 1 + src/async/smtp/MCSMTPLoginOperation.h | 1 + src/async/smtp/MCSMTPNoopOperation.h | 1 + src/async/smtp/MCSMTPOperation.h | 1 + src/async/smtp/MCSMTPOperationCallback.h | 1 + src/async/smtp/MCSMTPSendWithDataOperation.h | 1 + src/core/abstract/MCAbstractMessage.h | 1 + src/core/abstract/MCAbstractMessagePart.h | 1 + src/core/abstract/MCAbstractMultipart.h | 1 + src/core/abstract/MCAbstractPart.h | 1 + src/core/abstract/MCAddress.h | 1 + src/core/abstract/MCMessageHeader.h | 1 + src/core/basetypes/MCArray.h | 1 + src/core/basetypes/MCAssert.h | 1 + src/core/basetypes/MCAutoreleasePool.h | 1 + src/core/basetypes/MCConnectionLogger.h | 1 + src/core/basetypes/MCData.h | 1 + src/core/basetypes/MCHashMap.h | 1 + src/core/basetypes/MCIndexSet.h | 1 + src/core/basetypes/MCJSON.h | 1 + src/core/basetypes/MCLog.h | 3 +++ src/core/basetypes/MCMD5.h | 3 +++ src/core/basetypes/MCNull.h | 1 + src/core/basetypes/MCObject.h | 7 +++---- src/core/basetypes/MCOperationCallback.h | 1 + src/core/basetypes/MCOperationQueue.h | 1 + src/core/basetypes/MCOperationQueueCallback.h | 1 + src/core/basetypes/MCRange.h | 18 ++++++++++++++++++ src/core/basetypes/MCSet.h | 1 + src/core/basetypes/MCString.h | 1 + src/core/basetypes/MCUtils.h | 10 ++++++++++ src/core/basetypes/MCValue.h | 1 + src/core/imap/MCIMAPFolder.h | 1 + src/core/imap/MCIMAPFolderStatus.h | 1 + src/core/imap/MCIMAPIdentity.h | 1 + src/core/imap/MCIMAPMessage.h | 1 + src/core/imap/MCIMAPMessagePart.h | 1 + src/core/imap/MCIMAPMultipart.h | 1 + src/core/imap/MCIMAPNamespace.h | 1 + src/core/imap/MCIMAPNamespaceItem.h | 1 + src/core/imap/MCIMAPPart.h | 1 + src/core/imap/MCIMAPProgressCallback.h | 1 + src/core/imap/MCIMAPSearchExpression.h | 1 + src/core/imap/MCIMAPSession.h | 1 + src/core/imap/MCIMAPSyncResult.h | 1 + src/core/nntp/MCNNTPGroupInfo.h | 1 + src/core/nntp/MCNNTPProgressCallback.h | 1 + src/core/nntp/MCNNTPSession.h | 1 + src/core/pop/MCPOPMessageInfo.h | 1 + src/core/pop/MCPOPProgressCallback.h | 1 + src/core/pop/MCPOPSession.h | 1 + src/core/provider/MCMailProvider.h | 1 + src/core/provider/MCMailProvidersManager.h | 1 + src/core/provider/MCNetService.h | 1 + src/core/renderer/MCAddressDisplay.h | 1 + src/core/renderer/MCDateFormatter.h | 1 + src/core/renderer/MCHTMLBodyRendererTemplateCallback.h | 1 + src/core/renderer/MCHTMLRendererCallback.h | 2 ++ src/core/renderer/MCHTMLRendererIMAPDataCallback.h | 1 + src/core/renderer/MCSizeFormatter.h | 1 + src/core/rfc822/MCAttachment.h | 1 + src/core/rfc822/MCMessageBuilder.h | 1 + src/core/rfc822/MCMessageParser.h | 1 + src/core/rfc822/MCMessagePart.h | 1 + src/core/rfc822/MCMultipart.h | 1 + src/core/smtp/MCSMTPProgressCallback.h | 1 + src/core/smtp/MCSMTPSession.h | 1 + 120 files changed, 153 insertions(+), 4 deletions(-) (limited to 'src/core/rfc822/MCMessageParser.h') diff --git a/src/async/imap/MCIMAPAppendMessageOperation.h b/src/async/imap/MCIMAPAppendMessageOperation.h index 463d65d4..aba167a7 100644 --- a/src/async/imap/MCIMAPAppendMessageOperation.h +++ b/src/async/imap/MCIMAPAppendMessageOperation.h @@ -17,6 +17,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPAppendMessageOperation : public IMAPOperation { public: IMAPAppendMessageOperation(); diff --git a/src/async/imap/MCIMAPAsyncConnection.h b/src/async/imap/MCIMAPAsyncConnection.h index b267f7c7..79486829 100755 --- a/src/async/imap/MCIMAPAsyncConnection.h +++ b/src/async/imap/MCIMAPAsyncConnection.h @@ -34,6 +34,7 @@ namespace mailcore { class IMAPMessage; class IMAPIdentity; + MAILCORE_EXPORT class IMAPAsyncConnection : public Object { public: IMAPAsyncConnection(); diff --git a/src/async/imap/MCIMAPAsyncSession.h b/src/async/imap/MCIMAPAsyncSession.h index 05b1967c..d9253113 100755 --- a/src/async/imap/MCIMAPAsyncSession.h +++ b/src/async/imap/MCIMAPAsyncSession.h @@ -41,6 +41,7 @@ namespace mailcore { class IMAPIdentity; class OperationQueueCallback; + MAILCORE_EXPORT class IMAPAsyncSession : public Object { public: IMAPAsyncSession(); diff --git a/src/async/imap/MCIMAPCapabilityOperation.h b/src/async/imap/MCIMAPCapabilityOperation.h index b205bd89..e691f169 100644 --- a/src/async/imap/MCIMAPCapabilityOperation.h +++ b/src/async/imap/MCIMAPCapabilityOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPCapabilityOperation : public IMAPOperation { public: IMAPCapabilityOperation(); diff --git a/src/async/imap/MCIMAPCheckAccountOperation.h b/src/async/imap/MCIMAPCheckAccountOperation.h index 7f7dafcb..27a78c19 100644 --- a/src/async/imap/MCIMAPCheckAccountOperation.h +++ b/src/async/imap/MCIMAPCheckAccountOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPCheckAccountOperation : public IMAPOperation { public: // subclass behavior virtual void main(); diff --git a/src/async/imap/MCIMAPConnectOperation.h b/src/async/imap/MCIMAPConnectOperation.h index f48247e2..639dd947 100644 --- a/src/async/imap/MCIMAPConnectOperation.h +++ b/src/async/imap/MCIMAPConnectOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPConnectOperation : public IMAPOperation { public: // subclass behavior virtual void main(); diff --git a/src/async/imap/MCIMAPCopyMessagesOperation.h b/src/async/imap/MCIMAPCopyMessagesOperation.h index a4b5d546..f08e99d3 100644 --- a/src/async/imap/MCIMAPCopyMessagesOperation.h +++ b/src/async/imap/MCIMAPCopyMessagesOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPCopyMessagesOperation : public IMAPOperation { public: IMAPCopyMessagesOperation(); diff --git a/src/async/imap/MCIMAPCreateFolderOperation.h b/src/async/imap/MCIMAPCreateFolderOperation.h index 52c8b1e7..e93aeb0c 100644 --- a/src/async/imap/MCIMAPCreateFolderOperation.h +++ b/src/async/imap/MCIMAPCreateFolderOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPCreateFolderOperation : public IMAPOperation { public: IMAPCreateFolderOperation(); diff --git a/src/async/imap/MCIMAPDeleteFolderOperation.h b/src/async/imap/MCIMAPDeleteFolderOperation.h index 57fee2eb..b7614710 100644 --- a/src/async/imap/MCIMAPDeleteFolderOperation.h +++ b/src/async/imap/MCIMAPDeleteFolderOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPDeleteFolderOperation : public IMAPOperation { public: IMAPDeleteFolderOperation(); diff --git a/src/async/imap/MCIMAPDisconnectOperation.h b/src/async/imap/MCIMAPDisconnectOperation.h index e48c79bf..00c4abf0 100644 --- a/src/async/imap/MCIMAPDisconnectOperation.h +++ b/src/async/imap/MCIMAPDisconnectOperation.h @@ -18,6 +18,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPDisconnectOperation : public IMAPOperation { public: IMAPDisconnectOperation(); diff --git a/src/async/imap/MCIMAPExpungeOperation.h b/src/async/imap/MCIMAPExpungeOperation.h index 505b6c10..76832429 100644 --- a/src/async/imap/MCIMAPExpungeOperation.h +++ b/src/async/imap/MCIMAPExpungeOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPExpungeOperation : public IMAPOperation { public: IMAPExpungeOperation(); diff --git a/src/async/imap/MCIMAPFetchContentOperation.h b/src/async/imap/MCIMAPFetchContentOperation.h index 3cae3c5a..0ce8e67d 100644 --- a/src/async/imap/MCIMAPFetchContentOperation.h +++ b/src/async/imap/MCIMAPFetchContentOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPFetchContentOperation : public IMAPOperation { public: IMAPFetchContentOperation(); diff --git a/src/async/imap/MCIMAPFetchFoldersOperation.h b/src/async/imap/MCIMAPFetchFoldersOperation.h index 83351543..d451db71 100644 --- a/src/async/imap/MCIMAPFetchFoldersOperation.h +++ b/src/async/imap/MCIMAPFetchFoldersOperation.h @@ -17,6 +17,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPFetchFoldersOperation : public IMAPOperation { public: IMAPFetchFoldersOperation(); diff --git a/src/async/imap/MCIMAPFetchMessagesOperation.h b/src/async/imap/MCIMAPFetchMessagesOperation.h index 3183508b..65ce95ad 100644 --- a/src/async/imap/MCIMAPFetchMessagesOperation.h +++ b/src/async/imap/MCIMAPFetchMessagesOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPFetchMessagesOperation : public IMAPOperation { public: IMAPFetchMessagesOperation(); diff --git a/src/async/imap/MCIMAPFetchNamespaceOperation.h b/src/async/imap/MCIMAPFetchNamespaceOperation.h index ae85d9d2..41d24021 100644 --- a/src/async/imap/MCIMAPFetchNamespaceOperation.h +++ b/src/async/imap/MCIMAPFetchNamespaceOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPFetchNamespaceOperation : public IMAPOperation { public: IMAPFetchNamespaceOperation(); diff --git a/src/async/imap/MCIMAPFetchParsedContentOperation.h b/src/async/imap/MCIMAPFetchParsedContentOperation.h index 0262a35b..f33f0acb 100644 --- a/src/async/imap/MCIMAPFetchParsedContentOperation.h +++ b/src/async/imap/MCIMAPFetchParsedContentOperation.h @@ -18,6 +18,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPFetchParsedContentOperation : public IMAPOperation { public: IMAPFetchParsedContentOperation(); diff --git a/src/async/imap/MCIMAPFolderInfoOperation.h b/src/async/imap/MCIMAPFolderInfoOperation.h index b53be2cb..50092915 100644 --- a/src/async/imap/MCIMAPFolderInfoOperation.h +++ b/src/async/imap/MCIMAPFolderInfoOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPFolderInfoOperation : public IMAPOperation { public: IMAPFolderInfoOperation(); diff --git a/src/async/imap/MCIMAPFolderStatusOperation.h b/src/async/imap/MCIMAPFolderStatusOperation.h index c1d70249..7fb9197a 100644 --- a/src/async/imap/MCIMAPFolderStatusOperation.h +++ b/src/async/imap/MCIMAPFolderStatusOperation.h @@ -19,6 +19,7 @@ namespace mailcore { class IMAPFolderStatus; + MAILCORE_EXPORT class IMAPFolderStatusOperation : public IMAPOperation { public: IMAPFolderStatusOperation(); diff --git a/src/async/imap/MCIMAPIdentityOperation.h b/src/async/imap/MCIMAPIdentityOperation.h index 6caef88e..e1b86283 100644 --- a/src/async/imap/MCIMAPIdentityOperation.h +++ b/src/async/imap/MCIMAPIdentityOperation.h @@ -18,6 +18,7 @@ namespace mailcore { class IMAPIdentity; + MAILCORE_EXPORT class IMAPIdentityOperation : public IMAPOperation { public: IMAPIdentityOperation(); diff --git a/src/async/imap/MCIMAPIdleOperation.h b/src/async/imap/MCIMAPIdleOperation.h index da125a23..5df0aecd 100644 --- a/src/async/imap/MCIMAPIdleOperation.h +++ b/src/async/imap/MCIMAPIdleOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPIdleOperation : public IMAPOperation { public: IMAPIdleOperation(); diff --git a/src/async/imap/MCIMAPMessageRenderingOperation.h b/src/async/imap/MCIMAPMessageRenderingOperation.h index 81e1f262..7e1c7b1b 100644 --- a/src/async/imap/MCIMAPMessageRenderingOperation.h +++ b/src/async/imap/MCIMAPMessageRenderingOperation.h @@ -17,6 +17,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPMessageRenderingOperation : public IMAPOperation { public: IMAPMessageRenderingOperation(); diff --git a/src/async/imap/MCIMAPMultiDisconnectOperation.h b/src/async/imap/MCIMAPMultiDisconnectOperation.h index 1575efa1..d40e07cb 100644 --- a/src/async/imap/MCIMAPMultiDisconnectOperation.h +++ b/src/async/imap/MCIMAPMultiDisconnectOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPMultiDisconnectOperation : public IMAPOperation, public OperationCallback { public: IMAPMultiDisconnectOperation(); diff --git a/src/async/imap/MCIMAPNoopOperation.h b/src/async/imap/MCIMAPNoopOperation.h index 8ff3fdaa..0f0f7fdb 100644 --- a/src/async/imap/MCIMAPNoopOperation.h +++ b/src/async/imap/MCIMAPNoopOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPNoopOperation : public IMAPOperation { public: IMAPNoopOperation(); diff --git a/src/async/imap/MCIMAPOperation.h b/src/async/imap/MCIMAPOperation.h index ed5bc560..84967b00 100644 --- a/src/async/imap/MCIMAPOperation.h +++ b/src/async/imap/MCIMAPOperation.h @@ -21,6 +21,7 @@ namespace mailcore { class IMAPAsyncSession; class IMAPOperationCallback; + MAILCORE_EXPORT class IMAPOperation : public Operation, public IMAPProgressCallback { public: IMAPOperation(); diff --git a/src/async/imap/MCIMAPOperationCallback.h b/src/async/imap/MCIMAPOperationCallback.h index cae7ef99..2bc656d1 100644 --- a/src/async/imap/MCIMAPOperationCallback.h +++ b/src/async/imap/MCIMAPOperationCallback.h @@ -16,6 +16,7 @@ namespace mailcore { class IMAPOperation; + MAILCORE_EXPORT class IMAPOperationCallback { public: virtual void bodyProgress(IMAPOperation * session, unsigned int current, unsigned int maximum) {}; diff --git a/src/async/imap/MCIMAPQuotaOperation.h b/src/async/imap/MCIMAPQuotaOperation.h index bff30952..df46a1a2 100644 --- a/src/async/imap/MCIMAPQuotaOperation.h +++ b/src/async/imap/MCIMAPQuotaOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPQuotaOperation : public IMAPOperation { public: IMAPQuotaOperation(); diff --git a/src/async/imap/MCIMAPRenameFolderOperation.h b/src/async/imap/MCIMAPRenameFolderOperation.h index e8ba6fd5..38e0969a 100644 --- a/src/async/imap/MCIMAPRenameFolderOperation.h +++ b/src/async/imap/MCIMAPRenameFolderOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPRenameFolderOperation : public IMAPOperation { public: IMAPRenameFolderOperation(); diff --git a/src/async/imap/MCIMAPSearchOperation.h b/src/async/imap/MCIMAPSearchOperation.h index 60355ca3..95454db9 100644 --- a/src/async/imap/MCIMAPSearchOperation.h +++ b/src/async/imap/MCIMAPSearchOperation.h @@ -19,6 +19,7 @@ namespace mailcore { class IMAPSearchExpression; + MAILCORE_EXPORT class IMAPSearchOperation : public IMAPOperation { public: IMAPSearchOperation(); diff --git a/src/async/imap/MCIMAPStoreFlagsOperation.h b/src/async/imap/MCIMAPStoreFlagsOperation.h index 1687f5cd..5458bcb0 100644 --- a/src/async/imap/MCIMAPStoreFlagsOperation.h +++ b/src/async/imap/MCIMAPStoreFlagsOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPStoreFlagsOperation : public IMAPOperation { public: IMAPStoreFlagsOperation(); diff --git a/src/async/imap/MCIMAPStoreLabelsOperation.h b/src/async/imap/MCIMAPStoreLabelsOperation.h index 53348309..963a5a8a 100644 --- a/src/async/imap/MCIMAPStoreLabelsOperation.h +++ b/src/async/imap/MCIMAPStoreLabelsOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPStoreLabelsOperation : public IMAPOperation { public: IMAPStoreLabelsOperation(); diff --git a/src/async/imap/MCIMAPSubscribeFolderOperation.h b/src/async/imap/MCIMAPSubscribeFolderOperation.h index 8af219b6..45d864b1 100644 --- a/src/async/imap/MCIMAPSubscribeFolderOperation.h +++ b/src/async/imap/MCIMAPSubscribeFolderOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPSubscribeFolderOperation : public IMAPOperation { public: IMAPSubscribeFolderOperation(); diff --git a/src/async/nntp/MCNNTPAsyncSession.h b/src/async/nntp/MCNNTPAsyncSession.h index d18ea119..e0434fb9 100644 --- a/src/async/nntp/MCNNTPAsyncSession.h +++ b/src/async/nntp/MCNNTPAsyncSession.h @@ -19,6 +19,7 @@ namespace mailcore { class NNTPOperationQueueCallback; class NNTPConnectionLogger; + MAILCORE_EXPORT class NNTPAsyncSession : public Object { public: NNTPAsyncSession(); diff --git a/src/async/nntp/MCNNTPCheckAccountOperation.h b/src/async/nntp/MCNNTPCheckAccountOperation.h index 28db9c58..b9bec07b 100644 --- a/src/async/nntp/MCNNTPCheckAccountOperation.h +++ b/src/async/nntp/MCNNTPCheckAccountOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class NNTPCheckAccountOperation : public NNTPOperation { public: NNTPCheckAccountOperation(); diff --git a/src/async/nntp/MCNNTPDisconnectOperation.h b/src/async/nntp/MCNNTPDisconnectOperation.h index f2b5d138..aa5c12a7 100644 --- a/src/async/nntp/MCNNTPDisconnectOperation.h +++ b/src/async/nntp/MCNNTPDisconnectOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class NNTPDisconnectOperation : public NNTPOperation { public: NNTPDisconnectOperation(); diff --git a/src/async/nntp/MCNNTPFetchAllArticlesOperation.h b/src/async/nntp/MCNNTPFetchAllArticlesOperation.h index 88395dee..b40c9720 100644 --- a/src/async/nntp/MCNNTPFetchAllArticlesOperation.h +++ b/src/async/nntp/MCNNTPFetchAllArticlesOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class NNTPFetchAllArticlesOperation : public NNTPOperation { public: NNTPFetchAllArticlesOperation(); diff --git a/src/async/nntp/MCNNTPFetchArticleOperation.h b/src/async/nntp/MCNNTPFetchArticleOperation.h index 7b11ae16..e715ddf6 100644 --- a/src/async/nntp/MCNNTPFetchArticleOperation.h +++ b/src/async/nntp/MCNNTPFetchArticleOperation.h @@ -15,6 +15,7 @@ #ifdef __cplusplus namespace mailcore { + MAILCORE_EXPORT class NNTPFetchArticleOperation : public NNTPOperation { public: NNTPFetchArticleOperation(); diff --git a/src/async/nntp/MCNNTPFetchHeaderOperation.h b/src/async/nntp/MCNNTPFetchHeaderOperation.h index 97b12b05..d12e9f57 100644 --- a/src/async/nntp/MCNNTPFetchHeaderOperation.h +++ b/src/async/nntp/MCNNTPFetchHeaderOperation.h @@ -18,6 +18,7 @@ namespace mailcore { class MessageHeader; + MAILCORE_EXPORT class NNTPFetchHeaderOperation : public NNTPOperation { public: NNTPFetchHeaderOperation(); diff --git a/src/async/nntp/MCNNTPFetchOverviewOperation.h b/src/async/nntp/MCNNTPFetchOverviewOperation.h index aab8d24b..4b48366b 100644 --- a/src/async/nntp/MCNNTPFetchOverviewOperation.h +++ b/src/async/nntp/MCNNTPFetchOverviewOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class NNTPFetchOverviewOperation : public NNTPOperation { public: NNTPFetchOverviewOperation(); diff --git a/src/async/nntp/MCNNTPFetchServerTimeOperation.h b/src/async/nntp/MCNNTPFetchServerTimeOperation.h index 22cebf25..765862bc 100644 --- a/src/async/nntp/MCNNTPFetchServerTimeOperation.h +++ b/src/async/nntp/MCNNTPFetchServerTimeOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class NNTPFetchServerTimeOperation : public NNTPOperation { public: NNTPFetchServerTimeOperation(); diff --git a/src/async/nntp/MCNNTPListNewsgroupsOperation.h b/src/async/nntp/MCNNTPListNewsgroupsOperation.h index 54156012..3450ef3b 100644 --- a/src/async/nntp/MCNNTPListNewsgroupsOperation.h +++ b/src/async/nntp/MCNNTPListNewsgroupsOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class NNTPListNewsgroupsOperation : public NNTPOperation { public: NNTPListNewsgroupsOperation(); diff --git a/src/async/nntp/MCNNTPOperation.h b/src/async/nntp/MCNNTPOperation.h index fb40e9df..a0b49ca2 100644 --- a/src/async/nntp/MCNNTPOperation.h +++ b/src/async/nntp/MCNNTPOperation.h @@ -20,6 +20,7 @@ namespace mailcore { class NNTPAsyncSession; class NNTPOperationCallback; + MAILCORE_EXPORT class NNTPOperation : public Operation, public NNTPProgressCallback { public: NNTPOperation(); diff --git a/src/async/nntp/MCNNTPOperationCallback.h b/src/async/nntp/MCNNTPOperationCallback.h index f6166610..1d455016 100644 --- a/src/async/nntp/MCNNTPOperationCallback.h +++ b/src/async/nntp/MCNNTPOperationCallback.h @@ -16,6 +16,7 @@ namespace mailcore { class NNTPOperation; + MAILCORE_EXPORT class NNTPOperationCallback { public: virtual void bodyProgress(NNTPOperation * session, unsigned int current, unsigned int maximum) {}; diff --git a/src/async/pop/MCPOPAsyncSession.h b/src/async/pop/MCPOPAsyncSession.h index dae0f7b7..eab64f60 100644 --- a/src/async/pop/MCPOPAsyncSession.h +++ b/src/async/pop/MCPOPAsyncSession.h @@ -25,6 +25,7 @@ namespace mailcore { class POPOperationQueueCallback; class POPConnectionLogger; + MAILCORE_EXPORT class POPAsyncSession : public Object { public: POPAsyncSession(); diff --git a/src/async/pop/MCPOPCheckAccountOperation.h b/src/async/pop/MCPOPCheckAccountOperation.h index 6f00af77..7978372f 100644 --- a/src/async/pop/MCPOPCheckAccountOperation.h +++ b/src/async/pop/MCPOPCheckAccountOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class POPCheckAccountOperation : public POPOperation { public: POPCheckAccountOperation(); diff --git a/src/async/pop/MCPOPDeleteMessagesOperation.h b/src/async/pop/MCPOPDeleteMessagesOperation.h index a973fa78..30332a78 100644 --- a/src/async/pop/MCPOPDeleteMessagesOperation.h +++ b/src/async/pop/MCPOPDeleteMessagesOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class POPDeleteMessagesOperation : public POPOperation { public: POPDeleteMessagesOperation(); diff --git a/src/async/pop/MCPOPFetchHeaderOperation.h b/src/async/pop/MCPOPFetchHeaderOperation.h index d046654b..f124dfe9 100644 --- a/src/async/pop/MCPOPFetchHeaderOperation.h +++ b/src/async/pop/MCPOPFetchHeaderOperation.h @@ -18,6 +18,7 @@ namespace mailcore { class MessageHeader; + MAILCORE_EXPORT class POPFetchHeaderOperation : public POPOperation { public: POPFetchHeaderOperation(); diff --git a/src/async/pop/MCPOPFetchMessageOperation.h b/src/async/pop/MCPOPFetchMessageOperation.h index 86d08af3..a03eb08f 100644 --- a/src/async/pop/MCPOPFetchMessageOperation.h +++ b/src/async/pop/MCPOPFetchMessageOperation.h @@ -15,6 +15,7 @@ #ifdef __cplusplus namespace mailcore { + MAILCORE_EXPORT class POPFetchMessageOperation : public POPOperation { public: POPFetchMessageOperation(); diff --git a/src/async/pop/MCPOPFetchMessagesOperation.h b/src/async/pop/MCPOPFetchMessagesOperation.h index eaee884d..81a6759e 100644 --- a/src/async/pop/MCPOPFetchMessagesOperation.h +++ b/src/async/pop/MCPOPFetchMessagesOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class POPFetchMessagesOperation : public POPOperation { public: POPFetchMessagesOperation(); diff --git a/src/async/pop/MCPOPNoopOperation.h b/src/async/pop/MCPOPNoopOperation.h index 705d396b..c21f48a6 100644 --- a/src/async/pop/MCPOPNoopOperation.h +++ b/src/async/pop/MCPOPNoopOperation.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class POPNoopOperation : public POPOperation { public: POPNoopOperation(); diff --git a/src/async/pop/MCPOPOperation.h b/src/async/pop/MCPOPOperation.h index 1b454e98..88fb5c34 100644 --- a/src/async/pop/MCPOPOperation.h +++ b/src/async/pop/MCPOPOperation.h @@ -20,6 +20,7 @@ namespace mailcore { class POPAsyncSession; class POPOperationCallback; + MAILCORE_EXPORT class POPOperation : public Operation, public POPProgressCallback { public: POPOperation(); diff --git a/src/async/pop/MCPOPOperationCallback.h b/src/async/pop/MCPOPOperationCallback.h index ccc21681..7fd9cc13 100644 --- a/src/async/pop/MCPOPOperationCallback.h +++ b/src/async/pop/MCPOPOperationCallback.h @@ -16,6 +16,7 @@ namespace mailcore { class POPOperation; + MAILCORE_EXPORT class POPOperationCallback { public: virtual void bodyProgress(POPOperation * session, unsigned int current, unsigned int maximum) {}; diff --git a/src/async/smtp/MCSMTPAsyncSession.h b/src/async/smtp/MCSMTPAsyncSession.h index a48b5c26..663784fc 100644 --- a/src/async/smtp/MCSMTPAsyncSession.h +++ b/src/async/smtp/MCSMTPAsyncSession.h @@ -16,6 +16,7 @@ namespace mailcore { class SMTPOperationQueueCallback; class SMTPConnectionLogger; + MAILCORE_EXPORT class SMTPAsyncSession : public Object { public: SMTPAsyncSession(); diff --git a/src/async/smtp/MCSMTPCheckAccountOperation.h b/src/async/smtp/MCSMTPCheckAccountOperation.h index e1fd373f..ab0e7039 100644 --- a/src/async/smtp/MCSMTPCheckAccountOperation.h +++ b/src/async/smtp/MCSMTPCheckAccountOperation.h @@ -17,6 +17,7 @@ namespace mailcore { + MAILCORE_EXPORT class SMTPCheckAccountOperation : public SMTPOperation { public: SMTPCheckAccountOperation(); diff --git a/src/async/smtp/MCSMTPDisconnectOperation.h b/src/async/smtp/MCSMTPDisconnectOperation.h index 11853065..d75c5bc6 100644 --- a/src/async/smtp/MCSMTPDisconnectOperation.h +++ b/src/async/smtp/MCSMTPDisconnectOperation.h @@ -18,6 +18,7 @@ namespace mailcore { + MAILCORE_EXPORT class SMTPDisconnectOperation : public SMTPOperation { public: SMTPDisconnectOperation(); diff --git a/src/async/smtp/MCSMTPLoginOperation.h b/src/async/smtp/MCSMTPLoginOperation.h index f28356c1..9e68dc05 100644 --- a/src/async/smtp/MCSMTPLoginOperation.h +++ b/src/async/smtp/MCSMTPLoginOperation.h @@ -18,6 +18,7 @@ namespace mailcore { + MAILCORE_EXPORT class SMTPLoginOperation : public SMTPOperation { public: SMTPLoginOperation(); diff --git a/src/async/smtp/MCSMTPNoopOperation.h b/src/async/smtp/MCSMTPNoopOperation.h index 09116758..46c955cf 100644 --- a/src/async/smtp/MCSMTPNoopOperation.h +++ b/src/async/smtp/MCSMTPNoopOperation.h @@ -18,6 +18,7 @@ namespace mailcore { + MAILCORE_EXPORT class SMTPNoopOperation : public SMTPOperation { public: SMTPNoopOperation(); diff --git a/src/async/smtp/MCSMTPOperation.h b/src/async/smtp/MCSMTPOperation.h index 1d24f481..7530ea8b 100644 --- a/src/async/smtp/MCSMTPOperation.h +++ b/src/async/smtp/MCSMTPOperation.h @@ -20,6 +20,7 @@ namespace mailcore { class SMTPAsyncSession; class SMTPOperationCallback; + MAILCORE_EXPORT class SMTPOperation : public Operation, public SMTPProgressCallback { public: SMTPOperation(); diff --git a/src/async/smtp/MCSMTPOperationCallback.h b/src/async/smtp/MCSMTPOperationCallback.h index 5a3d00df..9d576cf7 100644 --- a/src/async/smtp/MCSMTPOperationCallback.h +++ b/src/async/smtp/MCSMTPOperationCallback.h @@ -16,6 +16,7 @@ namespace mailcore { class SMTPOperation; + MAILCORE_EXPORT class SMTPOperationCallback { public: virtual void bodyProgress(SMTPOperation * session, unsigned int current, unsigned int maximum) {}; diff --git a/src/async/smtp/MCSMTPSendWithDataOperation.h b/src/async/smtp/MCSMTPSendWithDataOperation.h index 9d2f087a..8a548498 100644 --- a/src/async/smtp/MCSMTPSendWithDataOperation.h +++ b/src/async/smtp/MCSMTPSendWithDataOperation.h @@ -18,6 +18,7 @@ namespace mailcore { + MAILCORE_EXPORT class SMTPSendWithDataOperation : public SMTPOperation { public: SMTPSendWithDataOperation(); diff --git a/src/core/abstract/MCAbstractMessage.h b/src/core/abstract/MCAbstractMessage.h index b03d5f2a..bd93f44c 100644 --- a/src/core/abstract/MCAbstractMessage.h +++ b/src/core/abstract/MCAbstractMessage.h @@ -11,6 +11,7 @@ namespace mailcore { class AbstractPart; class MessageHeader; + MAILCORE_EXPORT class AbstractMessage : public Object { public: AbstractMessage(); diff --git a/src/core/abstract/MCAbstractMessagePart.h b/src/core/abstract/MCAbstractMessagePart.h index 1df64599..93ccd361 100644 --- a/src/core/abstract/MCAbstractMessagePart.h +++ b/src/core/abstract/MCAbstractMessagePart.h @@ -11,6 +11,7 @@ namespace mailcore { class MessageHeader; + MAILCORE_EXPORT class AbstractMessagePart : public AbstractPart { public: AbstractMessagePart(); diff --git a/src/core/abstract/MCAbstractMultipart.h b/src/core/abstract/MCAbstractMultipart.h index c2a07bed..ce36acbc 100644 --- a/src/core/abstract/MCAbstractMultipart.h +++ b/src/core/abstract/MCAbstractMultipart.h @@ -9,6 +9,7 @@ namespace mailcore { + MAILCORE_EXPORT class AbstractMultipart : public AbstractPart { public: AbstractMultipart(); diff --git a/src/core/abstract/MCAbstractPart.h b/src/core/abstract/MCAbstractPart.h index 0fcbf279..3e6d627e 100644 --- a/src/core/abstract/MCAbstractPart.h +++ b/src/core/abstract/MCAbstractPart.h @@ -11,6 +11,7 @@ namespace mailcore { class AbstractMessage; + MAILCORE_EXPORT class AbstractPart : public Object { public: AbstractPart(); diff --git a/src/core/abstract/MCAddress.h b/src/core/abstract/MCAddress.h index c55efe5f..04a42cdf 100644 --- a/src/core/abstract/MCAddress.h +++ b/src/core/abstract/MCAddress.h @@ -8,6 +8,7 @@ namespace mailcore { + MAILCORE_EXPORT class Address : public Object { public: Address(); diff --git a/src/core/abstract/MCMessageHeader.h b/src/core/abstract/MCMessageHeader.h index 4018343c..a9161cf7 100644 --- a/src/core/abstract/MCMessageHeader.h +++ b/src/core/abstract/MCMessageHeader.h @@ -11,6 +11,7 @@ namespace mailcore { class Address; + MAILCORE_EXPORT class MessageHeader : public Object { public: MessageHeader(); diff --git a/src/core/basetypes/MCArray.h b/src/core/basetypes/MCArray.h index 82e9760a..7895b692 100644 --- a/src/core/basetypes/MCArray.h +++ b/src/core/basetypes/MCArray.h @@ -12,6 +12,7 @@ namespace mailcore { class String; + MAILCORE_EXPORT class Array : public Object { public: Array(); diff --git a/src/core/basetypes/MCAssert.h b/src/core/basetypes/MCAssert.h index 4584aa0a..226ea8a0 100644 --- a/src/core/basetypes/MCAssert.h +++ b/src/core/basetypes/MCAssert.h @@ -7,6 +7,7 @@ #ifdef __cplusplus extern "C" { #endif + MAILCORE_EXPORT void MCAssertInternal(const char * filename, unsigned int line, int cond, const char * condString); #ifdef __cplusplus } diff --git a/src/core/basetypes/MCAutoreleasePool.h b/src/core/basetypes/MCAutoreleasePool.h index f987fd08..a84ede29 100644 --- a/src/core/basetypes/MCAutoreleasePool.h +++ b/src/core/basetypes/MCAutoreleasePool.h @@ -11,6 +11,7 @@ typedef struct carray_s carray; namespace mailcore { + MAILCORE_EXPORT class AutoreleasePool : public Object { public: AutoreleasePool(); diff --git a/src/core/basetypes/MCConnectionLogger.h b/src/core/basetypes/MCConnectionLogger.h index 4e2249ff..d0a44713 100644 --- a/src/core/basetypes/MCConnectionLogger.h +++ b/src/core/basetypes/MCConnectionLogger.h @@ -33,6 +33,7 @@ namespace mailcore { ConnectionLogTypeErrorSent, }; + MAILCORE_EXPORT class ConnectionLogger { public: virtual void log(void * sender, ConnectionLogType logType, Data * buffer) {} diff --git a/src/core/basetypes/MCData.h b/src/core/basetypes/MCData.h index 18b74009..db3af1e6 100644 --- a/src/core/basetypes/MCData.h +++ b/src/core/basetypes/MCData.h @@ -17,6 +17,7 @@ namespace mailcore { class String; + MAILCORE_EXPORT class Data : public Object { public: Data(); diff --git a/src/core/basetypes/MCHashMap.h b/src/core/basetypes/MCHashMap.h index ea533dfe..ec7dea59 100644 --- a/src/core/basetypes/MCHashMap.h +++ b/src/core/basetypes/MCHashMap.h @@ -13,6 +13,7 @@ namespace mailcore { struct HashMapCell; typedef HashMapCell HashMapIter; + MAILCORE_EXPORT class HashMap : public Object { public: HashMap(); diff --git a/src/core/basetypes/MCIndexSet.h b/src/core/basetypes/MCIndexSet.h index 525cdda8..1e8d3853 100644 --- a/src/core/basetypes/MCIndexSet.h +++ b/src/core/basetypes/MCIndexSet.h @@ -18,6 +18,7 @@ namespace mailcore { + MAILCORE_EXPORT class IndexSet : public Object { public: IndexSet(); diff --git a/src/core/basetypes/MCJSON.h b/src/core/basetypes/MCJSON.h index d10f7d77..4999d0fd 100644 --- a/src/core/basetypes/MCJSON.h +++ b/src/core/basetypes/MCJSON.h @@ -23,6 +23,7 @@ namespace mailcore { class Null; + MAILCORE_EXPORT class JSON { public: static String * objectToJSONString(Object * object); diff --git a/src/core/basetypes/MCLog.h b/src/core/basetypes/MCLog.h index 95e227e7..5f3efdb5 100644 --- a/src/core/basetypes/MCLog.h +++ b/src/core/basetypes/MCLog.h @@ -3,10 +3,12 @@ #define MAILCORE_MCLOG_H #include +#include #define MCLog(...) MCLogInternal(NULL, __FILE__, __LINE__, 0, __VA_ARGS__) #define MCLogStack(...) MCLogInternal(NULL, __FILE__, __LINE__, 1, __VA_ARGS__) +MAILCORE_EXPORT extern int MCLogEnabled; #ifndef __printflike @@ -16,6 +18,7 @@ extern int MCLogEnabled; #ifdef __cplusplus extern "C" { #endif + MAILCORE_EXPORT void MCLogInternal(const char * user, const char * filename, unsigned int line, diff --git a/src/core/basetypes/MCMD5.h b/src/core/basetypes/MCMD5.h index a7522318..b8cde2e9 100644 --- a/src/core/basetypes/MCMD5.h +++ b/src/core/basetypes/MCMD5.h @@ -16,7 +16,10 @@ #ifdef __cplusplus namespace mailcore { + MAILCORE_EXPORT Data * md5Data(Data * data); + + MAILCORE_EXPORT String * md5String(Data * data); } diff --git a/src/core/basetypes/MCNull.h b/src/core/basetypes/MCNull.h index d17eb108..0ee9e532 100644 --- a/src/core/basetypes/MCNull.h +++ b/src/core/basetypes/MCNull.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class Null : public Object { public: static Null * null(); diff --git a/src/core/basetypes/MCObject.h b/src/core/basetypes/MCObject.h index caf8ab3c..9ca144f0 100644 --- a/src/core/basetypes/MCObject.h +++ b/src/core/basetypes/MCObject.h @@ -7,11 +7,9 @@ #include #endif -#ifdef __cplusplus +#include -#define MC_PROPERTY(mcType, setter, getter) \ - virtual void setter(mcType * getter); \ - virtual mcType * getter(); +#ifdef __cplusplus namespace mailcore { @@ -20,6 +18,7 @@ namespace mailcore { class String; class HashMap; + MAILCORE_EXPORT class Object { public: Object(); diff --git a/src/core/basetypes/MCOperationCallback.h b/src/core/basetypes/MCOperationCallback.h index b8bea4d9..54a89f9a 100644 --- a/src/core/basetypes/MCOperationCallback.h +++ b/src/core/basetypes/MCOperationCallback.h @@ -8,6 +8,7 @@ namespace mailcore { class Operation; + MAILCORE_EXPORT class OperationCallback { public: virtual void operationFinished(Operation * op) {} diff --git a/src/core/basetypes/MCOperationQueue.h b/src/core/basetypes/MCOperationQueue.h index 119befcc..3c15e09a 100644 --- a/src/core/basetypes/MCOperationQueue.h +++ b/src/core/basetypes/MCOperationQueue.h @@ -15,6 +15,7 @@ namespace mailcore { class OperationQueueCallback; class Array; + MAILCORE_EXPORT class OperationQueue : public Object { public: OperationQueue(); diff --git a/src/core/basetypes/MCOperationQueueCallback.h b/src/core/basetypes/MCOperationQueueCallback.h index 182085a9..7004e4eb 100644 --- a/src/core/basetypes/MCOperationQueueCallback.h +++ b/src/core/basetypes/MCOperationQueueCallback.h @@ -13,6 +13,7 @@ namespace mailcore { class OperationQueue; + MAILCORE_EXPORT class OperationQueueCallback { public: virtual void queueStartRunning() {} diff --git a/src/core/basetypes/MCRange.h b/src/core/basetypes/MCRange.h index 12e1a9c0..5dd5ecf2 100644 --- a/src/core/basetypes/MCRange.h +++ b/src/core/basetypes/MCRange.h @@ -22,16 +22,34 @@ namespace mailcore { uint64_t length; }; + MAILCORE_EXPORT extern Range RangeEmpty; + MAILCORE_EXPORT Range RangeMake(uint64_t location, uint64_t length); + + MAILCORE_EXPORT IndexSet * RangeRemoveRange(Range range1, Range range2); + + MAILCORE_EXPORT IndexSet * RangeUnion(Range range1, Range range2); + + MAILCORE_EXPORT Range RangeIntersection(Range range1, Range range2); + + MAILCORE_EXPORT bool RangeHasIntersection(Range range1, Range range2); + + MAILCORE_EXPORT uint64_t RangeLeftBound(Range range); + + MAILCORE_EXPORT uint64_t RangeRightBound(Range range); + + MAILCORE_EXPORT String * RangeToString(Range range); + + MAILCORE_EXPORT Range RangeFromString(String * rangeString); } diff --git a/src/core/basetypes/MCSet.h b/src/core/basetypes/MCSet.h index 334310a7..e3153c9f 100644 --- a/src/core/basetypes/MCSet.h +++ b/src/core/basetypes/MCSet.h @@ -12,6 +12,7 @@ namespace mailcore { class Array; class HashMap; + MAILCORE_EXPORT class Set : public Object { public: Set(); diff --git a/src/core/basetypes/MCString.h b/src/core/basetypes/MCString.h index 3878259a..0edd2982 100644 --- a/src/core/basetypes/MCString.h +++ b/src/core/basetypes/MCString.h @@ -16,6 +16,7 @@ namespace mailcore { class Data; class Array; + MAILCORE_EXPORT class String : public Object { public: String(const UChar * unicodeChars = NULL); diff --git a/src/core/basetypes/MCUtils.h b/src/core/basetypes/MCUtils.h index ad9c4db5..2461b540 100644 --- a/src/core/basetypes/MCUtils.h +++ b/src/core/basetypes/MCUtils.h @@ -36,6 +36,16 @@ #define MCISKINDOFCLASS(instance, class) (dynamic_cast(instance) != NULL) +#ifdef _MSC_VER +# ifdef MAILCORE_DLL +# define MAILCORE_EXPORT __declspec(dllexport) +# else +# define MAILCORE_EXPORT __declspec(dllimport) +# endif +#else +# define MAILCORE_EXPORT +#endif + #endif #endif diff --git a/src/core/basetypes/MCValue.h b/src/core/basetypes/MCValue.h index 7de1a0d4..3f0a7b75 100644 --- a/src/core/basetypes/MCValue.h +++ b/src/core/basetypes/MCValue.h @@ -29,6 +29,7 @@ namespace mailcore { ValueTypeData, }; + MAILCORE_EXPORT class Value : public Object { public: virtual ~Value(); diff --git a/src/core/imap/MCIMAPFolder.h b/src/core/imap/MCIMAPFolder.h index 3bc20589..10497ef7 100644 --- a/src/core/imap/MCIMAPFolder.h +++ b/src/core/imap/MCIMAPFolder.h @@ -9,6 +9,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPFolder : public Object { public: IMAPFolder(); diff --git a/src/core/imap/MCIMAPFolderStatus.h b/src/core/imap/MCIMAPFolderStatus.h index db3243fe..fb4410e7 100644 --- a/src/core/imap/MCIMAPFolderStatus.h +++ b/src/core/imap/MCIMAPFolderStatus.h @@ -17,6 +17,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPFolderStatus : public Object { public: IMAPFolderStatus(); diff --git a/src/core/imap/MCIMAPIdentity.h b/src/core/imap/MCIMAPIdentity.h index ab96abb3..176693f9 100644 --- a/src/core/imap/MCIMAPIdentity.h +++ b/src/core/imap/MCIMAPIdentity.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPIdentity : public Object { public: diff --git a/src/core/imap/MCIMAPMessage.h b/src/core/imap/MCIMAPMessage.h index b5266719..15abcbd4 100644 --- a/src/core/imap/MCIMAPMessage.h +++ b/src/core/imap/MCIMAPMessage.h @@ -15,6 +15,7 @@ namespace mailcore { class HTMLRendererIMAPCallback; class HTMLRendererTemplateCallback; + MAILCORE_EXPORT class IMAPMessage : public AbstractMessage { public: IMAPMessage(); diff --git a/src/core/imap/MCIMAPMessagePart.h b/src/core/imap/MCIMAPMessagePart.h index 0a65284e..2cb4c975 100644 --- a/src/core/imap/MCIMAPMessagePart.h +++ b/src/core/imap/MCIMAPMessagePart.h @@ -8,6 +8,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPMessagePart : public AbstractMessagePart { public: IMAPMessagePart(); diff --git a/src/core/imap/MCIMAPMultipart.h b/src/core/imap/MCIMAPMultipart.h index e420b228..741f4123 100644 --- a/src/core/imap/MCIMAPMultipart.h +++ b/src/core/imap/MCIMAPMultipart.h @@ -8,6 +8,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPMultipart : public AbstractMultipart { public: IMAPMultipart(); diff --git a/src/core/imap/MCIMAPNamespace.h b/src/core/imap/MCIMAPNamespace.h index 0c7ac6a5..4214fc7f 100644 --- a/src/core/imap/MCIMAPNamespace.h +++ b/src/core/imap/MCIMAPNamespace.h @@ -10,6 +10,7 @@ namespace mailcore { class IMAPNamespaceItem; + MAILCORE_EXPORT class IMAPNamespace : public Object { public: IMAPNamespace(); diff --git a/src/core/imap/MCIMAPNamespaceItem.h b/src/core/imap/MCIMAPNamespaceItem.h index a78d6918..43a28a52 100644 --- a/src/core/imap/MCIMAPNamespaceItem.h +++ b/src/core/imap/MCIMAPNamespaceItem.h @@ -8,6 +8,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPNamespaceItem : public Object { public: IMAPNamespaceItem(); diff --git a/src/core/imap/MCIMAPPart.h b/src/core/imap/MCIMAPPart.h index f04bb903..9cb1a1c6 100644 --- a/src/core/imap/MCIMAPPart.h +++ b/src/core/imap/MCIMAPPart.h @@ -12,6 +12,7 @@ namespace mailcore { class IMAPMessagePart; class IMAPMultipart; + MAILCORE_EXPORT class IMAPPart : public AbstractPart { public: IMAPPart(); diff --git a/src/core/imap/MCIMAPProgressCallback.h b/src/core/imap/MCIMAPProgressCallback.h index 2df48156..2570dc81 100644 --- a/src/core/imap/MCIMAPProgressCallback.h +++ b/src/core/imap/MCIMAPProgressCallback.h @@ -8,6 +8,7 @@ namespace mailcore { class IMAPSession; + MAILCORE_EXPORT class IMAPProgressCallback { public: virtual void bodyProgress(IMAPSession * session, unsigned int current, unsigned int maximum) {}; diff --git a/src/core/imap/MCIMAPSearchExpression.h b/src/core/imap/MCIMAPSearchExpression.h index a6e4833b..0d53e0b3 100644 --- a/src/core/imap/MCIMAPSearchExpression.h +++ b/src/core/imap/MCIMAPSearchExpression.h @@ -9,6 +9,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPSearchExpression : public Object { public: IMAPSearchExpression(); diff --git a/src/core/imap/MCIMAPSession.h b/src/core/imap/MCIMAPSession.h index 591466fc..456895d2 100755 --- a/src/core/imap/MCIMAPSession.h +++ b/src/core/imap/MCIMAPSession.h @@ -22,6 +22,7 @@ namespace mailcore { class IMAPFolderStatus; class IMAPIdentity; + MAILCORE_EXPORT class IMAPSession : public Object { public: IMAPSession(); diff --git a/src/core/imap/MCIMAPSyncResult.h b/src/core/imap/MCIMAPSyncResult.h index ad1b16ac..f2ff311b 100644 --- a/src/core/imap/MCIMAPSyncResult.h +++ b/src/core/imap/MCIMAPSyncResult.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class IMAPSyncResult : public Object { public: IMAPSyncResult(); diff --git a/src/core/nntp/MCNNTPGroupInfo.h b/src/core/nntp/MCNNTPGroupInfo.h index aeab58ca..7aab5e17 100644 --- a/src/core/nntp/MCNNTPGroupInfo.h +++ b/src/core/nntp/MCNNTPGroupInfo.h @@ -8,6 +8,7 @@ namespace mailcore { + MAILCORE_EXPORT class NNTPGroupInfo : public Object { public: NNTPGroupInfo(); diff --git a/src/core/nntp/MCNNTPProgressCallback.h b/src/core/nntp/MCNNTPProgressCallback.h index f863cc0c..46cfbe72 100644 --- a/src/core/nntp/MCNNTPProgressCallback.h +++ b/src/core/nntp/MCNNTPProgressCallback.h @@ -8,6 +8,7 @@ namespace mailcore { class NNTPSession; + MAILCORE_EXPORT class NNTPProgressCallback { public: virtual void bodyProgress(NNTPSession * session, unsigned int current, unsigned int maximum) {}; diff --git a/src/core/nntp/MCNNTPSession.h b/src/core/nntp/MCNNTPSession.h index d410fdcf..1d896192 100644 --- a/src/core/nntp/MCNNTPSession.h +++ b/src/core/nntp/MCNNTPSession.h @@ -11,6 +11,7 @@ namespace mailcore { class NNTPProgressCallback; class MessageHeader; + MAILCORE_EXPORT class NNTPSession : public Object { public: NNTPSession(); diff --git a/src/core/pop/MCPOPMessageInfo.h b/src/core/pop/MCPOPMessageInfo.h index be85bc9c..3a906668 100644 --- a/src/core/pop/MCPOPMessageInfo.h +++ b/src/core/pop/MCPOPMessageInfo.h @@ -8,6 +8,7 @@ namespace mailcore { + MAILCORE_EXPORT class POPMessageInfo : public Object { public: POPMessageInfo(); diff --git a/src/core/pop/MCPOPProgressCallback.h b/src/core/pop/MCPOPProgressCallback.h index c28e3966..a4f32732 100644 --- a/src/core/pop/MCPOPProgressCallback.h +++ b/src/core/pop/MCPOPProgressCallback.h @@ -8,6 +8,7 @@ namespace mailcore { class POPSession; + MAILCORE_EXPORT class POPProgressCallback { public: virtual void bodyProgress(POPSession * session, unsigned int current, unsigned int maximum) {}; diff --git a/src/core/pop/MCPOPSession.h b/src/core/pop/MCPOPSession.h index dfe67650..262cfe41 100644 --- a/src/core/pop/MCPOPSession.h +++ b/src/core/pop/MCPOPSession.h @@ -13,6 +13,7 @@ namespace mailcore { class POPProgressCallback; class MessageHeader; + MAILCORE_EXPORT class POPSession : public Object { public: POPSession(); diff --git a/src/core/provider/MCMailProvider.h b/src/core/provider/MCMailProvider.h index bb46bc73..20589a74 100644 --- a/src/core/provider/MCMailProvider.h +++ b/src/core/provider/MCMailProvider.h @@ -18,6 +18,7 @@ namespace mailcore { class NetService; + MAILCORE_EXPORT class MailProvider : public Object { public: static MailProvider * providerWithInfo(HashMap * info); diff --git a/src/core/provider/MCMailProvidersManager.h b/src/core/provider/MCMailProvidersManager.h index 8babaae5..92ae59af 100644 --- a/src/core/provider/MCMailProvidersManager.h +++ b/src/core/provider/MCMailProvidersManager.h @@ -18,6 +18,7 @@ namespace mailcore { class MailProvider; + MAILCORE_EXPORT class MailProvidersManager : public Object { public: static MailProvidersManager * sharedManager(); diff --git a/src/core/provider/MCNetService.h b/src/core/provider/MCNetService.h index aeb0c0f4..efc6c19c 100644 --- a/src/core/provider/MCNetService.h +++ b/src/core/provider/MCNetService.h @@ -17,6 +17,7 @@ namespace mailcore { + MAILCORE_EXPORT class NetService : public Object { public: diff --git a/src/core/renderer/MCAddressDisplay.h b/src/core/renderer/MCAddressDisplay.h index 0282a52f..72fcff41 100644 --- a/src/core/renderer/MCAddressDisplay.h +++ b/src/core/renderer/MCAddressDisplay.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class AddressDisplay { public: static String * displayStringForAddress(Address * address); diff --git a/src/core/renderer/MCDateFormatter.h b/src/core/renderer/MCDateFormatter.h index c4e21c0d..ea93b4fc 100644 --- a/src/core/renderer/MCDateFormatter.h +++ b/src/core/renderer/MCDateFormatter.h @@ -31,6 +31,7 @@ namespace mailcore { DateFormatStyleNone = -1 /* UDAT_NONE */, }; + MAILCORE_EXPORT class DateFormatter : public Object { public: DateFormatter(); diff --git a/src/core/renderer/MCHTMLBodyRendererTemplateCallback.h b/src/core/renderer/MCHTMLBodyRendererTemplateCallback.h index ad5eec91..6cd86d1b 100644 --- a/src/core/renderer/MCHTMLBodyRendererTemplateCallback.h +++ b/src/core/renderer/MCHTMLBodyRendererTemplateCallback.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class HTMLBodyRendererTemplateCallback : public Object, public HTMLRendererTemplateCallback { public: virtual String * templateForMainHeader(MessageHeader * header); diff --git a/src/core/renderer/MCHTMLRendererCallback.h b/src/core/renderer/MCHTMLRendererCallback.h index 030b691f..f67763e5 100644 --- a/src/core/renderer/MCHTMLRendererCallback.h +++ b/src/core/renderer/MCHTMLRendererCallback.h @@ -19,6 +19,7 @@ namespace mailcore { class MessageParser; + MAILCORE_EXPORT class HTMLRendererIMAPCallback { public: HTMLRendererIMAPCallback() {} @@ -29,6 +30,7 @@ namespace mailcore { virtual void prefetchImageIMAPPart(String * folder, IMAPPart * part) {} }; + MAILCORE_EXPORT class HTMLRendererTemplateCallback { public: virtual bool canPreviewPart(AbstractPart * part); diff --git a/src/core/renderer/MCHTMLRendererIMAPDataCallback.h b/src/core/renderer/MCHTMLRendererIMAPDataCallback.h index 9cc3e36e..acba9f9f 100644 --- a/src/core/renderer/MCHTMLRendererIMAPDataCallback.h +++ b/src/core/renderer/MCHTMLRendererIMAPDataCallback.h @@ -16,6 +16,7 @@ namespace mailcore { + MAILCORE_EXPORT class HTMLRendererIMAPDataCallback : public Object, public HTMLRendererIMAPCallback { public: HTMLRendererIMAPDataCallback(IMAPSession * session, uint32_t uid); diff --git a/src/core/renderer/MCSizeFormatter.h b/src/core/renderer/MCSizeFormatter.h index 8c139f6e..22ae2f67 100644 --- a/src/core/renderer/MCSizeFormatter.h +++ b/src/core/renderer/MCSizeFormatter.h @@ -18,6 +18,7 @@ namespace mailcore { class String; + MAILCORE_EXPORT class SizeFormatter : public Object { public: static String * stringWithSize(unsigned int size); diff --git a/src/core/rfc822/MCAttachment.h b/src/core/rfc822/MCAttachment.h index 2217bc4c..573366ed 100644 --- a/src/core/rfc822/MCAttachment.h +++ b/src/core/rfc822/MCAttachment.h @@ -13,6 +13,7 @@ namespace mailcore { class MessagePart; + MAILCORE_EXPORT class Attachment : public AbstractPart { public: static String * mimeTypeForFilename(String * filename); diff --git a/src/core/rfc822/MCMessageBuilder.h b/src/core/rfc822/MCMessageBuilder.h index 07c4795e..5336d4dc 100644 --- a/src/core/rfc822/MCMessageBuilder.h +++ b/src/core/rfc822/MCMessageBuilder.h @@ -12,6 +12,7 @@ namespace mailcore { class Attachment; class HTMLRendererTemplateCallback; + MAILCORE_EXPORT class MessageBuilder : public AbstractMessage { public: MessageBuilder(); diff --git a/src/core/rfc822/MCMessageParser.h b/src/core/rfc822/MCMessageParser.h index eba0e052..aed322df 100644 --- a/src/core/rfc822/MCMessageParser.h +++ b/src/core/rfc822/MCMessageParser.h @@ -15,6 +15,7 @@ namespace mailcore { class HTMLRendererTemplateCallback; + MAILCORE_EXPORT class MessageParser : public AbstractMessage { public: static MessageParser * messageParserWithData(Data * data); diff --git a/src/core/rfc822/MCMessagePart.h b/src/core/rfc822/MCMessagePart.h index 4b9de96b..ef649661 100644 --- a/src/core/rfc822/MCMessagePart.h +++ b/src/core/rfc822/MCMessagePart.h @@ -9,6 +9,7 @@ namespace mailcore { + MAILCORE_EXPORT class MessagePart : public AbstractMessagePart { public: MessagePart(); diff --git a/src/core/rfc822/MCMultipart.h b/src/core/rfc822/MCMultipart.h index 6b00c08b..b68718f2 100644 --- a/src/core/rfc822/MCMultipart.h +++ b/src/core/rfc822/MCMultipart.h @@ -9,6 +9,7 @@ namespace mailcore { + MAILCORE_EXPORT class Multipart : public AbstractMultipart { public: Multipart(); diff --git a/src/core/smtp/MCSMTPProgressCallback.h b/src/core/smtp/MCSMTPProgressCallback.h index 7016cfcd..d3844a82 100644 --- a/src/core/smtp/MCSMTPProgressCallback.h +++ b/src/core/smtp/MCSMTPProgressCallback.h @@ -8,6 +8,7 @@ namespace mailcore { class SMTPSession; + MAILCORE_EXPORT class SMTPProgressCallback { public: virtual void bodyProgress(SMTPSession * session, unsigned int current, unsigned int maximum) {}; diff --git a/src/core/smtp/MCSMTPSession.h b/src/core/smtp/MCSMTPSession.h index 4f7c9135..0db1acc8 100644 --- a/src/core/smtp/MCSMTPSession.h +++ b/src/core/smtp/MCSMTPSession.h @@ -13,6 +13,7 @@ namespace mailcore { class SMTPProgressCallback; class MessageBuilder; + MAILCORE_EXPORT class SMTPSession : public Object { public: SMTPSession(); -- cgit v1.2.3 From c2c915e567f8fc256cfcf72eacd1cb7d3491cfc2 Mon Sep 17 00:00:00 2001 From: "Hoa V. DINH" Date: Sat, 22 Nov 2014 20:50:44 -0800 Subject: Fixed win32 exports --- src/async/imap/MCIMAPAppendMessageOperation.h | 3 +-- src/async/imap/MCIMAPAsyncConnection.h | 3 +-- src/async/imap/MCIMAPAsyncSession.h | 3 +-- src/async/imap/MCIMAPCapabilityOperation.h | 3 +-- src/async/imap/MCIMAPCheckAccountOperation.h | 3 +-- src/async/imap/MCIMAPConnectOperation.h | 3 +-- src/async/imap/MCIMAPCopyMessagesOperation.h | 3 +-- src/async/imap/MCIMAPCreateFolderOperation.h | 3 +-- src/async/imap/MCIMAPDeleteFolderOperation.h | 3 +-- src/async/imap/MCIMAPDisconnectOperation.h | 3 +-- src/async/imap/MCIMAPExpungeOperation.h | 3 +-- src/async/imap/MCIMAPFetchContentOperation.h | 3 +-- src/async/imap/MCIMAPFetchFoldersOperation.h | 3 +-- src/async/imap/MCIMAPFetchMessagesOperation.h | 3 +-- src/async/imap/MCIMAPFetchNamespaceOperation.h | 3 +-- src/async/imap/MCIMAPFetchParsedContentOperation.h | 3 +-- src/async/imap/MCIMAPFolderInfoOperation.h | 3 +-- src/async/imap/MCIMAPFolderStatusOperation.h | 3 +-- src/async/imap/MCIMAPIdentityOperation.h | 3 +-- src/async/imap/MCIMAPIdleOperation.h | 3 +-- src/async/imap/MCIMAPMessageRenderingOperation.h | 3 +-- src/async/imap/MCIMAPMultiDisconnectOperation.h | 3 +-- src/async/imap/MCIMAPNoopOperation.h | 3 +-- src/async/imap/MCIMAPOperation.h | 3 +-- src/async/imap/MCIMAPOperationCallback.h | 5 +++-- src/async/imap/MCIMAPQuotaOperation.h | 3 +-- src/async/imap/MCIMAPRenameFolderOperation.h | 3 +-- src/async/imap/MCIMAPSearchOperation.h | 3 +-- src/async/imap/MCIMAPStoreFlagsOperation.h | 5 ++--- src/async/imap/MCIMAPStoreLabelsOperation.h | 3 +-- src/async/imap/MCIMAPSubscribeFolderOperation.h | 3 +-- src/async/nntp/MCNNTPAsyncSession.h | 3 +-- src/async/nntp/MCNNTPCheckAccountOperation.h | 3 +-- src/async/nntp/MCNNTPDisconnectOperation.h | 3 +-- src/async/nntp/MCNNTPFetchAllArticlesOperation.h | 3 +-- src/async/nntp/MCNNTPFetchArticleOperation.h | 3 +-- src/async/nntp/MCNNTPFetchHeaderOperation.h | 3 +-- src/async/nntp/MCNNTPFetchOverviewOperation.h | 3 +-- src/async/nntp/MCNNTPFetchServerTimeOperation.h | 3 +-- src/async/nntp/MCNNTPListNewsgroupsOperation.h | 3 +-- src/async/nntp/MCNNTPOperation.h | 3 +-- src/async/nntp/MCNNTPOperationCallback.h | 5 +++-- src/async/pop/MCPOPAsyncSession.h | 3 +-- src/async/pop/MCPOPCheckAccountOperation.h | 3 +-- src/async/pop/MCPOPDeleteMessagesOperation.h | 3 +-- src/async/pop/MCPOPFetchHeaderOperation.h | 3 +-- src/async/pop/MCPOPFetchMessageOperation.h | 3 +-- src/async/pop/MCPOPFetchMessagesOperation.h | 3 +-- src/async/pop/MCPOPNoopOperation.h | 3 +-- src/async/pop/MCPOPOperation.h | 3 +-- src/async/pop/MCPOPOperationCallback.h | 5 +++-- src/async/smtp/MCSMTPAsyncSession.h | 3 +-- src/async/smtp/MCSMTPCheckAccountOperation.h | 3 +-- src/async/smtp/MCSMTPDisconnectOperation.h | 3 +-- src/async/smtp/MCSMTPLoginOperation.h | 3 +-- src/async/smtp/MCSMTPNoopOperation.h | 3 +-- src/async/smtp/MCSMTPOperation.h | 3 +-- src/async/smtp/MCSMTPOperationCallback.h | 5 +++-- src/async/smtp/MCSMTPSendWithDataOperation.h | 3 +-- src/core/abstract/MCAbstractMessage.h | 3 +-- src/core/abstract/MCAbstractMessagePart.h | 3 +-- src/core/abstract/MCAbstractMultipart.h | 3 +-- src/core/abstract/MCAbstractPart.h | 3 +-- src/core/abstract/MCAddress.h | 3 +-- src/core/abstract/MCMessageHeader.h | 3 +-- src/core/basetypes/MCArray.h | 3 +-- src/core/basetypes/MCAssert.h | 2 ++ src/core/basetypes/MCAutoreleasePool.h | 3 +-- src/core/basetypes/MCConnectionLogger.h | 5 +++-- src/core/basetypes/MCData.h | 3 +-- src/core/basetypes/MCHTMLCleaner.h | 3 ++- src/core/basetypes/MCHashMap.h | 3 +-- src/core/basetypes/MCIndexSet.h | 3 +-- src/core/basetypes/MCJSON.h | 3 +-- src/core/basetypes/MCJSONParser.h | 3 ++- src/core/basetypes/MCNull.h | 3 +-- src/core/basetypes/MCObject.h | 3 +-- src/core/basetypes/MCOperation.h | 2 +- src/core/basetypes/MCOperationCallback.h | 5 +++-- src/core/basetypes/MCOperationQueue.h | 3 +-- src/core/basetypes/MCOperationQueueCallback.h | 9 +++++++-- src/core/basetypes/MCRange.h | 2 ++ src/core/basetypes/MCSet.h | 3 +-- src/core/basetypes/MCString.h | 3 +-- src/core/basetypes/MCUtils.h | 4 ++-- src/core/basetypes/MCValue.h | 3 +-- src/core/imap/MCIMAPFolder.h | 3 +-- src/core/imap/MCIMAPFolderStatus.h | 3 +-- src/core/imap/MCIMAPIdentity.h | 3 +-- src/core/imap/MCIMAPMessage.h | 3 +-- src/core/imap/MCIMAPMessagePart.h | 3 +-- src/core/imap/MCIMAPMultipart.h | 3 +-- src/core/imap/MCIMAPNamespace.h | 3 +-- src/core/imap/MCIMAPNamespaceItem.h | 3 +-- src/core/imap/MCIMAPPart.h | 3 +-- src/core/imap/MCIMAPProgressCallback.h | 5 +++-- src/core/imap/MCIMAPSearchExpression.h | 3 +-- src/core/imap/MCIMAPSession.h | 3 +-- src/core/imap/MCIMAPSyncResult.h | 3 +-- src/core/nntp/MCNNTPGroupInfo.h | 3 +-- src/core/nntp/MCNNTPProgressCallback.h | 5 +++-- src/core/nntp/MCNNTPSession.h | 3 +-- src/core/pop/MCPOPMessageInfo.h | 3 +-- src/core/pop/MCPOPProgressCallback.h | 5 +++-- src/core/pop/MCPOPSession.h | 3 +-- src/core/provider/MCMailProvider.h | 3 +-- src/core/provider/MCMailProvidersManager.h | 3 +-- src/core/provider/MCNetService.h | 3 +-- src/core/renderer/MCAddressDisplay.h | 3 +-- src/core/renderer/MCDateFormatter.h | 3 +-- src/core/renderer/MCHTMLBodyRendererTemplateCallback.h | 4 ++-- src/core/renderer/MCHTMLRenderer.h | 2 +- src/core/renderer/MCHTMLRendererCallback.h | 7 +++---- src/core/renderer/MCHTMLRendererIMAPDataCallback.h | 4 ++-- src/core/renderer/MCSizeFormatter.h | 3 +-- src/core/rfc822/MCAttachment.h | 3 +-- src/core/rfc822/MCMessageBuilder.h | 3 +-- src/core/rfc822/MCMessageParser.h | 3 +-- src/core/rfc822/MCMessagePart.h | 3 +-- src/core/rfc822/MCMultipart.h | 3 +-- src/core/smtp/MCSMTPProgressCallback.h | 5 +++-- src/core/smtp/MCSMTPSession.h | 3 +-- 122 files changed, 158 insertions(+), 239 deletions(-) (limited to 'src/core/rfc822/MCMessageParser.h') diff --git a/src/async/imap/MCIMAPAppendMessageOperation.h b/src/async/imap/MCIMAPAppendMessageOperation.h index aba167a7..ca3033a6 100644 --- a/src/async/imap/MCIMAPAppendMessageOperation.h +++ b/src/async/imap/MCIMAPAppendMessageOperation.h @@ -17,8 +17,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPAppendMessageOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPAppendMessageOperation : public IMAPOperation { public: IMAPAppendMessageOperation(); virtual ~IMAPAppendMessageOperation(); diff --git a/src/async/imap/MCIMAPAsyncConnection.h b/src/async/imap/MCIMAPAsyncConnection.h index 79486829..40b11b90 100755 --- a/src/async/imap/MCIMAPAsyncConnection.h +++ b/src/async/imap/MCIMAPAsyncConnection.h @@ -34,8 +34,7 @@ namespace mailcore { class IMAPMessage; class IMAPIdentity; - MAILCORE_EXPORT - class IMAPAsyncConnection : public Object { + class MAILCORE_EXPORT IMAPAsyncConnection : public Object { public: IMAPAsyncConnection(); virtual ~IMAPAsyncConnection(); diff --git a/src/async/imap/MCIMAPAsyncSession.h b/src/async/imap/MCIMAPAsyncSession.h index d9253113..4a61393f 100755 --- a/src/async/imap/MCIMAPAsyncSession.h +++ b/src/async/imap/MCIMAPAsyncSession.h @@ -41,8 +41,7 @@ namespace mailcore { class IMAPIdentity; class OperationQueueCallback; - MAILCORE_EXPORT - class IMAPAsyncSession : public Object { + class MAILCORE_EXPORT IMAPAsyncSession : public Object { public: IMAPAsyncSession(); virtual ~IMAPAsyncSession(); diff --git a/src/async/imap/MCIMAPCapabilityOperation.h b/src/async/imap/MCIMAPCapabilityOperation.h index e691f169..486d54cf 100644 --- a/src/async/imap/MCIMAPCapabilityOperation.h +++ b/src/async/imap/MCIMAPCapabilityOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPCapabilityOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPCapabilityOperation : public IMAPOperation { public: IMAPCapabilityOperation(); virtual ~IMAPCapabilityOperation(); diff --git a/src/async/imap/MCIMAPCheckAccountOperation.h b/src/async/imap/MCIMAPCheckAccountOperation.h index 27a78c19..9c81f00e 100644 --- a/src/async/imap/MCIMAPCheckAccountOperation.h +++ b/src/async/imap/MCIMAPCheckAccountOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPCheckAccountOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPCheckAccountOperation : public IMAPOperation { public: // subclass behavior virtual void main(); }; diff --git a/src/async/imap/MCIMAPConnectOperation.h b/src/async/imap/MCIMAPConnectOperation.h index 639dd947..7678ccdd 100644 --- a/src/async/imap/MCIMAPConnectOperation.h +++ b/src/async/imap/MCIMAPConnectOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPConnectOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPConnectOperation : public IMAPOperation { public: // subclass behavior virtual void main(); }; diff --git a/src/async/imap/MCIMAPCopyMessagesOperation.h b/src/async/imap/MCIMAPCopyMessagesOperation.h index f08e99d3..c6d75447 100644 --- a/src/async/imap/MCIMAPCopyMessagesOperation.h +++ b/src/async/imap/MCIMAPCopyMessagesOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPCopyMessagesOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPCopyMessagesOperation : public IMAPOperation { public: IMAPCopyMessagesOperation(); virtual ~IMAPCopyMessagesOperation(); diff --git a/src/async/imap/MCIMAPCreateFolderOperation.h b/src/async/imap/MCIMAPCreateFolderOperation.h index e93aeb0c..c95352ea 100644 --- a/src/async/imap/MCIMAPCreateFolderOperation.h +++ b/src/async/imap/MCIMAPCreateFolderOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPCreateFolderOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPCreateFolderOperation : public IMAPOperation { public: IMAPCreateFolderOperation(); virtual ~IMAPCreateFolderOperation(); diff --git a/src/async/imap/MCIMAPDeleteFolderOperation.h b/src/async/imap/MCIMAPDeleteFolderOperation.h index b7614710..d22f0a79 100644 --- a/src/async/imap/MCIMAPDeleteFolderOperation.h +++ b/src/async/imap/MCIMAPDeleteFolderOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPDeleteFolderOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPDeleteFolderOperation : public IMAPOperation { public: IMAPDeleteFolderOperation(); virtual ~IMAPDeleteFolderOperation(); diff --git a/src/async/imap/MCIMAPDisconnectOperation.h b/src/async/imap/MCIMAPDisconnectOperation.h index 00c4abf0..683a0e77 100644 --- a/src/async/imap/MCIMAPDisconnectOperation.h +++ b/src/async/imap/MCIMAPDisconnectOperation.h @@ -18,8 +18,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPDisconnectOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPDisconnectOperation : public IMAPOperation { public: IMAPDisconnectOperation(); virtual ~IMAPDisconnectOperation(); diff --git a/src/async/imap/MCIMAPExpungeOperation.h b/src/async/imap/MCIMAPExpungeOperation.h index 76832429..617af7b1 100644 --- a/src/async/imap/MCIMAPExpungeOperation.h +++ b/src/async/imap/MCIMAPExpungeOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPExpungeOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPExpungeOperation : public IMAPOperation { public: IMAPExpungeOperation(); virtual ~IMAPExpungeOperation(); diff --git a/src/async/imap/MCIMAPFetchContentOperation.h b/src/async/imap/MCIMAPFetchContentOperation.h index 0ce8e67d..0b5b70f2 100644 --- a/src/async/imap/MCIMAPFetchContentOperation.h +++ b/src/async/imap/MCIMAPFetchContentOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPFetchContentOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPFetchContentOperation : public IMAPOperation { public: IMAPFetchContentOperation(); virtual ~IMAPFetchContentOperation(); diff --git a/src/async/imap/MCIMAPFetchFoldersOperation.h b/src/async/imap/MCIMAPFetchFoldersOperation.h index d451db71..f6456a36 100644 --- a/src/async/imap/MCIMAPFetchFoldersOperation.h +++ b/src/async/imap/MCIMAPFetchFoldersOperation.h @@ -17,8 +17,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPFetchFoldersOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPFetchFoldersOperation : public IMAPOperation { public: IMAPFetchFoldersOperation(); virtual ~IMAPFetchFoldersOperation(); diff --git a/src/async/imap/MCIMAPFetchMessagesOperation.h b/src/async/imap/MCIMAPFetchMessagesOperation.h index 65ce95ad..620aead6 100644 --- a/src/async/imap/MCIMAPFetchMessagesOperation.h +++ b/src/async/imap/MCIMAPFetchMessagesOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPFetchMessagesOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPFetchMessagesOperation : public IMAPOperation { public: IMAPFetchMessagesOperation(); virtual ~IMAPFetchMessagesOperation(); diff --git a/src/async/imap/MCIMAPFetchNamespaceOperation.h b/src/async/imap/MCIMAPFetchNamespaceOperation.h index 41d24021..35b6ca2b 100644 --- a/src/async/imap/MCIMAPFetchNamespaceOperation.h +++ b/src/async/imap/MCIMAPFetchNamespaceOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPFetchNamespaceOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPFetchNamespaceOperation : public IMAPOperation { public: IMAPFetchNamespaceOperation(); virtual ~IMAPFetchNamespaceOperation(); diff --git a/src/async/imap/MCIMAPFetchParsedContentOperation.h b/src/async/imap/MCIMAPFetchParsedContentOperation.h index f33f0acb..ec0485a9 100644 --- a/src/async/imap/MCIMAPFetchParsedContentOperation.h +++ b/src/async/imap/MCIMAPFetchParsedContentOperation.h @@ -18,8 +18,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPFetchParsedContentOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPFetchParsedContentOperation : public IMAPOperation { public: IMAPFetchParsedContentOperation(); virtual ~IMAPFetchParsedContentOperation(); diff --git a/src/async/imap/MCIMAPFolderInfoOperation.h b/src/async/imap/MCIMAPFolderInfoOperation.h index 50092915..b29f40a2 100644 --- a/src/async/imap/MCIMAPFolderInfoOperation.h +++ b/src/async/imap/MCIMAPFolderInfoOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPFolderInfoOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPFolderInfoOperation : public IMAPOperation { public: IMAPFolderInfoOperation(); virtual ~IMAPFolderInfoOperation(); diff --git a/src/async/imap/MCIMAPFolderStatusOperation.h b/src/async/imap/MCIMAPFolderStatusOperation.h index 7fb9197a..53e3025b 100644 --- a/src/async/imap/MCIMAPFolderStatusOperation.h +++ b/src/async/imap/MCIMAPFolderStatusOperation.h @@ -19,8 +19,7 @@ namespace mailcore { class IMAPFolderStatus; - MAILCORE_EXPORT - class IMAPFolderStatusOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPFolderStatusOperation : public IMAPOperation { public: IMAPFolderStatusOperation(); virtual ~IMAPFolderStatusOperation(); diff --git a/src/async/imap/MCIMAPIdentityOperation.h b/src/async/imap/MCIMAPIdentityOperation.h index e1b86283..70cc7d52 100644 --- a/src/async/imap/MCIMAPIdentityOperation.h +++ b/src/async/imap/MCIMAPIdentityOperation.h @@ -18,8 +18,7 @@ namespace mailcore { class IMAPIdentity; - MAILCORE_EXPORT - class IMAPIdentityOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPIdentityOperation : public IMAPOperation { public: IMAPIdentityOperation(); virtual ~IMAPIdentityOperation(); diff --git a/src/async/imap/MCIMAPIdleOperation.h b/src/async/imap/MCIMAPIdleOperation.h index 5df0aecd..5a383bfd 100644 --- a/src/async/imap/MCIMAPIdleOperation.h +++ b/src/async/imap/MCIMAPIdleOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPIdleOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPIdleOperation : public IMAPOperation { public: IMAPIdleOperation(); virtual ~IMAPIdleOperation(); diff --git a/src/async/imap/MCIMAPMessageRenderingOperation.h b/src/async/imap/MCIMAPMessageRenderingOperation.h index 7e1c7b1b..7a02b4ae 100644 --- a/src/async/imap/MCIMAPMessageRenderingOperation.h +++ b/src/async/imap/MCIMAPMessageRenderingOperation.h @@ -17,8 +17,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPMessageRenderingOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPMessageRenderingOperation : public IMAPOperation { public: IMAPMessageRenderingOperation(); virtual ~IMAPMessageRenderingOperation(); diff --git a/src/async/imap/MCIMAPMultiDisconnectOperation.h b/src/async/imap/MCIMAPMultiDisconnectOperation.h index d40e07cb..78c36ed8 100644 --- a/src/async/imap/MCIMAPMultiDisconnectOperation.h +++ b/src/async/imap/MCIMAPMultiDisconnectOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPMultiDisconnectOperation : public IMAPOperation, public OperationCallback { + class MAILCORE_EXPORT IMAPMultiDisconnectOperation : public IMAPOperation, public OperationCallback { public: IMAPMultiDisconnectOperation(); virtual ~IMAPMultiDisconnectOperation(); diff --git a/src/async/imap/MCIMAPNoopOperation.h b/src/async/imap/MCIMAPNoopOperation.h index 0f0f7fdb..515f563a 100644 --- a/src/async/imap/MCIMAPNoopOperation.h +++ b/src/async/imap/MCIMAPNoopOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPNoopOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPNoopOperation : public IMAPOperation { public: IMAPNoopOperation(); virtual ~IMAPNoopOperation(); diff --git a/src/async/imap/MCIMAPOperation.h b/src/async/imap/MCIMAPOperation.h index 84967b00..a57d7489 100644 --- a/src/async/imap/MCIMAPOperation.h +++ b/src/async/imap/MCIMAPOperation.h @@ -21,8 +21,7 @@ namespace mailcore { class IMAPAsyncSession; class IMAPOperationCallback; - MAILCORE_EXPORT - class IMAPOperation : public Operation, public IMAPProgressCallback { + class MAILCORE_EXPORT IMAPOperation : public Operation, public IMAPProgressCallback { public: IMAPOperation(); virtual ~IMAPOperation(); diff --git a/src/async/imap/MCIMAPOperationCallback.h b/src/async/imap/MCIMAPOperationCallback.h index 2bc656d1..c5e14ffb 100644 --- a/src/async/imap/MCIMAPOperationCallback.h +++ b/src/async/imap/MCIMAPOperationCallback.h @@ -10,14 +10,15 @@ #define MAILCORE_MCIMAPOPERATIONCALLBACK_H +#include + #ifdef __cplusplus namespace mailcore { class IMAPOperation; - MAILCORE_EXPORT - class IMAPOperationCallback { + class MAILCORE_EXPORT IMAPOperationCallback { public: virtual void bodyProgress(IMAPOperation * session, unsigned int current, unsigned int maximum) {}; virtual void itemProgress(IMAPOperation * session, unsigned int current, unsigned int maximum) {}; diff --git a/src/async/imap/MCIMAPQuotaOperation.h b/src/async/imap/MCIMAPQuotaOperation.h index df46a1a2..15a1c676 100644 --- a/src/async/imap/MCIMAPQuotaOperation.h +++ b/src/async/imap/MCIMAPQuotaOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPQuotaOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPQuotaOperation : public IMAPOperation { public: IMAPQuotaOperation(); virtual ~IMAPQuotaOperation(); diff --git a/src/async/imap/MCIMAPRenameFolderOperation.h b/src/async/imap/MCIMAPRenameFolderOperation.h index 38e0969a..63282564 100644 --- a/src/async/imap/MCIMAPRenameFolderOperation.h +++ b/src/async/imap/MCIMAPRenameFolderOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPRenameFolderOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPRenameFolderOperation : public IMAPOperation { public: IMAPRenameFolderOperation(); ~IMAPRenameFolderOperation(); diff --git a/src/async/imap/MCIMAPSearchOperation.h b/src/async/imap/MCIMAPSearchOperation.h index 95454db9..bb9cef08 100644 --- a/src/async/imap/MCIMAPSearchOperation.h +++ b/src/async/imap/MCIMAPSearchOperation.h @@ -19,8 +19,7 @@ namespace mailcore { class IMAPSearchExpression; - MAILCORE_EXPORT - class IMAPSearchOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPSearchOperation : public IMAPOperation { public: IMAPSearchOperation(); virtual ~IMAPSearchOperation(); diff --git a/src/async/imap/MCIMAPStoreFlagsOperation.h b/src/async/imap/MCIMAPStoreFlagsOperation.h index 5458bcb0..1325f8bc 100644 --- a/src/async/imap/MCIMAPStoreFlagsOperation.h +++ b/src/async/imap/MCIMAPStoreFlagsOperation.h @@ -15,9 +15,8 @@ #ifdef __cplusplus namespace mailcore { - - MAILCORE_EXPORT - class IMAPStoreFlagsOperation : public IMAPOperation { + + class MAILCORE_EXPORT IMAPStoreFlagsOperation : public IMAPOperation { public: IMAPStoreFlagsOperation(); virtual ~IMAPStoreFlagsOperation(); diff --git a/src/async/imap/MCIMAPStoreLabelsOperation.h b/src/async/imap/MCIMAPStoreLabelsOperation.h index 963a5a8a..7ccae85b 100644 --- a/src/async/imap/MCIMAPStoreLabelsOperation.h +++ b/src/async/imap/MCIMAPStoreLabelsOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPStoreLabelsOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPStoreLabelsOperation : public IMAPOperation { public: IMAPStoreLabelsOperation(); virtual ~IMAPStoreLabelsOperation(); diff --git a/src/async/imap/MCIMAPSubscribeFolderOperation.h b/src/async/imap/MCIMAPSubscribeFolderOperation.h index 45d864b1..00db56fa 100644 --- a/src/async/imap/MCIMAPSubscribeFolderOperation.h +++ b/src/async/imap/MCIMAPSubscribeFolderOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPSubscribeFolderOperation : public IMAPOperation { + class MAILCORE_EXPORT IMAPSubscribeFolderOperation : public IMAPOperation { public: IMAPSubscribeFolderOperation(); virtual ~IMAPSubscribeFolderOperation(); diff --git a/src/async/nntp/MCNNTPAsyncSession.h b/src/async/nntp/MCNNTPAsyncSession.h index e0434fb9..7b9c8a4c 100644 --- a/src/async/nntp/MCNNTPAsyncSession.h +++ b/src/async/nntp/MCNNTPAsyncSession.h @@ -19,8 +19,7 @@ namespace mailcore { class NNTPOperationQueueCallback; class NNTPConnectionLogger; - MAILCORE_EXPORT - class NNTPAsyncSession : public Object { + class MAILCORE_EXPORT NNTPAsyncSession : public Object { public: NNTPAsyncSession(); virtual ~NNTPAsyncSession(); diff --git a/src/async/nntp/MCNNTPCheckAccountOperation.h b/src/async/nntp/MCNNTPCheckAccountOperation.h index b9bec07b..395178a0 100644 --- a/src/async/nntp/MCNNTPCheckAccountOperation.h +++ b/src/async/nntp/MCNNTPCheckAccountOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class NNTPCheckAccountOperation : public NNTPOperation { + class MAILCORE_EXPORT NNTPCheckAccountOperation : public NNTPOperation { public: NNTPCheckAccountOperation(); virtual ~NNTPCheckAccountOperation(); diff --git a/src/async/nntp/MCNNTPDisconnectOperation.h b/src/async/nntp/MCNNTPDisconnectOperation.h index aa5c12a7..cb4a057a 100644 --- a/src/async/nntp/MCNNTPDisconnectOperation.h +++ b/src/async/nntp/MCNNTPDisconnectOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class NNTPDisconnectOperation : public NNTPOperation { + class MAILCORE_EXPORT NNTPDisconnectOperation : public NNTPOperation { public: NNTPDisconnectOperation(); virtual ~NNTPDisconnectOperation(); diff --git a/src/async/nntp/MCNNTPFetchAllArticlesOperation.h b/src/async/nntp/MCNNTPFetchAllArticlesOperation.h index b40c9720..0fa532c8 100644 --- a/src/async/nntp/MCNNTPFetchAllArticlesOperation.h +++ b/src/async/nntp/MCNNTPFetchAllArticlesOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class NNTPFetchAllArticlesOperation : public NNTPOperation { + class MAILCORE_EXPORT NNTPFetchAllArticlesOperation : public NNTPOperation { public: NNTPFetchAllArticlesOperation(); virtual ~NNTPFetchAllArticlesOperation(); diff --git a/src/async/nntp/MCNNTPFetchArticleOperation.h b/src/async/nntp/MCNNTPFetchArticleOperation.h index e715ddf6..3e066b7b 100644 --- a/src/async/nntp/MCNNTPFetchArticleOperation.h +++ b/src/async/nntp/MCNNTPFetchArticleOperation.h @@ -15,8 +15,7 @@ #ifdef __cplusplus namespace mailcore { - MAILCORE_EXPORT - class NNTPFetchArticleOperation : public NNTPOperation { + class MAILCORE_EXPORT NNTPFetchArticleOperation : public NNTPOperation { public: NNTPFetchArticleOperation(); virtual ~NNTPFetchArticleOperation(); diff --git a/src/async/nntp/MCNNTPFetchHeaderOperation.h b/src/async/nntp/MCNNTPFetchHeaderOperation.h index d12e9f57..93b9d380 100644 --- a/src/async/nntp/MCNNTPFetchHeaderOperation.h +++ b/src/async/nntp/MCNNTPFetchHeaderOperation.h @@ -18,8 +18,7 @@ namespace mailcore { class MessageHeader; - MAILCORE_EXPORT - class NNTPFetchHeaderOperation : public NNTPOperation { + class MAILCORE_EXPORT NNTPFetchHeaderOperation : public NNTPOperation { public: NNTPFetchHeaderOperation(); virtual ~NNTPFetchHeaderOperation(); diff --git a/src/async/nntp/MCNNTPFetchOverviewOperation.h b/src/async/nntp/MCNNTPFetchOverviewOperation.h index 4b48366b..bf8db26f 100644 --- a/src/async/nntp/MCNNTPFetchOverviewOperation.h +++ b/src/async/nntp/MCNNTPFetchOverviewOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class NNTPFetchOverviewOperation : public NNTPOperation { + class MAILCORE_EXPORT NNTPFetchOverviewOperation : public NNTPOperation { public: NNTPFetchOverviewOperation(); virtual ~NNTPFetchOverviewOperation(); diff --git a/src/async/nntp/MCNNTPFetchServerTimeOperation.h b/src/async/nntp/MCNNTPFetchServerTimeOperation.h index 765862bc..b01a1599 100644 --- a/src/async/nntp/MCNNTPFetchServerTimeOperation.h +++ b/src/async/nntp/MCNNTPFetchServerTimeOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class NNTPFetchServerTimeOperation : public NNTPOperation { + class MAILCORE_EXPORT NNTPFetchServerTimeOperation : public NNTPOperation { public: NNTPFetchServerTimeOperation(); virtual ~NNTPFetchServerTimeOperation(); diff --git a/src/async/nntp/MCNNTPListNewsgroupsOperation.h b/src/async/nntp/MCNNTPListNewsgroupsOperation.h index 3450ef3b..d2c68038 100644 --- a/src/async/nntp/MCNNTPListNewsgroupsOperation.h +++ b/src/async/nntp/MCNNTPListNewsgroupsOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class NNTPListNewsgroupsOperation : public NNTPOperation { + class MAILCORE_EXPORT NNTPListNewsgroupsOperation : public NNTPOperation { public: NNTPListNewsgroupsOperation(); virtual ~NNTPListNewsgroupsOperation(); diff --git a/src/async/nntp/MCNNTPOperation.h b/src/async/nntp/MCNNTPOperation.h index a0b49ca2..52205e9f 100644 --- a/src/async/nntp/MCNNTPOperation.h +++ b/src/async/nntp/MCNNTPOperation.h @@ -20,8 +20,7 @@ namespace mailcore { class NNTPAsyncSession; class NNTPOperationCallback; - MAILCORE_EXPORT - class NNTPOperation : public Operation, public NNTPProgressCallback { + class MAILCORE_EXPORT NNTPOperation : public Operation, public NNTPProgressCallback { public: NNTPOperation(); virtual ~NNTPOperation(); diff --git a/src/async/nntp/MCNNTPOperationCallback.h b/src/async/nntp/MCNNTPOperationCallback.h index 1d455016..e12a1b75 100644 --- a/src/async/nntp/MCNNTPOperationCallback.h +++ b/src/async/nntp/MCNNTPOperationCallback.h @@ -10,14 +10,15 @@ #define MAILCORE_MCNNTPOPERATIONCALLBACK_H +#include + #ifdef __cplusplus namespace mailcore { class NNTPOperation; - MAILCORE_EXPORT - class NNTPOperationCallback { + class MAILCORE_EXPORT NNTPOperationCallback { public: virtual void bodyProgress(NNTPOperation * session, unsigned int current, unsigned int maximum) {}; }; diff --git a/src/async/pop/MCPOPAsyncSession.h b/src/async/pop/MCPOPAsyncSession.h index eab64f60..2cc50e12 100644 --- a/src/async/pop/MCPOPAsyncSession.h +++ b/src/async/pop/MCPOPAsyncSession.h @@ -25,8 +25,7 @@ namespace mailcore { class POPOperationQueueCallback; class POPConnectionLogger; - MAILCORE_EXPORT - class POPAsyncSession : public Object { + class MAILCORE_EXPORT POPAsyncSession : public Object { public: POPAsyncSession(); virtual ~POPAsyncSession(); diff --git a/src/async/pop/MCPOPCheckAccountOperation.h b/src/async/pop/MCPOPCheckAccountOperation.h index 7978372f..2b677918 100644 --- a/src/async/pop/MCPOPCheckAccountOperation.h +++ b/src/async/pop/MCPOPCheckAccountOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class POPCheckAccountOperation : public POPOperation { + class MAILCORE_EXPORT POPCheckAccountOperation : public POPOperation { public: POPCheckAccountOperation(); virtual ~POPCheckAccountOperation(); diff --git a/src/async/pop/MCPOPDeleteMessagesOperation.h b/src/async/pop/MCPOPDeleteMessagesOperation.h index 30332a78..e19e211c 100644 --- a/src/async/pop/MCPOPDeleteMessagesOperation.h +++ b/src/async/pop/MCPOPDeleteMessagesOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class POPDeleteMessagesOperation : public POPOperation { + class MAILCORE_EXPORT POPDeleteMessagesOperation : public POPOperation { public: POPDeleteMessagesOperation(); virtual ~POPDeleteMessagesOperation(); diff --git a/src/async/pop/MCPOPFetchHeaderOperation.h b/src/async/pop/MCPOPFetchHeaderOperation.h index f124dfe9..c2c3dee8 100644 --- a/src/async/pop/MCPOPFetchHeaderOperation.h +++ b/src/async/pop/MCPOPFetchHeaderOperation.h @@ -18,8 +18,7 @@ namespace mailcore { class MessageHeader; - MAILCORE_EXPORT - class POPFetchHeaderOperation : public POPOperation { + class MAILCORE_EXPORT POPFetchHeaderOperation : public POPOperation { public: POPFetchHeaderOperation(); virtual ~POPFetchHeaderOperation(); diff --git a/src/async/pop/MCPOPFetchMessageOperation.h b/src/async/pop/MCPOPFetchMessageOperation.h index a03eb08f..23fa1e89 100644 --- a/src/async/pop/MCPOPFetchMessageOperation.h +++ b/src/async/pop/MCPOPFetchMessageOperation.h @@ -15,8 +15,7 @@ #ifdef __cplusplus namespace mailcore { - MAILCORE_EXPORT - class POPFetchMessageOperation : public POPOperation { + class MAILCORE_EXPORT POPFetchMessageOperation : public POPOperation { public: POPFetchMessageOperation(); virtual ~POPFetchMessageOperation(); diff --git a/src/async/pop/MCPOPFetchMessagesOperation.h b/src/async/pop/MCPOPFetchMessagesOperation.h index 81a6759e..7eb797b0 100644 --- a/src/async/pop/MCPOPFetchMessagesOperation.h +++ b/src/async/pop/MCPOPFetchMessagesOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class POPFetchMessagesOperation : public POPOperation { + class MAILCORE_EXPORT POPFetchMessagesOperation : public POPOperation { public: POPFetchMessagesOperation(); virtual ~POPFetchMessagesOperation(); diff --git a/src/async/pop/MCPOPNoopOperation.h b/src/async/pop/MCPOPNoopOperation.h index c21f48a6..cc040c08 100644 --- a/src/async/pop/MCPOPNoopOperation.h +++ b/src/async/pop/MCPOPNoopOperation.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class POPNoopOperation : public POPOperation { + class MAILCORE_EXPORT POPNoopOperation : public POPOperation { public: POPNoopOperation(); virtual ~POPNoopOperation(); diff --git a/src/async/pop/MCPOPOperation.h b/src/async/pop/MCPOPOperation.h index 88fb5c34..652e4a4b 100644 --- a/src/async/pop/MCPOPOperation.h +++ b/src/async/pop/MCPOPOperation.h @@ -20,8 +20,7 @@ namespace mailcore { class POPAsyncSession; class POPOperationCallback; - MAILCORE_EXPORT - class POPOperation : public Operation, public POPProgressCallback { + class MAILCORE_EXPORT POPOperation : public Operation, public POPProgressCallback { public: POPOperation(); virtual ~POPOperation(); diff --git a/src/async/pop/MCPOPOperationCallback.h b/src/async/pop/MCPOPOperationCallback.h index 7fd9cc13..60714b88 100644 --- a/src/async/pop/MCPOPOperationCallback.h +++ b/src/async/pop/MCPOPOperationCallback.h @@ -10,14 +10,15 @@ #define MAILCORE_MCPOPOPERATIONCALLBACK_H +#include + #ifdef __cplusplus namespace mailcore { class POPOperation; - MAILCORE_EXPORT - class POPOperationCallback { + class MAILCORE_EXPORT POPOperationCallback { public: virtual void bodyProgress(POPOperation * session, unsigned int current, unsigned int maximum) {}; }; diff --git a/src/async/smtp/MCSMTPAsyncSession.h b/src/async/smtp/MCSMTPAsyncSession.h index 663784fc..5d94163e 100644 --- a/src/async/smtp/MCSMTPAsyncSession.h +++ b/src/async/smtp/MCSMTPAsyncSession.h @@ -16,8 +16,7 @@ namespace mailcore { class SMTPOperationQueueCallback; class SMTPConnectionLogger; - MAILCORE_EXPORT - class SMTPAsyncSession : public Object { + class MAILCORE_EXPORT SMTPAsyncSession : public Object { public: SMTPAsyncSession(); virtual ~SMTPAsyncSession(); diff --git a/src/async/smtp/MCSMTPCheckAccountOperation.h b/src/async/smtp/MCSMTPCheckAccountOperation.h index ab0e7039..ad45d38b 100644 --- a/src/async/smtp/MCSMTPCheckAccountOperation.h +++ b/src/async/smtp/MCSMTPCheckAccountOperation.h @@ -17,8 +17,7 @@ namespace mailcore { - MAILCORE_EXPORT - class SMTPCheckAccountOperation : public SMTPOperation { + class MAILCORE_EXPORT SMTPCheckAccountOperation : public SMTPOperation { public: SMTPCheckAccountOperation(); virtual ~SMTPCheckAccountOperation(); diff --git a/src/async/smtp/MCSMTPDisconnectOperation.h b/src/async/smtp/MCSMTPDisconnectOperation.h index d75c5bc6..668e3c41 100644 --- a/src/async/smtp/MCSMTPDisconnectOperation.h +++ b/src/async/smtp/MCSMTPDisconnectOperation.h @@ -18,8 +18,7 @@ namespace mailcore { - MAILCORE_EXPORT - class SMTPDisconnectOperation : public SMTPOperation { + class MAILCORE_EXPORT SMTPDisconnectOperation : public SMTPOperation { public: SMTPDisconnectOperation(); virtual ~SMTPDisconnectOperation(); diff --git a/src/async/smtp/MCSMTPLoginOperation.h b/src/async/smtp/MCSMTPLoginOperation.h index 9e68dc05..fd993459 100644 --- a/src/async/smtp/MCSMTPLoginOperation.h +++ b/src/async/smtp/MCSMTPLoginOperation.h @@ -18,8 +18,7 @@ namespace mailcore { - MAILCORE_EXPORT - class SMTPLoginOperation : public SMTPOperation { + class MAILCORE_EXPORT SMTPLoginOperation : public SMTPOperation { public: SMTPLoginOperation(); virtual ~SMTPLoginOperation(); diff --git a/src/async/smtp/MCSMTPNoopOperation.h b/src/async/smtp/MCSMTPNoopOperation.h index 46c955cf..ad194367 100644 --- a/src/async/smtp/MCSMTPNoopOperation.h +++ b/src/async/smtp/MCSMTPNoopOperation.h @@ -18,8 +18,7 @@ namespace mailcore { - MAILCORE_EXPORT - class SMTPNoopOperation : public SMTPOperation { + class MAILCORE_EXPORT SMTPNoopOperation : public SMTPOperation { public: SMTPNoopOperation(); virtual ~SMTPNoopOperation(); diff --git a/src/async/smtp/MCSMTPOperation.h b/src/async/smtp/MCSMTPOperation.h index 7530ea8b..5978d3d6 100644 --- a/src/async/smtp/MCSMTPOperation.h +++ b/src/async/smtp/MCSMTPOperation.h @@ -20,8 +20,7 @@ namespace mailcore { class SMTPAsyncSession; class SMTPOperationCallback; - MAILCORE_EXPORT - class SMTPOperation : public Operation, public SMTPProgressCallback { + class MAILCORE_EXPORT SMTPOperation : public Operation, public SMTPProgressCallback { public: SMTPOperation(); virtual ~SMTPOperation(); diff --git a/src/async/smtp/MCSMTPOperationCallback.h b/src/async/smtp/MCSMTPOperationCallback.h index 9d576cf7..a5cfdd84 100644 --- a/src/async/smtp/MCSMTPOperationCallback.h +++ b/src/async/smtp/MCSMTPOperationCallback.h @@ -10,14 +10,15 @@ #define MAILCORE_MCSMTPOPERATIONCALLBACK_H +#include + #ifdef __cplusplus namespace mailcore { class SMTPOperation; - MAILCORE_EXPORT - class SMTPOperationCallback { + class MAILCORE_EXPORT SMTPOperationCallback { public: virtual void bodyProgress(SMTPOperation * session, unsigned int current, unsigned int maximum) {}; }; diff --git a/src/async/smtp/MCSMTPSendWithDataOperation.h b/src/async/smtp/MCSMTPSendWithDataOperation.h index 8a548498..a8ee2515 100644 --- a/src/async/smtp/MCSMTPSendWithDataOperation.h +++ b/src/async/smtp/MCSMTPSendWithDataOperation.h @@ -18,8 +18,7 @@ namespace mailcore { - MAILCORE_EXPORT - class SMTPSendWithDataOperation : public SMTPOperation { + class MAILCORE_EXPORT SMTPSendWithDataOperation : public SMTPOperation { public: SMTPSendWithDataOperation(); virtual ~SMTPSendWithDataOperation(); diff --git a/src/core/abstract/MCAbstractMessage.h b/src/core/abstract/MCAbstractMessage.h index bd93f44c..6e7e2431 100644 --- a/src/core/abstract/MCAbstractMessage.h +++ b/src/core/abstract/MCAbstractMessage.h @@ -11,8 +11,7 @@ namespace mailcore { class AbstractPart; class MessageHeader; - MAILCORE_EXPORT - class AbstractMessage : public Object { + class MAILCORE_EXPORT AbstractMessage : public Object { public: AbstractMessage(); virtual ~AbstractMessage(); diff --git a/src/core/abstract/MCAbstractMessagePart.h b/src/core/abstract/MCAbstractMessagePart.h index 93ccd361..74be7579 100644 --- a/src/core/abstract/MCAbstractMessagePart.h +++ b/src/core/abstract/MCAbstractMessagePart.h @@ -11,8 +11,7 @@ namespace mailcore { class MessageHeader; - MAILCORE_EXPORT - class AbstractMessagePart : public AbstractPart { + class MAILCORE_EXPORT AbstractMessagePart : public AbstractPart { public: AbstractMessagePart(); virtual ~AbstractMessagePart(); diff --git a/src/core/abstract/MCAbstractMultipart.h b/src/core/abstract/MCAbstractMultipart.h index ce36acbc..814ee6df 100644 --- a/src/core/abstract/MCAbstractMultipart.h +++ b/src/core/abstract/MCAbstractMultipart.h @@ -9,8 +9,7 @@ namespace mailcore { - MAILCORE_EXPORT - class AbstractMultipart : public AbstractPart { + class MAILCORE_EXPORT AbstractMultipart : public AbstractPart { public: AbstractMultipart(); virtual ~AbstractMultipart(); diff --git a/src/core/abstract/MCAbstractPart.h b/src/core/abstract/MCAbstractPart.h index 3e6d627e..7a743e1d 100644 --- a/src/core/abstract/MCAbstractPart.h +++ b/src/core/abstract/MCAbstractPart.h @@ -11,8 +11,7 @@ namespace mailcore { class AbstractMessage; - MAILCORE_EXPORT - class AbstractPart : public Object { + class MAILCORE_EXPORT AbstractPart : public Object { public: AbstractPart(); virtual ~AbstractPart(); diff --git a/src/core/abstract/MCAddress.h b/src/core/abstract/MCAddress.h index 04a42cdf..e6644576 100644 --- a/src/core/abstract/MCAddress.h +++ b/src/core/abstract/MCAddress.h @@ -8,8 +8,7 @@ namespace mailcore { - MAILCORE_EXPORT - class Address : public Object { + class MAILCORE_EXPORT Address : public Object { public: Address(); virtual ~Address(); diff --git a/src/core/abstract/MCMessageHeader.h b/src/core/abstract/MCMessageHeader.h index a9161cf7..439e0d44 100644 --- a/src/core/abstract/MCMessageHeader.h +++ b/src/core/abstract/MCMessageHeader.h @@ -11,8 +11,7 @@ namespace mailcore { class Address; - MAILCORE_EXPORT - class MessageHeader : public Object { + class MAILCORE_EXPORT MessageHeader : public Object { public: MessageHeader(); virtual ~MessageHeader(); diff --git a/src/core/basetypes/MCArray.h b/src/core/basetypes/MCArray.h index 7895b692..7e82ad9e 100644 --- a/src/core/basetypes/MCArray.h +++ b/src/core/basetypes/MCArray.h @@ -12,8 +12,7 @@ namespace mailcore { class String; - MAILCORE_EXPORT - class Array : public Object { + class MAILCORE_EXPORT Array : public Object { public: Array(); virtual ~Array(); diff --git a/src/core/basetypes/MCAssert.h b/src/core/basetypes/MCAssert.h index 226ea8a0..4022e285 100644 --- a/src/core/basetypes/MCAssert.h +++ b/src/core/basetypes/MCAssert.h @@ -2,6 +2,8 @@ #define MAILCORE_MCASSERT_H +#include + #define MCAssert(cond) MCAssertInternal(__FILE__, __LINE__, cond, #cond) #ifdef __cplusplus diff --git a/src/core/basetypes/MCAutoreleasePool.h b/src/core/basetypes/MCAutoreleasePool.h index a84ede29..c3abf477 100644 --- a/src/core/basetypes/MCAutoreleasePool.h +++ b/src/core/basetypes/MCAutoreleasePool.h @@ -11,8 +11,7 @@ typedef struct carray_s carray; namespace mailcore { - MAILCORE_EXPORT - class AutoreleasePool : public Object { + class MAILCORE_EXPORT AutoreleasePool : public Object { public: AutoreleasePool(); virtual ~AutoreleasePool(); diff --git a/src/core/basetypes/MCConnectionLogger.h b/src/core/basetypes/MCConnectionLogger.h index d0a44713..d5282db4 100644 --- a/src/core/basetypes/MCConnectionLogger.h +++ b/src/core/basetypes/MCConnectionLogger.h @@ -12,6 +12,8 @@ #include +#include + #ifdef __cplusplus namespace mailcore { @@ -33,8 +35,7 @@ namespace mailcore { ConnectionLogTypeErrorSent, }; - MAILCORE_EXPORT - class ConnectionLogger { + class MAILCORE_EXPORT ConnectionLogger { public: virtual void log(void * sender, ConnectionLogType logType, Data * buffer) {} }; diff --git a/src/core/basetypes/MCData.h b/src/core/basetypes/MCData.h index db3af1e6..bec75008 100644 --- a/src/core/basetypes/MCData.h +++ b/src/core/basetypes/MCData.h @@ -17,8 +17,7 @@ namespace mailcore { class String; - MAILCORE_EXPORT - class Data : public Object { + class MAILCORE_EXPORT Data : public Object { public: Data(); Data(int capacity); diff --git a/src/core/basetypes/MCHTMLCleaner.h b/src/core/basetypes/MCHTMLCleaner.h index bf692e5c..33e65767 100644 --- a/src/core/basetypes/MCHTMLCleaner.h +++ b/src/core/basetypes/MCHTMLCleaner.h @@ -11,10 +11,11 @@ #define MAILCORE_HTMLCLEANER_H #include +#include namespace mailcore { - class HTMLCleaner { + class MAILCORE_EXPORT HTMLCleaner { public: static String * cleanHTML(String * input); }; diff --git a/src/core/basetypes/MCHashMap.h b/src/core/basetypes/MCHashMap.h index ec7dea59..93938383 100644 --- a/src/core/basetypes/MCHashMap.h +++ b/src/core/basetypes/MCHashMap.h @@ -13,8 +13,7 @@ namespace mailcore { struct HashMapCell; typedef HashMapCell HashMapIter; - MAILCORE_EXPORT - class HashMap : public Object { + class MAILCORE_EXPORT HashMap : public Object { public: HashMap(); virtual ~HashMap(); diff --git a/src/core/basetypes/MCIndexSet.h b/src/core/basetypes/MCIndexSet.h index 1e8d3853..e76517db 100644 --- a/src/core/basetypes/MCIndexSet.h +++ b/src/core/basetypes/MCIndexSet.h @@ -18,8 +18,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IndexSet : public Object { + class MAILCORE_EXPORT IndexSet : public Object { public: IndexSet(); IndexSet(IndexSet * o); diff --git a/src/core/basetypes/MCJSON.h b/src/core/basetypes/MCJSON.h index 4999d0fd..f000dc2d 100644 --- a/src/core/basetypes/MCJSON.h +++ b/src/core/basetypes/MCJSON.h @@ -23,8 +23,7 @@ namespace mailcore { class Null; - MAILCORE_EXPORT - class JSON { + class MAILCORE_EXPORT JSON { public: static String * objectToJSONString(Object * object); static Data * objectToJSONData(Object * object); diff --git a/src/core/basetypes/MCJSONParser.h b/src/core/basetypes/MCJSONParser.h index 16a40c92..dbc0fc90 100644 --- a/src/core/basetypes/MCJSONParser.h +++ b/src/core/basetypes/MCJSONParser.h @@ -12,13 +12,14 @@ #include #include +#include namespace mailcore { class Data; class String; - class JSONParser : public Object { + class MAILCORE_EXPORT JSONParser : public Object { public: JSONParser(); virtual ~JSONParser(); diff --git a/src/core/basetypes/MCNull.h b/src/core/basetypes/MCNull.h index 0ee9e532..dc271e04 100644 --- a/src/core/basetypes/MCNull.h +++ b/src/core/basetypes/MCNull.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class Null : public Object { + class MAILCORE_EXPORT Null : public Object { public: static Null * null(); }; diff --git a/src/core/basetypes/MCObject.h b/src/core/basetypes/MCObject.h index 9ca144f0..95446f61 100644 --- a/src/core/basetypes/MCObject.h +++ b/src/core/basetypes/MCObject.h @@ -18,8 +18,7 @@ namespace mailcore { class String; class HashMap; - MAILCORE_EXPORT - class Object { + class MAILCORE_EXPORT Object { public: Object(); virtual ~Object(); diff --git a/src/core/basetypes/MCOperation.h b/src/core/basetypes/MCOperation.h index b9d5f95e..5ee8b2f4 100644 --- a/src/core/basetypes/MCOperation.h +++ b/src/core/basetypes/MCOperation.h @@ -11,7 +11,7 @@ namespace mailcore { class OperationCallback; - class Operation : public Object { + class MAILCORE_EXPORT Operation : public Object { public: Operation(); virtual ~Operation(); diff --git a/src/core/basetypes/MCOperationCallback.h b/src/core/basetypes/MCOperationCallback.h index 54a89f9a..425b1e99 100644 --- a/src/core/basetypes/MCOperationCallback.h +++ b/src/core/basetypes/MCOperationCallback.h @@ -2,14 +2,15 @@ #define MAILCORE_MCOPERATIONCALLBACK_H +#include + #ifdef __cplusplus namespace mailcore { class Operation; - MAILCORE_EXPORT - class OperationCallback { + class MAILCORE_EXPORT OperationCallback { public: virtual void operationFinished(Operation * op) {} }; diff --git a/src/core/basetypes/MCOperationQueue.h b/src/core/basetypes/MCOperationQueue.h index 3c15e09a..1e8e4844 100644 --- a/src/core/basetypes/MCOperationQueue.h +++ b/src/core/basetypes/MCOperationQueue.h @@ -15,8 +15,7 @@ namespace mailcore { class OperationQueueCallback; class Array; - MAILCORE_EXPORT - class OperationQueue : public Object { + class MAILCORE_EXPORT OperationQueue : public Object { public: OperationQueue(); virtual ~OperationQueue(); diff --git a/src/core/basetypes/MCOperationQueueCallback.h b/src/core/basetypes/MCOperationQueueCallback.h index 7004e4eb..482f5541 100644 --- a/src/core/basetypes/MCOperationQueueCallback.h +++ b/src/core/basetypes/MCOperationQueueCallback.h @@ -9,12 +9,15 @@ #ifndef MAILCORE_OPERATIONQUEUECALLBACK_H #define MAILCORE_OPERATIONQUEUECALLBACK_H +#include + +#ifdef __cplusplus + namespace mailcore { class OperationQueue; - MAILCORE_EXPORT - class OperationQueueCallback { + class MAILCORE_EXPORT OperationQueueCallback { public: virtual void queueStartRunning() {} virtual void queueStoppedRunning() {} @@ -23,3 +26,5 @@ namespace mailcore { } #endif + +#endif diff --git a/src/core/basetypes/MCRange.h b/src/core/basetypes/MCRange.h index 5dd5ecf2..9ec4f568 100644 --- a/src/core/basetypes/MCRange.h +++ b/src/core/basetypes/MCRange.h @@ -6,6 +6,8 @@ #include +#include + #ifndef UINT64_MAX # define UINT64_MAX 18446744073709551615ULL #endif diff --git a/src/core/basetypes/MCSet.h b/src/core/basetypes/MCSet.h index e3153c9f..8b477cc1 100644 --- a/src/core/basetypes/MCSet.h +++ b/src/core/basetypes/MCSet.h @@ -12,8 +12,7 @@ namespace mailcore { class Array; class HashMap; - MAILCORE_EXPORT - class Set : public Object { + class MAILCORE_EXPORT Set : public Object { public: Set(); Set(Set * o); diff --git a/src/core/basetypes/MCString.h b/src/core/basetypes/MCString.h index 0edd2982..0735d321 100644 --- a/src/core/basetypes/MCString.h +++ b/src/core/basetypes/MCString.h @@ -16,8 +16,7 @@ namespace mailcore { class Data; class Array; - MAILCORE_EXPORT - class String : public Object { + class MAILCORE_EXPORT String : public Object { public: String(const UChar * unicodeChars = NULL); String(const UChar * unicodeChars, unsigned int length); diff --git a/src/core/basetypes/MCUtils.h b/src/core/basetypes/MCUtils.h index 2461b540..3892350f 100644 --- a/src/core/basetypes/MCUtils.h +++ b/src/core/basetypes/MCUtils.h @@ -36,6 +36,8 @@ #define MCISKINDOFCLASS(instance, class) (dynamic_cast(instance) != NULL) +#endif + #ifdef _MSC_VER # ifdef MAILCORE_DLL # define MAILCORE_EXPORT __declspec(dllexport) @@ -47,5 +49,3 @@ #endif #endif - -#endif diff --git a/src/core/basetypes/MCValue.h b/src/core/basetypes/MCValue.h index 3f0a7b75..41fb6918 100644 --- a/src/core/basetypes/MCValue.h +++ b/src/core/basetypes/MCValue.h @@ -29,8 +29,7 @@ namespace mailcore { ValueTypeData, }; - MAILCORE_EXPORT - class Value : public Object { + class MAILCORE_EXPORT Value : public Object { public: virtual ~Value(); diff --git a/src/core/imap/MCIMAPFolder.h b/src/core/imap/MCIMAPFolder.h index 10497ef7..5d9c111f 100644 --- a/src/core/imap/MCIMAPFolder.h +++ b/src/core/imap/MCIMAPFolder.h @@ -9,8 +9,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPFolder : public Object { + class MAILCORE_EXPORT IMAPFolder : public Object { public: IMAPFolder(); virtual ~IMAPFolder(); diff --git a/src/core/imap/MCIMAPFolderStatus.h b/src/core/imap/MCIMAPFolderStatus.h index fb4410e7..8bfac59f 100644 --- a/src/core/imap/MCIMAPFolderStatus.h +++ b/src/core/imap/MCIMAPFolderStatus.h @@ -17,8 +17,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPFolderStatus : public Object { + class MAILCORE_EXPORT IMAPFolderStatus : public Object { public: IMAPFolderStatus(); virtual ~IMAPFolderStatus(); diff --git a/src/core/imap/MCIMAPIdentity.h b/src/core/imap/MCIMAPIdentity.h index 176693f9..4f85744d 100644 --- a/src/core/imap/MCIMAPIdentity.h +++ b/src/core/imap/MCIMAPIdentity.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPIdentity : public Object { + class MAILCORE_EXPORT IMAPIdentity : public Object { public: IMAPIdentity(); diff --git a/src/core/imap/MCIMAPMessage.h b/src/core/imap/MCIMAPMessage.h index 15abcbd4..c36a9ad1 100644 --- a/src/core/imap/MCIMAPMessage.h +++ b/src/core/imap/MCIMAPMessage.h @@ -15,8 +15,7 @@ namespace mailcore { class HTMLRendererIMAPCallback; class HTMLRendererTemplateCallback; - MAILCORE_EXPORT - class IMAPMessage : public AbstractMessage { + class MAILCORE_EXPORT IMAPMessage : public AbstractMessage { public: IMAPMessage(); virtual ~IMAPMessage(); diff --git a/src/core/imap/MCIMAPMessagePart.h b/src/core/imap/MCIMAPMessagePart.h index 2cb4c975..76317201 100644 --- a/src/core/imap/MCIMAPMessagePart.h +++ b/src/core/imap/MCIMAPMessagePart.h @@ -8,8 +8,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPMessagePart : public AbstractMessagePart { + class MAILCORE_EXPORT IMAPMessagePart : public AbstractMessagePart { public: IMAPMessagePart(); virtual ~IMAPMessagePart(); diff --git a/src/core/imap/MCIMAPMultipart.h b/src/core/imap/MCIMAPMultipart.h index 741f4123..91396624 100644 --- a/src/core/imap/MCIMAPMultipart.h +++ b/src/core/imap/MCIMAPMultipart.h @@ -8,8 +8,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPMultipart : public AbstractMultipart { + class MAILCORE_EXPORT IMAPMultipart : public AbstractMultipart { public: IMAPMultipart(); virtual ~IMAPMultipart(); diff --git a/src/core/imap/MCIMAPNamespace.h b/src/core/imap/MCIMAPNamespace.h index 4214fc7f..e57cecba 100644 --- a/src/core/imap/MCIMAPNamespace.h +++ b/src/core/imap/MCIMAPNamespace.h @@ -10,8 +10,7 @@ namespace mailcore { class IMAPNamespaceItem; - MAILCORE_EXPORT - class IMAPNamespace : public Object { + class MAILCORE_EXPORT IMAPNamespace : public Object { public: IMAPNamespace(); virtual ~IMAPNamespace(); diff --git a/src/core/imap/MCIMAPNamespaceItem.h b/src/core/imap/MCIMAPNamespaceItem.h index 43a28a52..3ca8e485 100644 --- a/src/core/imap/MCIMAPNamespaceItem.h +++ b/src/core/imap/MCIMAPNamespaceItem.h @@ -8,8 +8,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPNamespaceItem : public Object { + class MAILCORE_EXPORT IMAPNamespaceItem : public Object { public: IMAPNamespaceItem(); virtual ~IMAPNamespaceItem(); diff --git a/src/core/imap/MCIMAPPart.h b/src/core/imap/MCIMAPPart.h index 9cb1a1c6..1a34da21 100644 --- a/src/core/imap/MCIMAPPart.h +++ b/src/core/imap/MCIMAPPart.h @@ -12,8 +12,7 @@ namespace mailcore { class IMAPMessagePart; class IMAPMultipart; - MAILCORE_EXPORT - class IMAPPart : public AbstractPart { + class MAILCORE_EXPORT IMAPPart : public AbstractPart { public: IMAPPart(); virtual ~IMAPPart(); diff --git a/src/core/imap/MCIMAPProgressCallback.h b/src/core/imap/MCIMAPProgressCallback.h index 2570dc81..b461eefd 100644 --- a/src/core/imap/MCIMAPProgressCallback.h +++ b/src/core/imap/MCIMAPProgressCallback.h @@ -4,12 +4,13 @@ #ifdef __cplusplus +#include + namespace mailcore { class IMAPSession; - MAILCORE_EXPORT - class IMAPProgressCallback { + class MAILCORE_EXPORT IMAPProgressCallback { public: virtual void bodyProgress(IMAPSession * session, unsigned int current, unsigned int maximum) {}; virtual void itemsProgress(IMAPSession * session, unsigned int current, unsigned int maximum) {}; diff --git a/src/core/imap/MCIMAPSearchExpression.h b/src/core/imap/MCIMAPSearchExpression.h index 0d53e0b3..6f1f4ea0 100644 --- a/src/core/imap/MCIMAPSearchExpression.h +++ b/src/core/imap/MCIMAPSearchExpression.h @@ -9,8 +9,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPSearchExpression : public Object { + class MAILCORE_EXPORT IMAPSearchExpression : public Object { public: IMAPSearchExpression(); virtual ~IMAPSearchExpression(); diff --git a/src/core/imap/MCIMAPSession.h b/src/core/imap/MCIMAPSession.h index 456895d2..e96b8fec 100755 --- a/src/core/imap/MCIMAPSession.h +++ b/src/core/imap/MCIMAPSession.h @@ -22,8 +22,7 @@ namespace mailcore { class IMAPFolderStatus; class IMAPIdentity; - MAILCORE_EXPORT - class IMAPSession : public Object { + class MAILCORE_EXPORT IMAPSession : public Object { public: IMAPSession(); virtual ~IMAPSession(); diff --git a/src/core/imap/MCIMAPSyncResult.h b/src/core/imap/MCIMAPSyncResult.h index f2ff311b..683ca6cc 100644 --- a/src/core/imap/MCIMAPSyncResult.h +++ b/src/core/imap/MCIMAPSyncResult.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class IMAPSyncResult : public Object { + class MAILCORE_EXPORT IMAPSyncResult : public Object { public: IMAPSyncResult(); virtual ~IMAPSyncResult(); diff --git a/src/core/nntp/MCNNTPGroupInfo.h b/src/core/nntp/MCNNTPGroupInfo.h index 7aab5e17..75a6675c 100644 --- a/src/core/nntp/MCNNTPGroupInfo.h +++ b/src/core/nntp/MCNNTPGroupInfo.h @@ -8,8 +8,7 @@ namespace mailcore { - MAILCORE_EXPORT - class NNTPGroupInfo : public Object { + class MAILCORE_EXPORT NNTPGroupInfo : public Object { public: NNTPGroupInfo(); virtual ~NNTPGroupInfo(); diff --git a/src/core/nntp/MCNNTPProgressCallback.h b/src/core/nntp/MCNNTPProgressCallback.h index 46cfbe72..dd615d04 100644 --- a/src/core/nntp/MCNNTPProgressCallback.h +++ b/src/core/nntp/MCNNTPProgressCallback.h @@ -4,12 +4,13 @@ #ifdef __cplusplus +#include + namespace mailcore { class NNTPSession; - MAILCORE_EXPORT - class NNTPProgressCallback { + class MAILCORE_EXPORT NNTPProgressCallback { public: virtual void bodyProgress(NNTPSession * session, unsigned int current, unsigned int maximum) {}; }; diff --git a/src/core/nntp/MCNNTPSession.h b/src/core/nntp/MCNNTPSession.h index 1d896192..dc2316ff 100644 --- a/src/core/nntp/MCNNTPSession.h +++ b/src/core/nntp/MCNNTPSession.h @@ -11,8 +11,7 @@ namespace mailcore { class NNTPProgressCallback; class MessageHeader; - MAILCORE_EXPORT - class NNTPSession : public Object { + class MAILCORE_EXPORT NNTPSession : public Object { public: NNTPSession(); virtual ~NNTPSession(); diff --git a/src/core/pop/MCPOPMessageInfo.h b/src/core/pop/MCPOPMessageInfo.h index 3a906668..6d70fe30 100644 --- a/src/core/pop/MCPOPMessageInfo.h +++ b/src/core/pop/MCPOPMessageInfo.h @@ -8,8 +8,7 @@ namespace mailcore { - MAILCORE_EXPORT - class POPMessageInfo : public Object { + class MAILCORE_EXPORT POPMessageInfo : public Object { public: POPMessageInfo(); virtual ~POPMessageInfo(); diff --git a/src/core/pop/MCPOPProgressCallback.h b/src/core/pop/MCPOPProgressCallback.h index a4f32732..cdee9332 100644 --- a/src/core/pop/MCPOPProgressCallback.h +++ b/src/core/pop/MCPOPProgressCallback.h @@ -4,12 +4,13 @@ #ifdef __cplusplus +#include + namespace mailcore { class POPSession; - MAILCORE_EXPORT - class POPProgressCallback { + class MAILCORE_EXPORT POPProgressCallback { public: virtual void bodyProgress(POPSession * session, unsigned int current, unsigned int maximum) {}; }; diff --git a/src/core/pop/MCPOPSession.h b/src/core/pop/MCPOPSession.h index 262cfe41..eda323c0 100644 --- a/src/core/pop/MCPOPSession.h +++ b/src/core/pop/MCPOPSession.h @@ -13,8 +13,7 @@ namespace mailcore { class POPProgressCallback; class MessageHeader; - MAILCORE_EXPORT - class POPSession : public Object { + class MAILCORE_EXPORT POPSession : public Object { public: POPSession(); virtual ~POPSession(); diff --git a/src/core/provider/MCMailProvider.h b/src/core/provider/MCMailProvider.h index 20589a74..e0801da5 100644 --- a/src/core/provider/MCMailProvider.h +++ b/src/core/provider/MCMailProvider.h @@ -18,8 +18,7 @@ namespace mailcore { class NetService; - MAILCORE_EXPORT - class MailProvider : public Object { + class MAILCORE_EXPORT MailProvider : public Object { public: static MailProvider * providerWithInfo(HashMap * info); diff --git a/src/core/provider/MCMailProvidersManager.h b/src/core/provider/MCMailProvidersManager.h index 92ae59af..42d1d3bc 100644 --- a/src/core/provider/MCMailProvidersManager.h +++ b/src/core/provider/MCMailProvidersManager.h @@ -18,8 +18,7 @@ namespace mailcore { class MailProvider; - MAILCORE_EXPORT - class MailProvidersManager : public Object { + class MAILCORE_EXPORT MailProvidersManager : public Object { public: static MailProvidersManager * sharedManager(); diff --git a/src/core/provider/MCNetService.h b/src/core/provider/MCNetService.h index efc6c19c..bc1edf81 100644 --- a/src/core/provider/MCNetService.h +++ b/src/core/provider/MCNetService.h @@ -17,8 +17,7 @@ namespace mailcore { - MAILCORE_EXPORT - class NetService : public Object { + class MAILCORE_EXPORT NetService : public Object { public: NetService(); diff --git a/src/core/renderer/MCAddressDisplay.h b/src/core/renderer/MCAddressDisplay.h index 72fcff41..6dd1faf8 100644 --- a/src/core/renderer/MCAddressDisplay.h +++ b/src/core/renderer/MCAddressDisplay.h @@ -16,8 +16,7 @@ namespace mailcore { - MAILCORE_EXPORT - class AddressDisplay { + class MAILCORE_EXPORT AddressDisplay { public: static String * displayStringForAddress(Address * address); static String * shortDisplayStringForAddress(Address * address); diff --git a/src/core/renderer/MCDateFormatter.h b/src/core/renderer/MCDateFormatter.h index ea93b4fc..d2198d04 100644 --- a/src/core/renderer/MCDateFormatter.h +++ b/src/core/renderer/MCDateFormatter.h @@ -31,8 +31,7 @@ namespace mailcore { DateFormatStyleNone = -1 /* UDAT_NONE */, }; - MAILCORE_EXPORT - class DateFormatter : public Object { + class MAILCORE_EXPORT DateFormatter : public Object { public: DateFormatter(); virtual ~DateFormatter(); diff --git a/src/core/renderer/MCHTMLBodyRendererTemplateCallback.h b/src/core/renderer/MCHTMLBodyRendererTemplateCallback.h index 6cd86d1b..c3c19741 100644 --- a/src/core/renderer/MCHTMLBodyRendererTemplateCallback.h +++ b/src/core/renderer/MCHTMLBodyRendererTemplateCallback.h @@ -11,13 +11,13 @@ #define MAILCORE_MCHTMLBODYRENDERERTEMPLATECALLBACK_H #include +#include #ifdef __cplusplus namespace mailcore { - MAILCORE_EXPORT - class HTMLBodyRendererTemplateCallback : public Object, public HTMLRendererTemplateCallback { + class MAILCORE_EXPORT HTMLBodyRendererTemplateCallback : public Object, public HTMLRendererTemplateCallback { public: virtual String * templateForMainHeader(MessageHeader * header); }; diff --git a/src/core/renderer/MCHTMLRenderer.h b/src/core/renderer/MCHTMLRenderer.h index 6d59cb67..dc527b2f 100644 --- a/src/core/renderer/MCHTMLRenderer.h +++ b/src/core/renderer/MCHTMLRenderer.h @@ -22,7 +22,7 @@ namespace mailcore { class HTMLRendererTemplateCallback; class HTMLRendererIMAPCallback; - class HTMLRenderer { + class MAILCORE_EXPORT HTMLRenderer { public: static String * htmlForRFC822Message(MessageParser * message, HTMLRendererTemplateCallback * htmlCallback); diff --git a/src/core/renderer/MCHTMLRendererCallback.h b/src/core/renderer/MCHTMLRendererCallback.h index f67763e5..7c20f18a 100644 --- a/src/core/renderer/MCHTMLRendererCallback.h +++ b/src/core/renderer/MCHTMLRendererCallback.h @@ -12,6 +12,7 @@ #include #include +#include #ifdef __cplusplus @@ -19,8 +20,7 @@ namespace mailcore { class MessageParser; - MAILCORE_EXPORT - class HTMLRendererIMAPCallback { + class MAILCORE_EXPORT HTMLRendererIMAPCallback { public: HTMLRendererIMAPCallback() {} virtual ~HTMLRendererIMAPCallback() {} @@ -30,8 +30,7 @@ namespace mailcore { virtual void prefetchImageIMAPPart(String * folder, IMAPPart * part) {} }; - MAILCORE_EXPORT - class HTMLRendererTemplateCallback { + class MAILCORE_EXPORT HTMLRendererTemplateCallback { public: virtual bool canPreviewPart(AbstractPart * part); virtual bool shouldShowPart(AbstractPart * part); diff --git a/src/core/renderer/MCHTMLRendererIMAPDataCallback.h b/src/core/renderer/MCHTMLRendererIMAPDataCallback.h index acba9f9f..7981b114 100644 --- a/src/core/renderer/MCHTMLRendererIMAPDataCallback.h +++ b/src/core/renderer/MCHTMLRendererIMAPDataCallback.h @@ -11,13 +11,13 @@ #define MAILCORE_MCHTMLRENDERERIMAPDATACALLBACK_H #include "MCHTMLRendererCallback.h" +#include #ifdef __cplusplus namespace mailcore { - MAILCORE_EXPORT - class HTMLRendererIMAPDataCallback : public Object, public HTMLRendererIMAPCallback { + class MAILCORE_EXPORT HTMLRendererIMAPDataCallback : public Object, public HTMLRendererIMAPCallback { public: HTMLRendererIMAPDataCallback(IMAPSession * session, uint32_t uid); diff --git a/src/core/renderer/MCSizeFormatter.h b/src/core/renderer/MCSizeFormatter.h index 22ae2f67..cfc8090f 100644 --- a/src/core/renderer/MCSizeFormatter.h +++ b/src/core/renderer/MCSizeFormatter.h @@ -18,8 +18,7 @@ namespace mailcore { class String; - MAILCORE_EXPORT - class SizeFormatter : public Object { + class MAILCORE_EXPORT SizeFormatter : public Object { public: static String * stringWithSize(unsigned int size); }; diff --git a/src/core/rfc822/MCAttachment.h b/src/core/rfc822/MCAttachment.h index 573366ed..deacf75e 100644 --- a/src/core/rfc822/MCAttachment.h +++ b/src/core/rfc822/MCAttachment.h @@ -13,8 +13,7 @@ namespace mailcore { class MessagePart; - MAILCORE_EXPORT - class Attachment : public AbstractPart { + class MAILCORE_EXPORT Attachment : public AbstractPart { public: static String * mimeTypeForFilename(String * filename); static Attachment * attachmentWithContentsOfFile(String * filename); diff --git a/src/core/rfc822/MCMessageBuilder.h b/src/core/rfc822/MCMessageBuilder.h index 5336d4dc..f03bd09a 100644 --- a/src/core/rfc822/MCMessageBuilder.h +++ b/src/core/rfc822/MCMessageBuilder.h @@ -12,8 +12,7 @@ namespace mailcore { class Attachment; class HTMLRendererTemplateCallback; - MAILCORE_EXPORT - class MessageBuilder : public AbstractMessage { + class MAILCORE_EXPORT MessageBuilder : public AbstractMessage { public: MessageBuilder(); virtual ~MessageBuilder(); diff --git a/src/core/rfc822/MCMessageParser.h b/src/core/rfc822/MCMessageParser.h index aed322df..8d2fe4a6 100644 --- a/src/core/rfc822/MCMessageParser.h +++ b/src/core/rfc822/MCMessageParser.h @@ -15,8 +15,7 @@ namespace mailcore { class HTMLRendererTemplateCallback; - MAILCORE_EXPORT - class MessageParser : public AbstractMessage { + class MAILCORE_EXPORT MessageParser : public AbstractMessage { public: static MessageParser * messageParserWithData(Data * data); static MessageParser * messageParserWithContentsOfFile(String * filename); diff --git a/src/core/rfc822/MCMessagePart.h b/src/core/rfc822/MCMessagePart.h index ef649661..894cd3e5 100644 --- a/src/core/rfc822/MCMessagePart.h +++ b/src/core/rfc822/MCMessagePart.h @@ -9,8 +9,7 @@ namespace mailcore { - MAILCORE_EXPORT - class MessagePart : public AbstractMessagePart { + class MAILCORE_EXPORT MessagePart : public AbstractMessagePart { public: MessagePart(); virtual ~MessagePart(); diff --git a/src/core/rfc822/MCMultipart.h b/src/core/rfc822/MCMultipart.h index b68718f2..40b0a48b 100644 --- a/src/core/rfc822/MCMultipart.h +++ b/src/core/rfc822/MCMultipart.h @@ -9,8 +9,7 @@ namespace mailcore { - MAILCORE_EXPORT - class Multipart : public AbstractMultipart { + class MAILCORE_EXPORT Multipart : public AbstractMultipart { public: Multipart(); virtual ~Multipart(); diff --git a/src/core/smtp/MCSMTPProgressCallback.h b/src/core/smtp/MCSMTPProgressCallback.h index d3844a82..7cc524a2 100644 --- a/src/core/smtp/MCSMTPProgressCallback.h +++ b/src/core/smtp/MCSMTPProgressCallback.h @@ -4,12 +4,13 @@ #ifdef __cplusplus +#include + namespace mailcore { class SMTPSession; - MAILCORE_EXPORT - class SMTPProgressCallback { + class MAILCORE_EXPORT SMTPProgressCallback { public: virtual void bodyProgress(SMTPSession * session, unsigned int current, unsigned int maximum) {}; }; diff --git a/src/core/smtp/MCSMTPSession.h b/src/core/smtp/MCSMTPSession.h index 0db1acc8..05571bfb 100644 --- a/src/core/smtp/MCSMTPSession.h +++ b/src/core/smtp/MCSMTPSession.h @@ -13,8 +13,7 @@ namespace mailcore { class SMTPProgressCallback; class MessageBuilder; - MAILCORE_EXPORT - class SMTPSession : public Object { + class MAILCORE_EXPORT SMTPSession : public Object { public: SMTPSession(); virtual ~SMTPSession(); -- cgit v1.2.3 From da10b9124b52e34ac49edd1120bc04926e0a44e6 Mon Sep 17 00:00:00 2001 From: "Hoa V. DINH" Date: Sat, 3 Jan 2015 23:10:15 -0800 Subject: Refactoring, fixed #1013 --- build-android/jni/Android.mk | 9 +- build-mac/mailcore2.xcodeproj/project.pbxproj | 24 +++-- scripts/include.sh/build-dep.sh | 7 +- src/async/imap/MCAsyncIMAP.h | 1 + src/async/imap/MCIMAPAsyncSession.cpp | 4 +- src/async/imap/MCIMAPAsyncSession.h | 4 +- src/async/imap/MCIMAPFolderInfo.cpp | 106 +++++++++++++++++++++ src/async/imap/MCIMAPFolderInfo.h | 63 ++++++++++++ src/async/imap/MCIMAPFolderInfoOperation.cpp | 54 +++-------- src/async/imap/MCIMAPFolderInfoOperation.h | 24 ++--- src/cmake/async.cmake | 1 + src/cmake/objc.cmake | 2 +- src/core/basetypes/MCIndexSet.h | 4 +- src/core/basetypes/MCMainThreadAndroid.cpp | 6 +- .../basetypes/com_libmailcore_MainThreadUtils.h | 37 ------- src/core/renderer/MCHTMLRendererCallback.cpp | 8 ++ src/core/renderer/MCHTMLRendererCallback.h | 7 +- src/core/rfc822/MCMessageParser.cpp | 15 ++- src/core/rfc822/MCMessageParser.h | 1 + src/objc/imap/MCOIMAPFolderInfo.h | 5 +- src/objc/imap/MCOIMAPFolderInfo.m | 32 ------- src/objc/imap/MCOIMAPFolderInfo.mm | 72 ++++++++++++++ src/objc/imap/MCOIMAPFolderInfoOperation.mm | 14 +-- src/objc/imap/MCOIMAPSession.mm | 8 +- 24 files changed, 342 insertions(+), 166 deletions(-) create mode 100644 src/async/imap/MCIMAPFolderInfo.cpp create mode 100644 src/async/imap/MCIMAPFolderInfo.h delete mode 100644 src/core/basetypes/com_libmailcore_MainThreadUtils.h delete mode 100644 src/objc/imap/MCOIMAPFolderInfo.m create mode 100644 src/objc/imap/MCOIMAPFolderInfo.mm (limited to 'src/core/rfc822/MCMessageParser.h') diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk index d3eddf13..3f1087f8 100644 --- a/build-android/jni/Android.mk +++ b/build-android/jni/Android.mk @@ -14,7 +14,9 @@ subdirs = \ core/security \ core/smtp \ core/zip \ - core/zip/MiniZip + core/zip/MiniZip \ + async/imap \ + java java/native includes = \ $(CURRENT_DIR)/../include \ $(CTEMPLATE_PATH)/include \ @@ -49,6 +51,7 @@ async_imap_src_files := $(wildcard $(src_dir)/async/imap/*.cpp) async_nntp_src_files := $(wildcard $(src_dir)/async/nntp/*.cpp) async_pop_src_files := $(wildcard $(src_dir)/async/pop/*.cpp) async_smtp_src_files := $(wildcard $(src_dir)/async/smtp/*.cpp) +jni_src_files := $(wildcard $(src_dir)/java/native/*.cpp) $(wildcard $(src_dir)/java/*.cpp) # include $(CLEAR_VARS) # LOCAL_MODULE := MailCore @@ -109,7 +112,9 @@ include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := MailCore LOCAL_C_INCLUDES := $(includes) -LOCAL_SRC_FILES := $(core_src_files) $(abstract_src_files) $(imap_src_files) $(nntp_src_files) \ +LOCAL_SRC_FILES := \ + $(jni_src_files) \ + $(core_src_files) $(abstract_src_files) $(imap_src_files) $(nntp_src_files) \ $(pop_src_files) $(provider_src_files) $(renderer_src_files) $(rfc822_src_files) \ $(security_src_files) $(smtp_src_files) $(zip_src_files) $(minizip_src_files) \ $(async_imap_src_files) $(async_nntp_src_files) $(async_pop_src_files) $(async_smtp_src_files) diff --git a/build-mac/mailcore2.xcodeproj/project.pbxproj b/build-mac/mailcore2.xcodeproj/project.pbxproj index b380a8bc..eb47b08d 100755 --- a/build-mac/mailcore2.xcodeproj/project.pbxproj +++ b/build-mac/mailcore2.xcodeproj/project.pbxproj @@ -394,6 +394,10 @@ C668E2CC1735CB8900A2BB47 /* MCAutoreleasePoolMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C668E2CA1735CB8900A2BB47 /* MCAutoreleasePoolMac.mm */; }; C668E2CD1735CB8900A2BB47 /* MCAutoreleasePoolMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C668E2CA1735CB8900A2BB47 /* MCAutoreleasePoolMac.mm */; }; C668E2DD1736333900A2BB47 /* providers.json in Resources */ = {isa = PBXBuildFile; fileRef = 84AF9E7D172DBAF600E60AA3 /* providers.json */; }; + C673EBED1A46B41000A53F7F /* MCIMAPFolderInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C673EBEB1A46B41000A53F7F /* MCIMAPFolderInfo.cpp */; }; + C673EBEE1A46B41000A53F7F /* MCIMAPFolderInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C673EBEB1A46B41000A53F7F /* MCIMAPFolderInfo.cpp */; }; + C673EBEF1A46B44E00A53F7F /* MCIMAPFolderInfo.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = C673EBEC1A46B41000A53F7F /* MCIMAPFolderInfo.h */; }; + C673EBF01A46B45300A53F7F /* MCIMAPFolderInfo.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = C673EBEC1A46B41000A53F7F /* MCIMAPFolderInfo.h */; }; C67597C217A8D65000DA69DF /* MCBase64.c in Sources */ = {isa = PBXBuildFile; fileRef = C67597C117A8D65000DA69DF /* MCBase64.c */; }; C67597C317A8D65000DA69DF /* MCBase64.c in Sources */ = {isa = PBXBuildFile; fileRef = C67597C117A8D65000DA69DF /* MCBase64.c */; }; C68B2AEE1778A865005E61EF /* MCConnectionLogger.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = C68B2AEB1778A589005E61EF /* MCConnectionLogger.h */; }; @@ -722,7 +726,7 @@ C6BA2C101705F4E6003F0E9E /* MCOIMAPIdentityOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6F61F9217016B250073032E /* MCOIMAPIdentityOperation.mm */; }; C6BA2C111705F4E6003F0E9E /* MCOIMAPCapabilityOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6F61F9517016B310073032E /* MCOIMAPCapabilityOperation.mm */; }; C6BA2C121705F4E6003F0E9E /* MCOIMAPSearchExpression.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6F61F9817016B460073032E /* MCOIMAPSearchExpression.mm */; }; - C6BA2C131705F4E6003F0E9E /* MCOIMAPFolderInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = C6F61F9E17016EA00073032E /* MCOIMAPFolderInfo.m */; }; + C6BA2C131705F4E6003F0E9E /* MCOIMAPFolderInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6F61F9E17016EA00073032E /* MCOIMAPFolderInfo.mm */; }; C6BA2C141705F4E6003F0E9E /* MCOIMAPBaseOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6F61FB41702AB2F0073032E /* MCOIMAPBaseOperation.mm */; }; C6BD288F170BD71100A91AC1 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C6BD288E170BD71100A91AC1 /* Cocoa.framework */; }; C6BD28A3170BD84F00A91AC1 /* libMailCore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C64EA537169E772200778456 /* libMailCore.a */; }; @@ -844,7 +848,7 @@ C6F61F9317016B250073032E /* MCOIMAPIdentityOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6F61F9217016B250073032E /* MCOIMAPIdentityOperation.mm */; }; C6F61F9617016B310073032E /* MCOIMAPCapabilityOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6F61F9517016B310073032E /* MCOIMAPCapabilityOperation.mm */; }; C6F61F9917016B460073032E /* MCOIMAPSearchExpression.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6F61F9817016B460073032E /* MCOIMAPSearchExpression.mm */; }; - C6F61F9F17016EA10073032E /* MCOIMAPFolderInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = C6F61F9E17016EA00073032E /* MCOIMAPFolderInfo.m */; }; + C6F61F9F17016EA10073032E /* MCOIMAPFolderInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6F61F9E17016EA00073032E /* MCOIMAPFolderInfo.mm */; }; C6F61FA0170187B80073032E /* MCOIMAPFolderInfoOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6F61F79170169EE0073032E /* MCOIMAPFolderInfoOperation.h */; }; C6F61FA1170187BA0073032E /* MCOIMAPFolderInfo.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6F61F9D17016EA00073032E /* MCOIMAPFolderInfo.h */; }; C6F61FA2170187BC0073032E /* MCOIMAPAppendMessageOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6F61F7C170169FB0073032E /* MCOIMAPAppendMessageOperation.h */; }; @@ -942,6 +946,7 @@ dstPath = include/MailCore; dstSubfolderSpec = 16; files = ( + C673EBF01A46B45300A53F7F /* MCIMAPFolderInfo.h in CopyFiles */, C6181D3319FE0F8D0088FBBC /* MCIMAPFetchParsedContentOperation.h in CopyFiles */, C6181D3219FE0F8A0088FBBC /* MCOIMAPFetchParsedContentOperation.h in CopyFiles */, C6D4FD3819FA9F57001F7E01 /* MCONNTPFetchServerTimeOperation.h in CopyFiles */, @@ -1170,6 +1175,7 @@ dstPath = include/MailCore; dstSubfolderSpec = 16; files = ( + C673EBEF1A46B44E00A53F7F /* MCIMAPFolderInfo.h in CopyFiles */, 8199FBF719FAF3AF0040BBC3 /* MCOIMAPFetchParsedContentOperation.h in CopyFiles */, 8199FBF819FAF3AF0040BBC3 /* MCIMAPFetchParsedContentOperation.h in CopyFiles */, C6D4FD3619FA9F4F001F7E01 /* MCNNTPFetchServerTimeOperation.h in CopyFiles */, @@ -1732,6 +1738,8 @@ C64FF39016B3C13000F8C162 /* MCOObjectWrapper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MCOObjectWrapper.mm; sourceTree = ""; }; C668E2C51735C8D500A2BB47 /* MCObjectMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MCObjectMac.mm; sourceTree = ""; }; C668E2CA1735CB8900A2BB47 /* MCAutoreleasePoolMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MCAutoreleasePoolMac.mm; sourceTree = ""; }; + C673EBEB1A46B41000A53F7F /* MCIMAPFolderInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCIMAPFolderInfo.cpp; sourceTree = ""; }; + C673EBEC1A46B41000A53F7F /* MCIMAPFolderInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCIMAPFolderInfo.h; sourceTree = ""; }; C67597C117A8D65000DA69DF /* MCBase64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = MCBase64.c; sourceTree = ""; }; C67597C417A8D66000DA69DF /* MCBase64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCBase64.h; sourceTree = ""; }; C68B2AEB1778A589005E61EF /* MCConnectionLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCConnectionLogger.h; sourceTree = ""; }; @@ -1881,7 +1889,7 @@ C6F61F9717016B460073032E /* MCOIMAPSearchExpression.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCOIMAPSearchExpression.h; sourceTree = ""; }; C6F61F9817016B460073032E /* MCOIMAPSearchExpression.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MCOIMAPSearchExpression.mm; sourceTree = ""; }; C6F61F9D17016EA00073032E /* MCOIMAPFolderInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCOIMAPFolderInfo.h; sourceTree = ""; }; - C6F61F9E17016EA00073032E /* MCOIMAPFolderInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MCOIMAPFolderInfo.m; sourceTree = ""; }; + C6F61F9E17016EA00073032E /* MCOIMAPFolderInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MCOIMAPFolderInfo.mm; sourceTree = ""; }; C6F61FB31702AB2A0073032E /* MCOIMAPBaseOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCOIMAPBaseOperation.h; sourceTree = ""; }; C6F61FB41702AB2F0073032E /* MCOIMAPBaseOperation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MCOIMAPBaseOperation.mm; sourceTree = ""; }; C6F7B19D17A1C15200BE78BB /* MCCertificateUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCCertificateUtils.cpp; sourceTree = ""; }; @@ -2251,6 +2259,8 @@ C62C6ED316A2A0E600737497 /* MCIMAPIdentityOperation.h */, C62C6ED616A398FA00737497 /* MCIMAPFolderInfoOperation.cpp */, C62C6ED716A398FA00737497 /* MCIMAPFolderInfoOperation.h */, + C673EBEB1A46B41000A53F7F /* MCIMAPFolderInfo.cpp */, + C673EBEC1A46B41000A53F7F /* MCIMAPFolderInfo.h */, C64BB22916E5C0A3000DB34C /* MCIMAPCapabilityOperation.cpp */, C64BB22A16E5C0A3000DB34C /* MCIMAPCapabilityOperation.h */, 4B3C1BDF17ABF4BB008BBF4C /* MCIMAPQuotaOperation.cpp */, @@ -2739,7 +2749,7 @@ C6F5B9EF16FEA3D700D9DABD /* MCOIMAPPart.h */, C6F5B9F016FEA3D700D9DABD /* MCOIMAPPart.mm */, C6F61F9D17016EA00073032E /* MCOIMAPFolderInfo.h */, - C6F61F9E17016EA00073032E /* MCOIMAPFolderInfo.m */, + C6F61F9E17016EA00073032E /* MCOIMAPFolderInfo.mm */, F87F190816BB62690012652F /* MCOIMAPFetchFoldersOperation.h */, F87F190B16BB62B00012652F /* MCOIMAPFetchFoldersOperation.mm */, C623C58D16FE6B45001BBEFC /* MCOIMAPOperation.h */, @@ -3287,11 +3297,12 @@ C6F61F9617016B310073032E /* MCOIMAPCapabilityOperation.mm in Sources */, C6E665BB1796500C0063F2CF /* unzip.c in Sources */, C6F61F9917016B460073032E /* MCOIMAPSearchExpression.mm in Sources */, - C6F61F9F17016EA10073032E /* MCOIMAPFolderInfo.m in Sources */, + C6F61F9F17016EA10073032E /* MCOIMAPFolderInfo.mm in Sources */, C6D4FD3F19FB7534001F7E01 /* MCMessageParserMac.mm in Sources */, C6F61FB51702AB340073032E /* MCOIMAPBaseOperation.mm in Sources */, C608167517759967001F1018 /* MCSMTPDisconnectOperation.cpp in Sources */, C6A81BBF17068E5E00882C15 /* MCOSMTPSession.mm in Sources */, + C673EBED1A46B41000A53F7F /* MCIMAPFolderInfo.cpp in Sources */, 8B0095CC1A00DDE700F84BC0 /* MCOSMTPLoginOperation.mm in Sources */, C6A81BC317068E9500882C15 /* MCOSMTPSendOperation.mm in Sources */, C6A81BC717068EB000882C15 /* MCOSMTPOperation.mm in Sources */, @@ -3533,9 +3544,10 @@ C6E665BC1796500C0063F2CF /* unzip.c in Sources */, C6BA2C121705F4E6003F0E9E /* MCOIMAPSearchExpression.mm in Sources */, C6D4FD4019FB7786001F7E01 /* MCMessageParserMac.mm in Sources */, - C6BA2C131705F4E6003F0E9E /* MCOIMAPFolderInfo.m in Sources */, + C6BA2C131705F4E6003F0E9E /* MCOIMAPFolderInfo.mm in Sources */, C6BA2C141705F4E6003F0E9E /* MCOIMAPBaseOperation.mm in Sources */, C608167617759968001F1018 /* MCSMTPDisconnectOperation.cpp in Sources */, + C673EBEE1A46B41000A53F7F /* MCIMAPFolderInfo.cpp in Sources */, C6A81BC017068E5E00882C15 /* MCOSMTPSession.mm in Sources */, 8B0095CE1A00DE7700F84BC0 /* MCOSMTPLoginOperation.mm in Sources */, C6A81BC417068E9500882C15 /* MCOSMTPSendOperation.mm in Sources */, diff --git a/scripts/include.sh/build-dep.sh b/scripts/include.sh/build-dep.sh index c167c548..ad66be7e 100755 --- a/scripts/include.sh/build-dep.sh +++ b/scripts/include.sh/build-dep.sh @@ -331,7 +331,12 @@ get_prebuilt_dep() curl -O "$url/$name/$name-$version.zip" unzip -q "$name-$version.zip" rm -rf "$scriptpath/../Externals/$name" - mv "$name-$version"/* "$scriptpath/../Externals" + cd "$name-$version" + for folder in * ; do + rm -rf "$scriptpath/../Externals/$folder" + mv "$folder" "$scriptpath/../Externals" + done + cd .. rm -f "$scriptpath/../Externals/git-rev" rm -rf "$tempbuilddir" diff --git a/src/async/imap/MCAsyncIMAP.h b/src/async/imap/MCAsyncIMAP.h index 15c9e482..8a490aa8 100755 --- a/src/async/imap/MCAsyncIMAP.h +++ b/src/async/imap/MCAsyncIMAP.h @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include diff --git a/src/async/imap/MCIMAPAsyncSession.cpp b/src/async/imap/MCIMAPAsyncSession.cpp index f3a55a5e..d9fb38d5 100755 --- a/src/async/imap/MCIMAPAsyncSession.cpp +++ b/src/async/imap/MCIMAPAsyncSession.cpp @@ -485,8 +485,8 @@ IMAPFetchMessagesOperation * IMAPAsyncSession::fetchMessagesByNumberOperation(St return op; } -IMAPFetchMessagesOperation * IMAPAsyncSession::syncMessagesByUID(String * folder, IMAPMessagesRequestKind requestKind, - IndexSet * uids, uint64_t modSeq) +IMAPFetchMessagesOperation * IMAPAsyncSession::syncMessagesByUIDOperation(String * folder, IMAPMessagesRequestKind requestKind, + IndexSet * uids, uint64_t modSeq) { IMAPFetchMessagesOperation * op = new IMAPFetchMessagesOperation(); op->setMainSession(this); diff --git a/src/async/imap/MCIMAPAsyncSession.h b/src/async/imap/MCIMAPAsyncSession.h index 4a61393f..64258674 100755 --- a/src/async/imap/MCIMAPAsyncSession.h +++ b/src/async/imap/MCIMAPAsyncSession.h @@ -127,8 +127,8 @@ namespace mailcore { IndexSet * indexes); virtual IMAPFetchMessagesOperation * fetchMessagesByNumberOperation(String * folder, IMAPMessagesRequestKind requestKind, IndexSet * indexes); - virtual IMAPFetchMessagesOperation * syncMessagesByUID(String * folder, IMAPMessagesRequestKind requestKind, - IndexSet * indexes, uint64_t modSeq); + virtual IMAPFetchMessagesOperation * syncMessagesByUIDOperation(String * folder, IMAPMessagesRequestKind requestKind, + IndexSet * indexes, uint64_t modSeq); virtual IMAPFetchContentOperation * fetchMessageByUIDOperation(String * folder, uint32_t uid, bool urgent = false); virtual IMAPFetchContentOperation * fetchMessageAttachmentByUIDOperation(String * folder, uint32_t uid, String * partID, diff --git a/src/async/imap/MCIMAPFolderInfo.cpp b/src/async/imap/MCIMAPFolderInfo.cpp new file mode 100644 index 00000000..2f790ca4 --- /dev/null +++ b/src/async/imap/MCIMAPFolderInfo.cpp @@ -0,0 +1,106 @@ +// +// MCIMAPFolderInfo.cpp +// mailcore2 +// +// Created by DINH Viêt Hoà on 12/6/14. +// Copyright (c) 2014 MailCore. All rights reserved. +// + +#include "MCIMAPFolderInfo.h" + +using namespace mailcore; + +void IMAPFolderInfo::init() +{ + mUidNext = 0; + mUidValidity = 0; + mMessageCount = 0; + mModSequenceValue = 0; + mFirstUnseenUid = 0; + mAllowsNewPermanentFlags = false; +} + +IMAPFolderInfo::IMAPFolderInfo() +{ + init(); +} + +IMAPFolderInfo::IMAPFolderInfo(IMAPFolderInfo * other) +{ + init(); + setUidNext(other->uidNext()); + setUidValidity(other->uidValidity()); + setModSequenceValue(other->modSequenceValue()); + setMessageCount(other->messageCount()); + setFirstUnseenUid(other->firstUnseenUid()); + setAllowsNewPermanentFlags(other->allowsNewPermanentFlags()); +} + +IMAPFolderInfo::~IMAPFolderInfo() +{ +} + +Object * IMAPFolderInfo::copy() +{ + return new IMAPFolderInfo(this); +} + +void IMAPFolderInfo::setUidNext(uint32_t uidNext) +{ + mUidNext = uidNext; +} + +uint32_t IMAPFolderInfo::uidNext() +{ + return mUidNext; +} + +void IMAPFolderInfo::setUidValidity(uint32_t uidValidity) +{ + mUidValidity = uidValidity; +} + +uint32_t IMAPFolderInfo::uidValidity() +{ + return mUidValidity; +} + +void IMAPFolderInfo::setModSequenceValue(uint64_t modSequenceValue) +{ + mModSequenceValue = modSequenceValue; +} + +uint64_t IMAPFolderInfo::modSequenceValue() +{ + return mModSequenceValue; +} + +void IMAPFolderInfo::setMessageCount(int messageCount) +{ + mMessageCount = messageCount; +} + +int IMAPFolderInfo::messageCount() +{ + return mMessageCount; +} + +void IMAPFolderInfo::setFirstUnseenUid(uint32_t firstUnseenUid) +{ + mFirstUnseenUid = firstUnseenUid; +} + +uint32_t IMAPFolderInfo::firstUnseenUid() +{ + return mFirstUnseenUid; +} + +void IMAPFolderInfo::setAllowsNewPermanentFlags(bool allowsNewPermanentFlags) +{ + mAllowsNewPermanentFlags = allowsNewPermanentFlags; +} + +bool IMAPFolderInfo::allowsNewPermanentFlags() +{ + return mAllowsNewPermanentFlags; +} diff --git a/src/async/imap/MCIMAPFolderInfo.h b/src/async/imap/MCIMAPFolderInfo.h new file mode 100644 index 00000000..c0fa7c35 --- /dev/null +++ b/src/async/imap/MCIMAPFolderInfo.h @@ -0,0 +1,63 @@ +// +// MCIMAPFolderInfo.h +// mailcore2 +// +// Created by DINH Viêt Hoà on 12/6/14. +// Copyright (c) 2014 MailCore. All rights reserved. +// + +#ifndef MAILCORE_MCIMAPFolderInfo_H + +#define MAILCORE_MCIMAPFolderInfo_H + +#include +#include + +#ifdef __cplusplus + +namespace mailcore { + + class MAILCORE_EXPORT IMAPFolderInfo : public Object { + public: + IMAPFolderInfo(); + virtual ~IMAPFolderInfo(); + + virtual void setUidNext(uint32_t uidNext); + virtual uint32_t uidNext(); + + virtual void setUidValidity(uint32_t uidValidity); + virtual uint32_t uidValidity(); + + virtual void setModSequenceValue(uint64_t modSequenceValue); + virtual uint64_t modSequenceValue(); + + virtual void setMessageCount(int messageCount); + virtual int messageCount(); + + virtual void setFirstUnseenUid(uint32_t firstUnseenUid); + virtual uint32_t firstUnseenUid(); + + virtual void setAllowsNewPermanentFlags(bool allowsNewPermanentFlags); + virtual bool allowsNewPermanentFlags(); + + public: // subclass behavior + IMAPFolderInfo(IMAPFolderInfo * other); + virtual Object * copy(); + + private: + uint32_t mUidNext; + uint32_t mUidValidity; + uint64_t mModSequenceValue; + int mMessageCount; + uint32_t mFirstUnseenUid; + bool mAllowsNewPermanentFlags; + + void init(); + }; + +} + +#endif + +#endif + diff --git a/src/async/imap/MCIMAPFolderInfoOperation.cpp b/src/async/imap/MCIMAPFolderInfoOperation.cpp index 0ea0d005..fc4e4462 100644 --- a/src/async/imap/MCIMAPFolderInfoOperation.cpp +++ b/src/async/imap/MCIMAPFolderInfoOperation.cpp @@ -10,51 +10,23 @@ #include "MCIMAPSession.h" #include "MCIMAPAsyncConnection.h" +#include "MCIMAPFolderInfo.h" using namespace mailcore; IMAPFolderInfoOperation::IMAPFolderInfoOperation() { - mUidNext = 0; - mUidValidity = 0; - mMessageCount = 0; - mModSequenceValue = 0; - mFirstUnseenUid = 0; - mAllowsNewPermanentFlags = false; + mInfo = NULL; } IMAPFolderInfoOperation::~IMAPFolderInfoOperation() { + MC_SAFE_RELEASE(mInfo); } -uint32_t IMAPFolderInfoOperation::uidNext() +IMAPFolderInfo * IMAPFolderInfoOperation::info() { - return mUidNext; -} - -uint32_t IMAPFolderInfoOperation::uidValidity() -{ - return mUidValidity; -} - -uint64_t IMAPFolderInfoOperation::modSequenceValue() -{ - return mModSequenceValue; -} - -int IMAPFolderInfoOperation::messageCount() -{ - return mMessageCount; -} - -uint32_t IMAPFolderInfoOperation::firstUnseenUid() -{ - return mFirstUnseenUid; -} - -bool IMAPFolderInfoOperation::allowsNewPermanentFlags() -{ - return mAllowsNewPermanentFlags; + return mInfo; } void IMAPFolderInfoOperation::main() @@ -73,14 +45,14 @@ void IMAPFolderInfoOperation::main() return; } - - mUidNext = session()->session()->uidNext(); - mUidValidity = session()->session()->uidValidity(); - mModSequenceValue = session()->session()->modSequenceValue(); - mMessageCount = session()->session()->lastFolderMessageCount(); - mFirstUnseenUid = session()->session()->firstUnseenUid(); - mAllowsNewPermanentFlags = session()->session()->allowsNewPermanentFlags(); - + mInfo = new IMAPFolderInfo(); + mInfo->setUidNext(session()->session()->uidNext()); + mInfo->setUidValidity(session()->session()->uidValidity()); + mInfo->setModSequenceValue(session()->session()->modSequenceValue()); + mInfo->setMessageCount(session()->session()->lastFolderMessageCount()); + mInfo->setFirstUnseenUid(session()->session()->firstUnseenUid()); + mInfo->setAllowsNewPermanentFlags(session()->session()->allowsNewPermanentFlags()); + setError(error); } diff --git a/src/async/imap/MCIMAPFolderInfoOperation.h b/src/async/imap/MCIMAPFolderInfoOperation.h index b29f40a2..e0b5128c 100644 --- a/src/async/imap/MCIMAPFolderInfoOperation.h +++ b/src/async/imap/MCIMAPFolderInfoOperation.h @@ -15,31 +15,23 @@ #ifdef __cplusplus namespace mailcore { + + class IMAPFolderInfo; class MAILCORE_EXPORT IMAPFolderInfoOperation : public IMAPOperation { public: IMAPFolderInfoOperation(); virtual ~IMAPFolderInfoOperation(); - - virtual uint32_t uidNext(); - virtual uint32_t uidValidity(); - virtual uint64_t modSequenceValue(); - virtual int messageCount(); - virtual uint32_t firstUnseenUid(); - virtual bool allowsNewPermanentFlags(); - + + IMAPFolderInfo * info(); + public: // subclass behavior virtual void main(); private: - - uint32_t mUidNext; - uint32_t mUidValidity; - uint64_t mModSequenceValue; - int mMessageCount; - uint32_t mFirstUnseenUid; - bool mAllowsNewPermanentFlags; - + + IMAPFolderInfo * mInfo; + }; } diff --git a/src/cmake/async.cmake b/src/cmake/async.cmake index 2f6910f2..c1eb3faf 100644 --- a/src/cmake/async.cmake +++ b/src/cmake/async.cmake @@ -17,6 +17,7 @@ set(async_imap_files async/imap/MCIMAPFetchFoldersOperation.cpp async/imap/MCIMAPFetchMessagesOperation.cpp async/imap/MCIMAPFetchNamespaceOperation.cpp + async/imap/MCIMAPFolderInfo.cpp async/imap/MCIMAPFolderInfoOperation.cpp async/imap/MCIMAPFolderStatusOperation.cpp async/imap/MCIMAPIdentityOperation.cpp diff --git a/src/cmake/objc.cmake b/src/cmake/objc.cmake index 0de041e7..f67d76e4 100644 --- a/src/cmake/objc.cmake +++ b/src/cmake/objc.cmake @@ -21,7 +21,7 @@ set(objc_imap_files objc/imap/MCOIMAPFetchMessagesOperation.mm objc/imap/MCOIMAPFetchNamespaceOperation.mm objc/imap/MCOIMAPFolder.mm - objc/imap/MCOIMAPFolderInfo.m + objc/imap/MCOIMAPFolderInfo.mm objc/imap/MCOIMAPFolderInfoOperation.mm objc/imap/MCOIMAPFolderStatus.mm objc/imap/MCOIMAPFolderStatusOperation.mm diff --git a/src/core/basetypes/MCIndexSet.h b/src/core/basetypes/MCIndexSet.h index e76517db..2e2f4892 100644 --- a/src/core/basetypes/MCIndexSet.h +++ b/src/core/basetypes/MCIndexSet.h @@ -21,7 +21,7 @@ namespace mailcore { class MAILCORE_EXPORT IndexSet : public Object { public: IndexSet(); - IndexSet(IndexSet * o); + virtual ~IndexSet(); static IndexSet * indexSet(); static IndexSet * indexSetWithRange(Range range); @@ -45,7 +45,7 @@ namespace mailcore { virtual void removeAllIndexes(); public: // subclass behavior - virtual ~IndexSet(); + IndexSet(IndexSet * o); virtual String * description(); virtual Object * copy(); virtual HashMap * serializable(); diff --git a/src/core/basetypes/MCMainThreadAndroid.cpp b/src/core/basetypes/MCMainThreadAndroid.cpp index 36792cb1..cc41bb88 100644 --- a/src/core/basetypes/MCMainThreadAndroid.cpp +++ b/src/core/basetypes/MCMainThreadAndroid.cpp @@ -18,6 +18,7 @@ #include "MCAssert.h" #include "MCLog.h" #include "MCAutoreleasePool.h" +#include "TypesUtils.h" using namespace mailcore; @@ -53,6 +54,7 @@ JNIEXPORT void JNICALL Java_com_libmailcore_MainThreadUtils_setupNative(JNIEnv * jclass localClass = env->FindClass("com/libmailcore/MainThreadUtils"); s_mainThreadUtilsClass = reinterpret_cast(env->NewGlobalRef(localClass)); MCAssert(s_mainThreadUtilsClass != NULL); + MCTypesUtilsInit(); pool->release(); } @@ -101,10 +103,10 @@ void mailcore::callOnMainThreadAndWait(void (* function)(void *), void * context jmethodID mid = env->GetMethodID(s_mainThreadUtilsClass, "runOnMainThreadAndWait", "(J)V"); MCAssert(mid != NULL); env->CallVoidMethod(s_mainThreadUtils, mid, (jlong) data); - + // Wait. mailsem_down(data->sem); - + mailsem_free(data->sem); free(data); } diff --git a/src/core/basetypes/com_libmailcore_MainThreadUtils.h b/src/core/basetypes/com_libmailcore_MainThreadUtils.h deleted file mode 100644 index 327d9910..00000000 --- a/src/core/basetypes/com_libmailcore_MainThreadUtils.h +++ /dev/null @@ -1,37 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class com_libmailcore_MainThreadUtils */ - -#ifndef _Included_com_libmailcore_MainThreadUtils -#define _Included_com_libmailcore_MainThreadUtils -#ifdef __cplusplus -extern "C" { -#endif -/* - * Class: com_libmailcore_MainThreadUtils - * Method: setupNative - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_com_libmailcore_MainThreadUtils_setupNative - (JNIEnv *, jobject); - -/* - * Class: com_libmailcore_MainThreadUtils - * Method: runIdentifier - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_com_libmailcore_MainThreadUtils_runIdentifier - (JNIEnv *, jobject, jlong); - -/* - * Class: com_libmailcore_MainThreadUtils - * Method: runIdentifierAndNotify - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_com_libmailcore_MainThreadUtils_runIdentifierAndNotify - (JNIEnv *, jobject, jlong); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/src/core/renderer/MCHTMLRendererCallback.cpp b/src/core/renderer/MCHTMLRendererCallback.cpp index edaf7e92..fb492c9e 100644 --- a/src/core/renderer/MCHTMLRendererCallback.cpp +++ b/src/core/renderer/MCHTMLRendererCallback.cpp @@ -15,6 +15,14 @@ using namespace mailcore; +HTMLRendererTemplateCallback::HTMLRendererTemplateCallback() +{ +} + +HTMLRendererTemplateCallback::~HTMLRendererTemplateCallback() +{ +} + mailcore::HashMap * HTMLRendererTemplateCallback::templateValuesForHeader(mailcore::MessageHeader * header) { mailcore::HashMap * result = mailcore::HashMap::hashMap(); diff --git a/src/core/renderer/MCHTMLRendererCallback.h b/src/core/renderer/MCHTMLRendererCallback.h index 7c20f18a..a12a3e45 100644 --- a/src/core/renderer/MCHTMLRendererCallback.h +++ b/src/core/renderer/MCHTMLRendererCallback.h @@ -24,14 +24,17 @@ namespace mailcore { public: HTMLRendererIMAPCallback() {} virtual ~HTMLRendererIMAPCallback() {} - + virtual Data * dataForIMAPPart(String * folder, IMAPPart * part) { return NULL; } virtual void prefetchAttachmentIMAPPart(String * folder, IMAPPart * part) {} virtual void prefetchImageIMAPPart(String * folder, IMAPPart * part) {} }; - + class MAILCORE_EXPORT HTMLRendererTemplateCallback { public: + HTMLRendererTemplateCallback(); + virtual ~HTMLRendererTemplateCallback(); + virtual bool canPreviewPart(AbstractPart * part); virtual bool shouldShowPart(AbstractPart * part); diff --git a/src/core/rfc822/MCMessageParser.cpp b/src/core/rfc822/MCMessageParser.cpp index 404bc862..71071c02 100644 --- a/src/core/rfc822/MCMessageParser.cpp +++ b/src/core/rfc822/MCMessageParser.cpp @@ -72,6 +72,11 @@ void MessageParser::setBytes(char * dataBytes, unsigned int dataLength) mailmessage_free(msg); } +MessageParser::MessageParser() +{ + init(); +} + MessageParser::MessageParser(Data * data) { init(); @@ -118,7 +123,9 @@ String * MessageParser::description() String * result = String::string(); result->appendUTF8Format("<%s:%p ", MCUTF8(className()), this); result->appendUTF8Format("<%p>", mMainPart); - result->appendString(mMainPart->description()); + if (mMainPart != NULL) { + result->appendString(mMainPart->description()); + } result->appendUTF8Characters(">"); return result; @@ -140,11 +147,17 @@ Object * MessageParser::copy() AbstractPart * MessageParser::partForContentID(String * contentID) { + if (mainPart() == NULL) { + return NULL; + } return mainPart()->partForContentID(contentID); } AbstractPart * MessageParser::partForUniqueID(String * uniqueID) { + if (mainPart() == NULL) { + return NULL; + } return mainPart()->partForUniqueID(uniqueID); } diff --git a/src/core/rfc822/MCMessageParser.h b/src/core/rfc822/MCMessageParser.h index 8d2fe4a6..048cee60 100644 --- a/src/core/rfc822/MCMessageParser.h +++ b/src/core/rfc822/MCMessageParser.h @@ -20,6 +20,7 @@ namespace mailcore { static MessageParser * messageParserWithData(Data * data); static MessageParser * messageParserWithContentsOfFile(String * filename); + MessageParser(); MessageParser(Data * data); virtual ~MessageParser(); diff --git a/src/objc/imap/MCOIMAPFolderInfo.h b/src/objc/imap/MCOIMAPFolderInfo.h index 53ad35b8..1397e841 100644 --- a/src/objc/imap/MCOIMAPFolderInfo.h +++ b/src/objc/imap/MCOIMAPFolderInfo.h @@ -14,10 +14,7 @@ /* This class holds IMAP folder metadata */ -@interface MCOIMAPFolderInfo : NSObject - -/** Create an empty instance */ -+ (MCOIMAPFolderInfo *) info; +@interface MCOIMAPFolderInfo : NSObject /** The folder's IMAP UIDNEXT value. Used to determine the uid for the next received message. */ @property (nonatomic, assign) uint32_t uidNext; diff --git a/src/objc/imap/MCOIMAPFolderInfo.m b/src/objc/imap/MCOIMAPFolderInfo.m deleted file mode 100644 index be1d2c3e..00000000 --- a/src/objc/imap/MCOIMAPFolderInfo.m +++ /dev/null @@ -1,32 +0,0 @@ -// -// MCOIMAPFolderInfo.m -// mailcore2 -// -// Created by DINH Viêt Hoà on 3/25/13. -// Copyright (c) 2013 MailCore. All rights reserved. -// - -#import "MCOIMAPFolderInfo.h" - -@implementation MCOIMAPFolderInfo { - uint32_t _uidNext; - uint32_t _uidValidity; - uint64_t _modSequenceValue; - int _messageCount; - uint32_t _firstUnseenUid; - BOOL _allowsNewPermanentFlags; -} - -@synthesize uidNext = _uidNext; -@synthesize uidValidity = _uidValidity; -@synthesize modSequenceValue = _modSequenceValue; -@synthesize messageCount = _messageCount; -@synthesize firstUnseenUid = _firstUnseenUid; -@synthesize allowsNewPermanentFlags = _allowsNewPermanentFlags; - -+ (MCOIMAPFolderInfo *) info -{ - return [[[MCOIMAPFolderInfo alloc] init] autorelease]; -} - -@end diff --git a/src/objc/imap/MCOIMAPFolderInfo.mm b/src/objc/imap/MCOIMAPFolderInfo.mm new file mode 100644 index 00000000..50c7f995 --- /dev/null +++ b/src/objc/imap/MCOIMAPFolderInfo.mm @@ -0,0 +1,72 @@ +// +// MCOIMAPFolderInfo.m +// mailcore2 +// +// Created by DINH Viêt Hoà on 3/25/13. +// Copyright (c) 2013 MailCore. All rights reserved. +// + +#import "MCOIMAPFolderInfo.h" +#import "NSObject+MCO.h" + +#include "MCIMAPFolderInfo.h" + +#define nativeType mailcore::IMAPFolderInfo + +@implementation MCOIMAPFolderInfo { + mailcore::IMAPFolderInfo * _nativeInfo; +} + ++ (void) load +{ + MCORegisterClass(self, &typeid(nativeType)); +} + +- (id) initWithMCFolderInfo:(mailcore::IMAPFolderInfo *)info +{ + self = [super init]; + + info->retain(); + _nativeInfo = info; + + return self; +} + +- (void) dealloc +{ + MC_SAFE_RELEASE(_nativeInfo); + [super dealloc]; +} + ++ (NSObject *) mco_objectWithMCObject:(mailcore::Object *)object +{ + mailcore::IMAPFolderInfo * info = (mailcore::IMAPFolderInfo *) object; + return [[[self alloc] initWithMCFolderInfo:info] autorelease]; +} + +- (mailcore::Object *) mco_mcObject +{ + return _nativeInfo; +} + +- (id) copyWithZone:(NSZone *)zone +{ + nativeType * nativeObject = (nativeType *) [self mco_mcObject]->copy(); + id result = [[self class] mco_objectWithMCObject:nativeObject]; + MC_SAFE_RELEASE(nativeObject); + return [result retain]; +} + +- (NSString *) description +{ + return MCO_OBJC_BRIDGE_GET(description); +} + +MCO_OBJC_SYNTHESIZE_SCALAR(uint32_t, uint32_t, setUidNext, uidNext) +MCO_OBJC_SYNTHESIZE_SCALAR(uint32_t, uint32_t, setUidValidity, uidValidity) +MCO_OBJC_SYNTHESIZE_SCALAR(uint64_t, uint64_t, setModSequenceValue, modSequenceValue) +MCO_OBJC_SYNTHESIZE_SCALAR(int, int, setMessageCount, messageCount) +MCO_OBJC_SYNTHESIZE_SCALAR(uint32_t, uint32_t, setFirstUnseenUid, firstUnseenUid) +MCO_OBJC_SYNTHESIZE_SCALAR(BOOL, bool, setAllowsNewPermanentFlags, allowsNewPermanentFlags) + +@end diff --git a/src/objc/imap/MCOIMAPFolderInfoOperation.mm b/src/objc/imap/MCOIMAPFolderInfoOperation.mm index f4d322af..10c22462 100644 --- a/src/objc/imap/MCOIMAPFolderInfoOperation.mm +++ b/src/objc/imap/MCOIMAPFolderInfoOperation.mm @@ -56,20 +56,12 @@ typedef void (^CompletionType)(NSError *error, MCOIMAPFolderInfo *info); { if (_completionBlock == NULL) return; - + nativeType *op = MCO_NATIVE_INSTANCE; if (op->error() == mailcore::ErrorNone) { - MCOIMAPFolderInfo * info = [MCOIMAPFolderInfo info]; - [info setUidNext:MCO_NATIVE_INSTANCE->uidNext()]; - [info setUidValidity:MCO_NATIVE_INSTANCE->uidValidity()]; - [info setModSequenceValue:MCO_NATIVE_INSTANCE->modSequenceValue()]; - [info setMessageCount:MCO_NATIVE_INSTANCE->messageCount()]; - [info setFirstUnseenUid:MCO_NATIVE_INSTANCE->firstUnseenUid()]; - [info setAllowsNewPermanentFlags:MCO_NATIVE_INSTANCE->allowsNewPermanentFlags()]; - + MCOIMAPFolderInfo * info = MCO_TO_OBJC(op->info()); _completionBlock(nil, info); - } - else { + } else { _completionBlock([NSError mco_errorWithErrorCode:op->error()], nil); } [_completionBlock release]; diff --git a/src/objc/imap/MCOIMAPSession.mm b/src/objc/imap/MCOIMAPSession.mm index 325beda7..97673518 100755 --- a/src/objc/imap/MCOIMAPSession.mm +++ b/src/objc/imap/MCOIMAPSession.mm @@ -321,10 +321,10 @@ MCO_OBJC_SYNTHESIZE_SCALAR(dispatch_queue_t, dispatch_queue_t, setDispatchQueue, uids:(MCOIndexSet *)uids modSeq:(uint64_t)modSeq { - IMAPFetchMessagesOperation * coreOp = MCO_NATIVE_INSTANCE->syncMessagesByUID([folder mco_mcString], - (IMAPMessagesRequestKind) requestKind, - MCO_FROM_OBJC(IndexSet, uids), - modSeq); + IMAPFetchMessagesOperation * coreOp = MCO_NATIVE_INSTANCE->syncMessagesByUIDOperation([folder mco_mcString], + (IMAPMessagesRequestKind) requestKind, + MCO_FROM_OBJC(IndexSet, uids), + modSeq); return MCO_TO_OBJC_OP(coreOp); } -- cgit v1.2.3