From 0f67cb5f9851af4e444c41d9f7b8d88350ec2e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20Knau=C3=9F?= Date: Tue, 26 Jul 2016 16:01:46 +0200 Subject: Adopt changes in messagelib interface --- .../domain/mimetreeparser/objecttreesource.cpp | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'framework/domain/mimetreeparser/objecttreesource.cpp') diff --git a/framework/domain/mimetreeparser/objecttreesource.cpp b/framework/domain/mimetreeparser/objecttreesource.cpp index 12cf88ab..58667444 100644 --- a/framework/domain/mimetreeparser/objecttreesource.cpp +++ b/framework/domain/mimetreeparser/objecttreesource.cpp @@ -31,7 +31,7 @@ public: : mWriter(0) , mAllowDecryption(true) , mHtmlLoadExternal(true) - , mHtmlMail(true) + , mPreferredMode(MimeTreeParser::Util::Html) { } @@ -39,7 +39,7 @@ public: MimeTreeParser::BodyPartFormatterBaseFactory mBodyPartFormatterBaseFactory; bool mAllowDecryption; bool mHtmlLoadExternal; - bool mHtmlMail; + MimeTreeParser::Util::HtmlMode mPreferredMode; }; ObjectTreeSource::ObjectTreeSource(MimeTreeParser::HtmlWriter *writer) @@ -74,16 +74,6 @@ void ObjectTreeSource::setHtmlLoadExternal(bool loadExternal) d->mHtmlLoadExternal = loadExternal; } -bool ObjectTreeSource::htmlMail() const -{ - return d->mHtmlMail; -} - -void ObjectTreeSource::setHtmlMail(bool htmlMail) -{ - d->mHtmlMail = htmlMail; -} - bool ObjectTreeSource::decryptMessage() const { return d->mAllowDecryption; @@ -119,9 +109,15 @@ QObject *ObjectTreeSource::sourceObject() return Q_NULLPTR; } -void ObjectTreeSource::setHtmlMode(MimeTreeParser::Util::HtmlMode mode) +void ObjectTreeSource::setHtmlMode(MimeTreeParser::Util::HtmlMode mode, const QList &availableModes) { Q_UNUSED(mode); + Q_UNUSED(availableModes); +} + +MimeTreeParser::Util::HtmlMode ObjectTreeSource::preferredMode() const +{ + return d->mPreferredMode; } bool ObjectTreeSource::autoImportKeys() const -- cgit v1.2.3