Removed MessageRendererHelper class.

* Added ivars and assigned message rendering callbacks in IMAPSession.

4 files changed, 12 insertions, 74 deletions

diff --git a/src/core/imap/MCIMAPSession.cc b/src/core/imap/MCIMAPSession.cc
index ce2263c4..fa22dfc7 100644
--- a/src/core/imap/MCIMAPSession.cc
+++ b/src/core/imap/MCIMAPSession.cc
@@ -349,6 +349,8 @@ void IMAPSession::init()
     mProgressCallback = NULL;
     mProgressItemsCount = 0;
     mConnectionLogger = NULL;
+    mDataCallback = new HTMLRendererIMAPCallback();
+    mHtmlCallback = new HTMLBodyRendererTemplateCallback();
 }
 
 IMAPSession::IMAPSession()
@@ -366,6 +368,8 @@ IMAPSession::~IMAPSession()
     MC_SAFE_RELEASE(mDefaultNamespace);
     MC_SAFE_RELEASE(mCurrentFolder);
     pthread_mutex_destroy(&mIdleLock);
+    MC_SAFE_RELEASE(mDataCallback);
+    MC_SAFE_RELEASE(mHtmlCallback);
 }
 
 void IMAPSession::setHostname(String * hostname)
@@ -3027,7 +3031,7 @@ String * IMAPSession::htmlRendering(IMAPMessage * message, String * folder)
     MessageRendererHelper * messageRendererHelper = new MessageRendererHelper;
     String * htmlString = HTMLRenderer::htmlForIMAPMessage(folder,
                                                            message,
-                                                           messageRendererHelper->dataCallback(),
+                                                           mDataCallback,
                                                            NULL);
     
     return htmlString;
@@ -3039,8 +3043,8 @@ String * IMAPSession::htmlBodyRendering(IMAPMessage * message, String * folder)
     
     String * htmlBodyString = HTMLRenderer::htmlForIMAPMessage(folder,
                                                                message,
-                                                               messageRendererHelper->dataCallback(),
-                                                               messageRendererHelper->htmlBodyCallback());
+                                                               mDataCallback,
+                                                               mHtmlBodyCallback);
 
     return htmlBodyString;
 }
diff --git a/src/core/imap/MCIMAPSession.h b/src/core/imap/MCIMAPSession.h
index 53510b0b..a2b9cc60 100644
--- a/src/core/imap/MCIMAPSession.h
+++ b/src/core/imap/MCIMAPSession.h
@@ -5,6 +5,8 @@
 #include <MailCore/MCBaseTypes.h>
 #include <MailCore/MCMessageConstants.h>
 #include <MailCore/MCIMAPMessage.h>
+#include <MailCore/MCHTMLRendererCallback.h>
+#include <MailCore/MCHTMLBodyRendererCallback.h>
 
 #ifdef __cplusplus
 
@@ -192,6 +194,9 @@ namespace mailcore {
         unsigned int mProgressItemsCount;
         ConnectionLogger * mConnectionLogger;
         
+        HTMLRendererIMAPCallback * mDataCallback;
+        HTMLBodyRendererTemplateCallback * mHtmlCallback;
+        
         void init();
         void bodyProgress(unsigned int current, unsigned int maximum);
         void itemsProgress(unsigned int current, unsigned int maximum);
diff --git a/src/core/renderer/MCMessageRendererHelper.cpp b/src/core/renderer/MCMessageRendererHelper.cpp
deleted file mode 100644
index bd4a1745..00000000
--- a/src/core/renderer/MCMessageRendererHelper.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-//  MCMessageRendererHelper.cpp
-//  mailcore2
-//
-//  Created by Paul Young on 28/06/2013.
-//  Copyright (c) 2013 MailCore. All rights reserved.
-//
-
-#include "MCMessageRendererHelper.h"
-
-using namespace mailcore;
-
-MessageRendererHelper::MessageRendererHelper()
-{
-    mDataCallback = new HTMLRendererIMAPCallback();
-    mHtmlCallback = new HTMLBodyRendererTemplateCallback();
-}
-
-MessageRendererHelper::~MessageRendererHelper()
-{
-    MC_SAFE_RELEASE(mDataCallback);
-    MC_SAFE_RELEASE(mHtmlCallback);
-}
-
-HTMLRendererIMAPCallback * MessageRendererHelper::dataCallback()
-{
-    return mDataCallback;
-}
-
-HTMLBodyRendererTemplateCallback * MessageRendererHelper::htmlBodyCallback()
-{
-    return mHtmlCallback;
-}
diff --git a/src/core/renderer/MCMessageRendererHelper.h b/src/core/renderer/MCMessageRendererHelper.h
deleted file mode 100644
index 716c91a2..00000000
--- a/src/core/renderer/MCMessageRendererHelper.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-//  MCMessageRendererHelper.h
-//  mailcore2
-//
-//  Created by Paul Young on 28/06/2013.
-//  Copyright (c) 2013 MailCore. All rights reserved.
-//
-
-#ifndef __MAILCORE_MCMESSAGERENDERERHELPER_H_
-
-#define __MAILCORE_MCMESSAGERENDERERHELPER_H_
-
-#include "MCHTMLRendererCallback.h"
-#include "MCHTMLBodyRendererCallback.h"
-#include "MCIMAPSession.h"
-
-#ifdef __cplusplus
-
-namespace mailcore {
-    
-    class MessageRendererHelper {
-    public:
-        MessageRendererHelper();
-        ~MessageRendererHelper();
-
-        virtual HTMLRendererIMAPCallback * dataCallback();
-        virtual HTMLBodyRendererTemplateCallback * htmlBodyCallback();
-    
-    private:
-        HTMLRendererIMAPCallback * mDataCallback;
-        HTMLBodyRendererTemplateCallback * mHtmlCallback;
-        
-    };
-}
-
-#endif
-
-#endif