Fixed win32 exports

7 files changed, 11 insertions, 15 deletions

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);
     };