Adopt changes from libOtp

* CSSHalper -> CSSHerlperBase
* new pure virtual methods from ObjectTreeSourceIf

3 files changed, 25 insertions, 8 deletions

diff --git a/framework/mail/maillistmodel.cpp b/framework/mail/maillistmodel.cpp
index d3b60187..f7a92097 100644
--- a/framework/mail/maillistmodel.cpp
+++ b/framework/mail/maillistmodel.cpp
@@ -6,7 +6,7 @@
 #include <QFile>
 #include <QImage>
 #include <KF5/MessageViewer/ObjectTreeParser>
-#include <KF5/MessageViewer/CSSHelper>
+#include <KF5/MessageViewer/CSSHelperBase>
 
 MailListModel::MailListModel(QObject *parent)
     : QIdentityProxyModel()
@@ -80,7 +80,7 @@ QVariant MailListModel::data(const QModelIndex &idx, int role) const
                 // render the mail
                 StringHtmlWriter htmlWriter;
                 QImage paintDevice;
-                MessageViewer::CSSHelper cssHelper(&paintDevice);
+                MessageViewer::CSSHelperBase cssHelper(&paintDevice);
                 MessageViewer::NodeHelper nodeHelper;
                 ObjectTreeSource source(&htmlWriter, &cssHelper);
                 MessageViewer::ObjectTreeParser otp(&source, &nodeHelper);
diff --git a/framework/mail/objecttreesource.cpp b/framework/mail/objecttreesource.cpp
index cde4775a..1aca5d54 100644
--- a/framework/mail/objecttreesource.cpp
+++ b/framework/mail/objecttreesource.cpp
@@ -34,14 +34,14 @@ public:
 
     }
     MessageViewer::HtmlWriter *mWriter;
-    MessageViewer::CSSHelper *mCSSHelper;
+    MessageViewer::CSSHelperBase *mCSSHelper;
     bool mAllowDecryption;
     bool mHtmlLoadExternal;
     bool mHtmlMail;
 };
 
 ObjectTreeSource::ObjectTreeSource(MessageViewer::HtmlWriter *writer,
-                                   MessageViewer::CSSHelper *cssHelper)
+                                   MessageViewer::CSSHelperBase *cssHelper)
         : MessageViewer::ObjectTreeSourceIf()
         , d(new ObjectSourcePrivate)
     {
@@ -63,7 +63,7 @@ MessageViewer::HtmlWriter *ObjectTreeSource::htmlWriter()
 {
     return d->mWriter;
 }
-MessageViewer::CSSHelper *ObjectTreeSource::cssHelper()
+MessageViewer::CSSHelperBase *ObjectTreeSource::cssHelper()
 {
     return d->mCSSHelper;
 }
@@ -126,4 +126,19 @@ QObject *ObjectTreeSource::sourceObject()
 void ObjectTreeSource::setHtmlMode(MessageViewer::Util::HtmlMode mode)
 {
       Q_UNUSED(mode);
+}
+
+bool ObjectTreeSource::autoImportKeys()
+{
+    return false;
+}
+
+bool ObjectTreeSource::showEmoticons()
+{
+    return false;
+}
+
+bool ObjectTreeSource::showExpandQuotesMark()
+{
+    return false;
 }
\ No newline at end of file
diff --git a/framework/mail/objecttreesource.h b/framework/mail/objecttreesource.h
index c61ba715..4823999f 100644
--- a/framework/mail/objecttreesource.h
+++ b/framework/mail/objecttreesource.h
@@ -29,7 +29,7 @@ class ObjectTreeSource : public MessageViewer::ObjectTreeSourceIf
 {
 public:
     ObjectTreeSource(MessageViewer::HtmlWriter *writer,
-                     MessageViewer::CSSHelper *cssHelper);
+                     MessageViewer::CSSHelperBase *cssHelper);
     virtual ~ObjectTreeSource();
     void setHtmlLoadExternal(bool loadExternal);
     void setHtmlMail(bool htmlMail);
@@ -44,9 +44,11 @@ public:
     QString createMessageHeader(KMime::Message *message) Q_DECL_OVERRIDE;
     const MessageViewer::AttachmentStrategy *attachmentStrategy() Q_DECL_OVERRIDE;
     MessageViewer::HtmlWriter *htmlWriter() Q_DECL_OVERRIDE;
-    MessageViewer::CSSHelper *cssHelper() Q_DECL_OVERRIDE;
+    MessageViewer::CSSHelperBase *cssHelper() Q_DECL_OVERRIDE;
     QObject *sourceObject() Q_DECL_OVERRIDE;
-
+    bool autoImportKeys() Q_DECL_OVERRIDE;
+    bool showEmoticons() Q_DECL_OVERRIDE;
+    bool showExpandQuotesMark() Q_DECL_OVERRIDE;
 private:
     ObjectSourcePrivate *const d;
 };