diff options
Diffstat (limited to 'src/core')
63 files changed, 90 insertions, 120 deletions
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 <MailCore/MCUtils.h> + #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 <stdlib.h> +#include <MailCore/MCUtils.h> + #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 <MailCore/MCString.h> +#include <MailCore/MCUtils.h> 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 <MailCore/MCObject.h> #include <MailCore/MCICUTypes.h> +#include <MailCore/MCUtils.h> 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 <MailCore/MCUtils.h> + #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 <MailCore/MCUtils.h> + +#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 <inttypes.h> +#include <MailCore/MCUtils.h> + #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<class *>(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 <MailCore/MCUtils.h> + 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 <MailCore/MCUtils.h> + 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 <MailCore/MCUtils.h> + 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 <MailCore/MCHTMLRendererCallback.h> +#include <MailCore/MCUtils.h> #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 <MailCore/MCAbstract.h> #include <MailCore/MCIMAP.h> +#include <MailCore/MCUtils.h> #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 <MailCore/MCUtils.h> #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 <MailCore/MCUtils.h> + 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(); |