From 0a48541c5f27c1b2913030116b1cdf3ded291219 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Tue, 23 May 2017 21:32:00 +0200 Subject: Removed the MessagePartRenderer --- .../mime/mimetreeparser/objecttreesource.cpp | 6 --- .../domain/mime/mimetreeparser/objecttreesource.h | 1 - .../domain/mime/mimetreeparser/otp/CMakeLists.txt | 1 - .../mime/mimetreeparser/otp/autotests/setupenv.h | 5 --- .../mimetreeparser/otp/messagepartrenderer.cpp | 23 ------------ .../mime/mimetreeparser/otp/messagepartrenderer.h | 43 ---------------------- .../mime/mimetreeparser/otp/objecttreeparser.cpp | 7 ---- .../mime/mimetreeparser/otp/objecttreesource.h | 4 -- framework/src/domain/mime/objecttreesource.cpp | 7 ---- framework/src/domain/mime/objecttreesource.h | 1 - 10 files changed, 98 deletions(-) delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/messagepartrenderer.cpp delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/messagepartrenderer.h (limited to 'framework') diff --git a/framework/src/domain/mime/mimetreeparser/objecttreesource.cpp b/framework/src/domain/mime/mimetreeparser/objecttreesource.cpp index 186fdf80..38e0d561 100644 --- a/framework/src/domain/mime/mimetreeparser/objecttreesource.cpp +++ b/framework/src/domain/mime/mimetreeparser/objecttreesource.cpp @@ -22,7 +22,6 @@ #include #include #include -#include class ObjectSourcePrivate { @@ -145,8 +144,3 @@ const MimeTreeParser::BodyPartFormatterBaseFactory *ObjectTreeSource::bodyPartFo return &(d->mBodyPartFormatterBaseFactory); } -MimeTreeParser::Interface::MessagePartRenderer::Ptr ObjectTreeSource::messagePartTheme(MimeTreeParser::Interface::MessagePart::Ptr msgPart) -{ - Q_UNUSED(msgPart); - return MimeTreeParser::Interface::MessagePartRenderer::Ptr(); -} diff --git a/framework/src/domain/mime/mimetreeparser/objecttreesource.h b/framework/src/domain/mime/mimetreeparser/objecttreesource.h index 2167e06f..b7db5fc2 100644 --- a/framework/src/domain/mime/mimetreeparser/objecttreesource.h +++ b/framework/src/domain/mime/mimetreeparser/objecttreesource.h @@ -48,7 +48,6 @@ public: bool showExpandQuotesMark() const Q_DECL_OVERRIDE; bool isPrinting() const Q_DECL_OVERRIDE; const MimeTreeParser::BodyPartFormatterBaseFactory *bodyPartFormatterFactory() Q_DECL_OVERRIDE; - MimeTreeParser::Interface::MessagePartRendererPtr messagePartTheme(MimeTreeParser::Interface::MessagePartPtr msgPart) Q_DECL_OVERRIDE; private: ObjectSourcePrivate *const d; }; diff --git a/framework/src/domain/mime/mimetreeparser/otp/CMakeLists.txt b/framework/src/domain/mime/mimetreeparser/otp/CMakeLists.txt index f480fa21..b70ebf33 100644 --- a/framework/src/domain/mime/mimetreeparser/otp/CMakeLists.txt +++ b/framework/src/domain/mime/mimetreeparser/otp/CMakeLists.txt @@ -34,7 +34,6 @@ set(libmimetreeparser_SRCS objecttreesource.cpp bodypart.cpp htmlwriter.cpp - messagepartrenderer.cpp #bodypartformatter.cpp bodypartformatterbasefactory.cpp diff --git a/framework/src/domain/mime/mimetreeparser/otp/autotests/setupenv.h b/framework/src/domain/mime/mimetreeparser/otp/autotests/setupenv.h index 3582853e..78a450ce 100644 --- a/framework/src/domain/mime/mimetreeparser/otp/autotests/setupenv.h +++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/setupenv.h @@ -25,7 +25,6 @@ #include #include #include -#include #include namespace MimeTreeParser @@ -150,10 +149,6 @@ public: return nullptr; } - Interface::MessagePartRenderer::Ptr messagePartTheme(Interface::MessagePart::Ptr msgPart) Q_DECL_OVERRIDE { - Q_UNUSED(msgPart); - return Interface::MessagePartRenderer::Ptr(); - } bool isPrinting() const Q_DECL_OVERRIDE { return false; diff --git a/framework/src/domain/mime/mimetreeparser/otp/messagepartrenderer.cpp b/framework/src/domain/mime/mimetreeparser/otp/messagepartrenderer.cpp deleted file mode 100644 index 7f622268..00000000 --- a/framework/src/domain/mime/mimetreeparser/otp/messagepartrenderer.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - Copyright (C) 2016 Sandro Knauß - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ - -#include "messagepartrenderer.h" - -MimeTreeParser::Interface::MessagePartRenderer::~MessagePartRenderer() -{ -} diff --git a/framework/src/domain/mime/mimetreeparser/otp/messagepartrenderer.h b/framework/src/domain/mime/mimetreeparser/otp/messagepartrenderer.h deleted file mode 100644 index a90c17e6..00000000 --- a/framework/src/domain/mime/mimetreeparser/otp/messagepartrenderer.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - Copyright (C) 2016 Sandro Knauß - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ - -#ifndef __MIMETREEPARSER_MESSAGEPARTRENDERER_IF_H__ -#define __MIMETREEPARSER_MESSAGEPARTRENDERER_IF_H__ - -#include - -namespace MimeTreeParser -{ -namespace Interface -{ -/** -* Interface for rendering messageparts to html. -* @author Andras Mantia -*/ -class MessagePartRenderer -{ -public: - typedef QSharedPointer Ptr; - - virtual ~MessagePartRenderer(); - - virtual QString html() const = 0; -}; -} -} -#endif diff --git a/framework/src/domain/mime/mimetreeparser/otp/objecttreeparser.cpp b/framework/src/domain/mime/mimetreeparser/otp/objecttreeparser.cpp index b0d514b6..4e0e3d92 100644 --- a/framework/src/domain/mime/mimetreeparser/otp/objecttreeparser.cpp +++ b/framework/src/domain/mime/mimetreeparser/otp/objecttreeparser.cpp @@ -47,7 +47,6 @@ #include "utils.h" #include "bodypartformatter.h" #include "htmlwriter.h" -#include "messagepartrenderer.h" #include "util.h" #include @@ -189,12 +188,6 @@ void ObjectTreeParser::parseObjectTree(KMime::Content *node) setPlainTextContent(mp->text()); } - if (htmlWriter()) { - const auto renderer = mSource->messagePartTheme(mParsedPart); - if (renderer) { - mHtmlWriter->queue(renderer->html()); - } - } } } diff --git a/framework/src/domain/mime/mimetreeparser/otp/objecttreesource.h b/framework/src/domain/mime/mimetreeparser/otp/objecttreesource.h index afada4c4..a9e5ddf9 100644 --- a/framework/src/domain/mime/mimetreeparser/otp/objecttreesource.h +++ b/framework/src/domain/mime/mimetreeparser/otp/objecttreesource.h @@ -36,8 +36,6 @@ namespace Interface { class MessagePart; typedef QSharedPointer MessagePartPtr; -class MessagePartRenderer; -typedef QSharedPointer MessagePartRendererPtr; } } @@ -100,8 +98,6 @@ public: virtual const BodyPartFormatterBaseFactory *bodyPartFormatterFactory() = 0; - virtual MessagePartRendererPtr messagePartTheme(MessagePartPtr msgPart) = 0; - virtual bool isPrinting() const = 0; }; } diff --git a/framework/src/domain/mime/objecttreesource.cpp b/framework/src/domain/mime/objecttreesource.cpp index 186fdf80..2193e769 100644 --- a/framework/src/domain/mime/objecttreesource.cpp +++ b/framework/src/domain/mime/objecttreesource.cpp @@ -22,7 +22,6 @@ #include #include #include -#include class ObjectSourcePrivate { @@ -144,9 +143,3 @@ const MimeTreeParser::BodyPartFormatterBaseFactory *ObjectTreeSource::bodyPartFo { return &(d->mBodyPartFormatterBaseFactory); } - -MimeTreeParser::Interface::MessagePartRenderer::Ptr ObjectTreeSource::messagePartTheme(MimeTreeParser::Interface::MessagePart::Ptr msgPart) -{ - Q_UNUSED(msgPart); - return MimeTreeParser::Interface::MessagePartRenderer::Ptr(); -} diff --git a/framework/src/domain/mime/objecttreesource.h b/framework/src/domain/mime/objecttreesource.h index 2167e06f..b7db5fc2 100644 --- a/framework/src/domain/mime/objecttreesource.h +++ b/framework/src/domain/mime/objecttreesource.h @@ -48,7 +48,6 @@ public: bool showExpandQuotesMark() const Q_DECL_OVERRIDE; bool isPrinting() const Q_DECL_OVERRIDE; const MimeTreeParser::BodyPartFormatterBaseFactory *bodyPartFormatterFactory() Q_DECL_OVERRIDE; - MimeTreeParser::Interface::MessagePartRendererPtr messagePartTheme(MimeTreeParser::Interface::MessagePartPtr msgPart) Q_DECL_OVERRIDE; private: ObjectSourcePrivate *const d; }; -- cgit v1.2.3