diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-05-23 21:32:00 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-05-23 21:32:00 +0200 |
commit | 0a48541c5f27c1b2913030116b1cdf3ded291219 (patch) | |
tree | 1afddcf6273556d7c86dfabdd327f41ce0305b31 | |
parent | 01f36d638e12bd6ecc97fbef27d694172fbdd7f8 (diff) | |
download | kube-0a48541c5f27c1b2913030116b1cdf3ded291219.tar.gz kube-0a48541c5f27c1b2913030116b1cdf3ded291219.zip |
Removed the MessagePartRenderer
10 files changed, 0 insertions, 98 deletions
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 @@ | |||
22 | #include <otp/attachmentstrategy.h> | 22 | #include <otp/attachmentstrategy.h> |
23 | #include <otp/bodypartformatterbasefactory.h> | 23 | #include <otp/bodypartformatterbasefactory.h> |
24 | #include <otp/messagepart.h> | 24 | #include <otp/messagepart.h> |
25 | #include <otp/messagepartrenderer.h> | ||
26 | 25 | ||
27 | class ObjectSourcePrivate | 26 | class ObjectSourcePrivate |
28 | { | 27 | { |
@@ -145,8 +144,3 @@ const MimeTreeParser::BodyPartFormatterBaseFactory *ObjectTreeSource::bodyPartFo | |||
145 | return &(d->mBodyPartFormatterBaseFactory); | 144 | return &(d->mBodyPartFormatterBaseFactory); |
146 | } | 145 | } |
147 | 146 | ||
148 | MimeTreeParser::Interface::MessagePartRenderer::Ptr ObjectTreeSource::messagePartTheme(MimeTreeParser::Interface::MessagePart::Ptr msgPart) | ||
149 | { | ||
150 | Q_UNUSED(msgPart); | ||
151 | return MimeTreeParser::Interface::MessagePartRenderer::Ptr(); | ||
152 | } | ||
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: | |||
48 | bool showExpandQuotesMark() const Q_DECL_OVERRIDE; | 48 | bool showExpandQuotesMark() const Q_DECL_OVERRIDE; |
49 | bool isPrinting() const Q_DECL_OVERRIDE; | 49 | bool isPrinting() const Q_DECL_OVERRIDE; |
50 | const MimeTreeParser::BodyPartFormatterBaseFactory *bodyPartFormatterFactory() Q_DECL_OVERRIDE; | 50 | const MimeTreeParser::BodyPartFormatterBaseFactory *bodyPartFormatterFactory() Q_DECL_OVERRIDE; |
51 | MimeTreeParser::Interface::MessagePartRendererPtr messagePartTheme(MimeTreeParser::Interface::MessagePartPtr msgPart) Q_DECL_OVERRIDE; | ||
52 | private: | 51 | private: |
53 | ObjectSourcePrivate *const d; | 52 | ObjectSourcePrivate *const d; |
54 | }; | 53 | }; |
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 | |||
34 | objecttreesource.cpp | 34 | objecttreesource.cpp |
35 | bodypart.cpp | 35 | bodypart.cpp |
36 | htmlwriter.cpp | 36 | htmlwriter.cpp |
37 | messagepartrenderer.cpp | ||
38 | 37 | ||
39 | #bodypartformatter.cpp | 38 | #bodypartformatter.cpp |
40 | bodypartformatterbasefactory.cpp | 39 | 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 @@ | |||
25 | #include <attachmentstrategy.h> | 25 | #include <attachmentstrategy.h> |
26 | #include <bodypartformatter.h> | 26 | #include <bodypartformatter.h> |
27 | #include <bodypartformatterbasefactory.h> | 27 | #include <bodypartformatterbasefactory.h> |
28 | #include <messagepartrenderer.h> | ||
29 | #include <objecttreesource.h> | 28 | #include <objecttreesource.h> |
30 | 29 | ||
31 | namespace MimeTreeParser | 30 | namespace MimeTreeParser |
@@ -150,10 +149,6 @@ public: | |||
150 | return nullptr; | 149 | return nullptr; |
151 | } | 150 | } |
152 | 151 | ||
153 | Interface::MessagePartRenderer::Ptr messagePartTheme(Interface::MessagePart::Ptr msgPart) Q_DECL_OVERRIDE { | ||
154 | Q_UNUSED(msgPart); | ||
155 | return Interface::MessagePartRenderer::Ptr(); | ||
156 | } | ||
157 | bool isPrinting() const Q_DECL_OVERRIDE | 152 | bool isPrinting() const Q_DECL_OVERRIDE |
158 | { | 153 | { |
159 | return false; | 154 | 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 @@ | |||
1 | /* | ||
2 | Copyright (C) 2016 Sandro Knauß <sknauss@kde.org> | ||
3 | |||
4 | This program is free software; you can redistribute it and/or modify | ||
5 | it under the terms of the GNU General Public License as published by | ||
6 | the Free Software Foundation; either version 2 of the License, or | ||
7 | (at your option) any later version. | ||
8 | |||
9 | This program is distributed in the hope that it will be useful, | ||
10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | GNU General Public License for more details. | ||
13 | |||
14 | You should have received a copy of the GNU General Public License along | ||
15 | with this program; if not, write to the Free Software Foundation, Inc., | ||
16 | 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
17 | */ | ||
18 | |||
19 | #include "messagepartrenderer.h" | ||
20 | |||
21 | MimeTreeParser::Interface::MessagePartRenderer::~MessagePartRenderer() | ||
22 | { | ||
23 | } | ||
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 @@ | |||
1 | /* | ||
2 | Copyright (C) 2016 Sandro Knauß <sknauss@kde.org> | ||
3 | |||
4 | This program is free software; you can redistribute it and/or modify | ||
5 | it under the terms of the GNU General Public License as published by | ||
6 | the Free Software Foundation; either version 2 of the License, or | ||
7 | (at your option) any later version. | ||
8 | |||
9 | This program is distributed in the hope that it will be useful, | ||
10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | GNU General Public License for more details. | ||
13 | |||
14 | You should have received a copy of the GNU General Public License along | ||
15 | with this program; if not, write to the Free Software Foundation, Inc., | ||
16 | 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
17 | */ | ||
18 | |||
19 | #ifndef __MIMETREEPARSER_MESSAGEPARTRENDERER_IF_H__ | ||
20 | #define __MIMETREEPARSER_MESSAGEPARTRENDERER_IF_H__ | ||
21 | |||
22 | #include <QSharedPointer> | ||
23 | |||
24 | namespace MimeTreeParser | ||
25 | { | ||
26 | namespace Interface | ||
27 | { | ||
28 | /** | ||
29 | * Interface for rendering messageparts to html. | ||
30 | * @author Andras Mantia <sknauss@kde.org> | ||
31 | */ | ||
32 | class MessagePartRenderer | ||
33 | { | ||
34 | public: | ||
35 | typedef QSharedPointer<MessagePartRenderer> Ptr; | ||
36 | |||
37 | virtual ~MessagePartRenderer(); | ||
38 | |||
39 | virtual QString html() const = 0; | ||
40 | }; | ||
41 | } | ||
42 | } | ||
43 | #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 @@ | |||
47 | #include "utils.h" | 47 | #include "utils.h" |
48 | #include "bodypartformatter.h" | 48 | #include "bodypartformatter.h" |
49 | #include "htmlwriter.h" | 49 | #include "htmlwriter.h" |
50 | #include "messagepartrenderer.h" | ||
51 | #include "util.h" | 50 | #include "util.h" |
52 | 51 | ||
53 | #include <KMime/Headers> | 52 | #include <KMime/Headers> |
@@ -189,12 +188,6 @@ void ObjectTreeParser::parseObjectTree(KMime::Content *node) | |||
189 | setPlainTextContent(mp->text()); | 188 | setPlainTextContent(mp->text()); |
190 | } | 189 | } |
191 | 190 | ||
192 | if (htmlWriter()) { | ||
193 | const auto renderer = mSource->messagePartTheme(mParsedPart); | ||
194 | if (renderer) { | ||
195 | mHtmlWriter->queue(renderer->html()); | ||
196 | } | ||
197 | } | ||
198 | } | 191 | } |
199 | } | 192 | } |
200 | 193 | ||
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 | |||
36 | { | 36 | { |
37 | class MessagePart; | 37 | class MessagePart; |
38 | typedef QSharedPointer<MessagePart> MessagePartPtr; | 38 | typedef QSharedPointer<MessagePart> MessagePartPtr; |
39 | class MessagePartRenderer; | ||
40 | typedef QSharedPointer<MessagePartRenderer> MessagePartRendererPtr; | ||
41 | } | 39 | } |
42 | } | 40 | } |
43 | 41 | ||
@@ -100,8 +98,6 @@ public: | |||
100 | 98 | ||
101 | virtual const BodyPartFormatterBaseFactory *bodyPartFormatterFactory() = 0; | 99 | virtual const BodyPartFormatterBaseFactory *bodyPartFormatterFactory() = 0; |
102 | 100 | ||
103 | virtual MessagePartRendererPtr messagePartTheme(MessagePartPtr msgPart) = 0; | ||
104 | |||
105 | virtual bool isPrinting() const = 0; | 101 | virtual bool isPrinting() const = 0; |
106 | }; | 102 | }; |
107 | } | 103 | } |
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 @@ | |||
22 | #include <otp/attachmentstrategy.h> | 22 | #include <otp/attachmentstrategy.h> |
23 | #include <otp/bodypartformatterbasefactory.h> | 23 | #include <otp/bodypartformatterbasefactory.h> |
24 | #include <otp/messagepart.h> | 24 | #include <otp/messagepart.h> |
25 | #include <otp/messagepartrenderer.h> | ||
26 | 25 | ||
27 | class ObjectSourcePrivate | 26 | class ObjectSourcePrivate |
28 | { | 27 | { |
@@ -144,9 +143,3 @@ const MimeTreeParser::BodyPartFormatterBaseFactory *ObjectTreeSource::bodyPartFo | |||
144 | { | 143 | { |
145 | return &(d->mBodyPartFormatterBaseFactory); | 144 | return &(d->mBodyPartFormatterBaseFactory); |
146 | } | 145 | } |
147 | |||
148 | MimeTreeParser::Interface::MessagePartRenderer::Ptr ObjectTreeSource::messagePartTheme(MimeTreeParser::Interface::MessagePart::Ptr msgPart) | ||
149 | { | ||
150 | Q_UNUSED(msgPart); | ||
151 | return MimeTreeParser::Interface::MessagePartRenderer::Ptr(); | ||
152 | } | ||
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: | |||
48 | bool showExpandQuotesMark() const Q_DECL_OVERRIDE; | 48 | bool showExpandQuotesMark() const Q_DECL_OVERRIDE; |
49 | bool isPrinting() const Q_DECL_OVERRIDE; | 49 | bool isPrinting() const Q_DECL_OVERRIDE; |
50 | const MimeTreeParser::BodyPartFormatterBaseFactory *bodyPartFormatterFactory() Q_DECL_OVERRIDE; | 50 | const MimeTreeParser::BodyPartFormatterBaseFactory *bodyPartFormatterFactory() Q_DECL_OVERRIDE; |
51 | MimeTreeParser::Interface::MessagePartRendererPtr messagePartTheme(MimeTreeParser::Interface::MessagePartPtr msgPart) Q_DECL_OVERRIDE; | ||
52 | private: | 51 | private: |
53 | ObjectSourcePrivate *const d; | 52 | ObjectSourcePrivate *const d; |
54 | }; | 53 | }; |