From 0cb9c3d4632819a681c1a7eae2f985dff92db9f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20Knau=C3=9F?= Date: Tue, 29 Mar 2016 14:04:40 +0200 Subject: Adapt the move from Otp -> MimeTreeParser --- framework/CMakeLists.txt | 2 +- framework/domain/CMakeLists.txt | 2 +- framework/domain/csshelper.cpp | 2 +- framework/domain/csshelper.h | 4 ++-- framework/domain/mailtemplates.cpp | 10 +++++----- framework/domain/messageparser.cpp | 6 +++--- framework/domain/messageparser.h | 4 ++-- framework/domain/objecttreesource.cpp | 29 ++++++++++++++++++----------- framework/domain/objecttreesource.h | 17 +++++++++-------- framework/domain/stringhtmlwriter.cpp | 2 +- framework/domain/stringhtmlwriter.h | 4 ++-- 11 files changed, 45 insertions(+), 37 deletions(-) (limited to 'framework') diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt index d795e992..c216d3c0 100644 --- a/framework/CMakeLists.txt +++ b/framework/CMakeLists.txt @@ -16,7 +16,7 @@ include(KDEInstallDirs) find_package(Qt5 COMPONENTS REQUIRED Core Qml) -find_package(KF5Otp "5.1.42" CONFIG REQUIRED) +find_package(KF5MimeTreeParser "5.1.46" CONFIG REQUIRED) find_package(KF5Mime "4.87.0" CONFIG REQUIRED) find_package(Sink CONFIG REQUIRED) find_package(KF5Async CONFIG REQUIRED) diff --git a/framework/domain/CMakeLists.txt b/framework/domain/CMakeLists.txt index 435db5cf..f40463be 100644 --- a/framework/domain/CMakeLists.txt +++ b/framework/domain/CMakeLists.txt @@ -26,7 +26,7 @@ include_directories(${CURL_INCLUDE_DIRS}) add_library(mailplugin SHARED ${mailplugin_SRCS}) qt5_use_modules(mailplugin Core Quick Qml WebKitWidgets) -target_link_libraries(mailplugin actionplugin settingsplugin sink KF5::Otp KF5::Codecs KF5::Package ${CURL_LIBRARIES}) +target_link_libraries(mailplugin actionplugin settingsplugin sink KF5::MimeTreeParser KF5::Codecs KF5::Package ${CURL_LIBRARIES}) install(TARGETS mailplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/domain) install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/domain) diff --git a/framework/domain/csshelper.cpp b/framework/domain/csshelper.cpp index a6355c57..8b61ddcc 100644 --- a/framework/domain/csshelper.cpp +++ b/framework/domain/csshelper.cpp @@ -39,7 +39,7 @@ #include CSSHelper::CSSHelper(const QPaintDevice *pd) : - MessageViewer::CSSHelperBase(pd) + MimeTreeParser::CSSHelperBase(pd) { } diff --git a/framework/domain/csshelper.h b/framework/domain/csshelper.h index 775014e3..7be0faa5 100644 --- a/framework/domain/csshelper.h +++ b/framework/domain/csshelper.h @@ -31,9 +31,9 @@ #pragma once -#include +#include -class CSSHelper : public MessageViewer::CSSHelperBase +class CSSHelper : public MimeTreeParser::CSSHelperBase { public: explicit CSSHelper(const QPaintDevice *pd); diff --git a/framework/domain/mailtemplates.cpp b/framework/domain/mailtemplates.cpp index e5ee8533..9b0dab5d 100644 --- a/framework/domain/mailtemplates.cpp +++ b/framework/domain/mailtemplates.cpp @@ -37,7 +37,7 @@ #include "objecttreesource.h" #include "csshelper.h" -#include +#include namespace KMime { namespace Types { @@ -341,7 +341,7 @@ QString stripSignature(const QString &msg) return res; } -QString plainMessageText(MessageViewer::ObjectTreeParser &otp, bool aStripSignature) +QString plainMessageText(MimeTreeParser::ObjectTreeParser &otp, bool aStripSignature) { QString result = otp.plainTextContent(); if (result.isEmpty()) { //HTML-only mails @@ -357,7 +357,7 @@ QString plainMessageText(MessageViewer::ObjectTreeParser &otp, bool aStripSignat return result; } -QString htmlMessageText(MessageViewer::ObjectTreeParser &otp, bool aStripSignature, QString &headElement) +QString htmlMessageText(MimeTreeParser::ObjectTreeParser &otp, bool aStripSignature, QString &headElement) { QString htmlElement = otp.htmlContent(); @@ -759,9 +759,9 @@ KMime::Message::Ptr MailTemplates::reply(const KMime::Message::Ptr &origMsg) StringHtmlWriter htmlWriter; QImage paintDevice; CSSHelper cssHelper(&paintDevice); - MessageViewer::NodeHelper nodeHelper; + MimeTreeParser::NodeHelper nodeHelper; ObjectTreeSource source(&htmlWriter, &cssHelper); - MessageViewer::ObjectTreeParser otp(&source, &nodeHelper); + MimeTreeParser::ObjectTreeParser otp(&source, &nodeHelper); otp.setAllowAsync(false); otp.parseObjectTree(origMsg.data()); diff --git a/framework/domain/messageparser.cpp b/framework/domain/messageparser.cpp index 89f67f38..956bfb65 100644 --- a/framework/domain/messageparser.cpp +++ b/framework/domain/messageparser.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include MessageParser::MessageParser(QObject *parent) : QObject(parent) @@ -59,9 +59,9 @@ void MessageParser::setMessage(const QVariant &message) QImage paintDevice; CSSHelper cssHelper(&paintDevice); //temporary files only have the lifetime of the nodehelper, so we keep it around until the mail changes. - mNodeHelper = std::make_shared(); + mNodeHelper = std::make_shared(); ObjectTreeSource source(&htmlWriter, &cssHelper); - MessageViewer::ObjectTreeParser otp(&source, mNodeHelper.get()); + MimeTreeParser::ObjectTreeParser otp(&source, mNodeHelper.get()); htmlWriter.begin(QString()); htmlWriter.queue(cssHelper.htmlHead(false)); diff --git a/framework/domain/messageparser.h b/framework/domain/messageparser.h index ba08a5ec..72b55a5a 100644 --- a/framework/domain/messageparser.h +++ b/framework/domain/messageparser.h @@ -24,7 +24,7 @@ #include #include -namespace MessageViewer { +namespace MimeTreeParser { class NodeHelper; }; @@ -47,5 +47,5 @@ signals: private: QString mHtml; - std::shared_ptr mNodeHelper; + std::shared_ptr mNodeHelper; }; diff --git a/framework/domain/objecttreesource.cpp b/framework/domain/objecttreesource.cpp index d14b7b9b..e5e3b9cc 100644 --- a/framework/domain/objecttreesource.cpp +++ b/framework/domain/objecttreesource.cpp @@ -19,7 +19,8 @@ #include "objecttreesource.h" -#include +#include +#include class ObjectSourcePrivate { @@ -33,16 +34,17 @@ public: { } - MessageViewer::HtmlWriter *mWriter; - MessageViewer::CSSHelperBase *mCSSHelper; + MimeTreeParser::HtmlWriter *mWriter; + MimeTreeParser::CSSHelperBase *mCSSHelper; + MimeTreeParser::BodyPartFormatterBaseFactory mBodyPartFormatterBaseFactory; bool mAllowDecryption; bool mHtmlLoadExternal; bool mHtmlMail; }; -ObjectTreeSource::ObjectTreeSource(MessageViewer::HtmlWriter *writer, - MessageViewer::CSSHelperBase *cssHelper) - : MessageViewer::ObjectTreeSourceIf() +ObjectTreeSource::ObjectTreeSource(MimeTreeParser::HtmlWriter *writer, + MimeTreeParser::CSSHelperBase *cssHelper) + : MimeTreeParser::ObjectTreeSourceIf() , d(new ObjectSourcePrivate) { d->mWriter = writer; @@ -59,11 +61,11 @@ void ObjectTreeSource::setAllowDecryption(bool allowDecryption) d->mAllowDecryption = allowDecryption; } -MessageViewer::HtmlWriter *ObjectTreeSource::htmlWriter() +MimeTreeParser::HtmlWriter *ObjectTreeSource::htmlWriter() { return d->mWriter; } -MessageViewer::CSSHelperBase *ObjectTreeSource::cssHelper() +MimeTreeParser::CSSHelperBase *ObjectTreeSource::cssHelper() { return d->mCSSHelper; } @@ -113,9 +115,9 @@ QString ObjectTreeSource::createMessageHeader(KMime::Message *message) return QString(); } -const MessageViewer::AttachmentStrategy *ObjectTreeSource::attachmentStrategy() +const MimeTreeParser::AttachmentStrategy *ObjectTreeSource::attachmentStrategy() { - return MessageViewer::AttachmentStrategy::smart(); + return MimeTreeParser::AttachmentStrategy::smart(); } QObject *ObjectTreeSource::sourceObject() @@ -123,7 +125,7 @@ QObject *ObjectTreeSource::sourceObject() return Q_NULLPTR; } -void ObjectTreeSource::setHtmlMode(MessageViewer::Util::HtmlMode mode) +void ObjectTreeSource::setHtmlMode(MimeTreeParser::Util::HtmlMode mode) { Q_UNUSED(mode); } @@ -142,3 +144,8 @@ bool ObjectTreeSource::showExpandQuotesMark() const { return false; } + +const MimeTreeParser::BodyPartFormatterBaseFactory *ObjectTreeSource::bodyPartFormatterFactory() +{ + return &(d->mBodyPartFormatterBaseFactory); +} diff --git a/framework/domain/objecttreesource.h b/framework/domain/objecttreesource.h index db14e3ff..bdd9b2ba 100644 --- a/framework/domain/objecttreesource.h +++ b/framework/domain/objecttreesource.h @@ -20,16 +20,16 @@ #ifndef MAILVIEWER_OBJECTTREEEMPTYSOURCE_H #define MAILVIEWER_OBJECTTREEEMPTYSOURCE_H -#include +#include class QString; class ObjectSourcePrivate; -class ObjectTreeSource : public MessageViewer::ObjectTreeSourceIf +class ObjectTreeSource : public MimeTreeParser::ObjectTreeSourceIf { public: - ObjectTreeSource(MessageViewer::HtmlWriter *writer, - MessageViewer::CSSHelperBase *cssHelper); + ObjectTreeSource(MimeTreeParser::HtmlWriter *writer, + MimeTreeParser::CSSHelperBase *cssHelper); virtual ~ObjectTreeSource(); void setHtmlLoadExternal(bool loadExternal); void setHtmlMail(bool htmlMail); @@ -37,18 +37,19 @@ public: bool decryptMessage() const Q_DECL_OVERRIDE; bool htmlLoadExternal() const Q_DECL_OVERRIDE; bool showSignatureDetails() const Q_DECL_OVERRIDE; - void setHtmlMode(MessageViewer::Util::HtmlMode mode) Q_DECL_OVERRIDE; + void setHtmlMode(MimeTreeParser::Util::HtmlMode mode) Q_DECL_OVERRIDE; void setAllowDecryption(bool allowDecryption); int levelQuote() const Q_DECL_OVERRIDE; const QTextCodec *overrideCodec() Q_DECL_OVERRIDE; QString createMessageHeader(KMime::Message *message) Q_DECL_OVERRIDE; - const MessageViewer::AttachmentStrategy *attachmentStrategy() Q_DECL_OVERRIDE; - MessageViewer::HtmlWriter *htmlWriter() Q_DECL_OVERRIDE; - MessageViewer::CSSHelperBase *cssHelper() Q_DECL_OVERRIDE; + const MimeTreeParser::AttachmentStrategy *attachmentStrategy() Q_DECL_OVERRIDE; + MimeTreeParser::HtmlWriter *htmlWriter() Q_DECL_OVERRIDE; + MimeTreeParser::CSSHelperBase *cssHelper() Q_DECL_OVERRIDE; QObject *sourceObject() Q_DECL_OVERRIDE; bool autoImportKeys() const Q_DECL_OVERRIDE; bool showEmoticons() const Q_DECL_OVERRIDE; bool showExpandQuotesMark() const Q_DECL_OVERRIDE; + const MimeTreeParser::BodyPartFormatterBaseFactory *bodyPartFormatterFactory() Q_DECL_OVERRIDE; private: ObjectSourcePrivate *const d; }; diff --git a/framework/domain/stringhtmlwriter.cpp b/framework/domain/stringhtmlwriter.cpp index df108946..b65c992f 100644 --- a/framework/domain/stringhtmlwriter.cpp +++ b/framework/domain/stringhtmlwriter.cpp @@ -36,7 +36,7 @@ #include StringHtmlWriter::StringHtmlWriter() - : MessageViewer::HtmlWriter() + : MimeTreeParser::HtmlWriter() , mState(Ended) { } diff --git a/framework/domain/stringhtmlwriter.h b/framework/domain/stringhtmlwriter.h index fa0a7aa5..c1410d57 100644 --- a/framework/domain/stringhtmlwriter.h +++ b/framework/domain/stringhtmlwriter.h @@ -30,14 +30,14 @@ #ifndef __KUBE_FRAMEWORK_MAIL_STRINGHTMLWRITER_H__ #define __KUBE_FRAMEWORK_MAIL_STRINGHTMLWRITER_H__ -#include +#include #include #include class QString; -class StringHtmlWriter : public MessageViewer::HtmlWriter +class StringHtmlWriter : public MimeTreeParser::HtmlWriter { public: explicit StringHtmlWriter(); -- cgit v1.2.3