Merge branch 'develop' into dev/mimetreeinterface

1 files changed, 2 insertions, 3 deletions

diff --git a/framework/domain/objecttreesource.h b/framework/domain/objecttreesource.h
index bb0cd679..42433e71 100644
--- a/framework/domain/objecttreesource.h
+++ b/framework/domain/objecttreesource.h
@@ -31,12 +31,11 @@ public:
     ObjectTreeSource(MimeTreeParser::HtmlWriter *writer);
     virtual ~ObjectTreeSource();
     void setHtmlLoadExternal(bool loadExternal);
-    void setHtmlMail(bool htmlMail);
-    bool htmlMail() const Q_DECL_OVERRIDE;
     bool decryptMessage() const Q_DECL_OVERRIDE;
     bool htmlLoadExternal() const Q_DECL_OVERRIDE;
     bool showSignatureDetails() const Q_DECL_OVERRIDE;
-    void setHtmlMode(MimeTreeParser::Util::HtmlMode mode) Q_DECL_OVERRIDE;
+    void setHtmlMode(MimeTreeParser::Util::HtmlMode mode, const QList<MimeTreeParser::Util::HtmlMode> &availableModes) Q_DECL_OVERRIDE;
+    MimeTreeParser::Util::HtmlMode preferredMode() const Q_DECL_OVERRIDE;
     void setAllowDecryption(bool allowDecryption);
     int levelQuote() const Q_DECL_OVERRIDE;
     const QTextCodec *overrideCodec() Q_DECL_OVERRIDE;