Merge remote-tracking branch 'upstream/master'

1 files changed, 17 insertions, 1 deletions

diff --git a/src/core/rfc822/MCMessageParser.h b/src/core/rfc822/MCMessageParser.h
index bf4687cb..048cee60 100644
--- a/src/core/rfc822/MCMessageParser.h
+++ b/src/core/rfc822/MCMessageParser.h
@@ -5,6 +5,9 @@
 #include <MailCore/MCBaseTypes.h>
 #include <MailCore/MCAbstractMessage.h>
 #include <MailCore/MCAbstractPart.h>
+#ifdef __APPLE__
+#import <CoreFoundation/CoreFoundation.h>
+#endif
 
 #ifdef __cplusplus
 
@@ -12,11 +15,12 @@ namespace mailcore {
     
     class HTMLRendererTemplateCallback;
     
-    class MessageParser : public AbstractMessage {
+    class MAILCORE_EXPORT MessageParser : public AbstractMessage {
     public:
         static MessageParser * messageParserWithData(Data * data);
         static MessageParser * messageParserWithContentsOfFile(String * filename);
         
+        MessageParser();
         MessageParser(Data * data);
         virtual ~MessageParser();
         
@@ -39,11 +43,23 @@ namespace mailcore {
         
         virtual HashMap * serializable();
         
+#ifdef __APPLE__
+    public:
+        static MessageParser * messageParserWithData(CFDataRef data);
+        MessageParser(CFDataRef data);
+#endif
+        
     private:
         Data * mData;
         AbstractPart * mMainPart;
         void init();
+#if __APPLE__
+        void * mNSData;
+#endif
         
+    private:
+        void setBytes(char * bytes, unsigned int length);
+        Data * dataFromNSData();
     };
     
 };