summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--framework/src/domain/mime/mimetreeparser/messagepart.cpp8
-rw-r--r--framework/src/domain/mime/mimetreeparser/messagepart.h6
-rw-r--r--framework/src/domain/mime/mimetreeparser/multipartalternative.cpp3
3 files changed, 3 insertions, 14 deletions
diff --git a/framework/src/domain/mime/mimetreeparser/messagepart.cpp b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
index 3ba19567..74ddf0f2 100644
--- a/framework/src/domain/mime/mimetreeparser/messagepart.cpp
+++ b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
@@ -558,9 +558,8 @@ QString MimeMessagePart::htmlContent() const
558 558
559//-----AlternativeMessagePart---------------------- 559//-----AlternativeMessagePart----------------------
560 560
561AlternativeMessagePart::AlternativeMessagePart(ObjectTreeParser *otp, KMime::Content *node, Util::HtmlMode preferredMode) 561AlternativeMessagePart::AlternativeMessagePart(ObjectTreeParser *otp, KMime::Content *node)
562 : MessagePart(otp, QString(), node) 562 : MessagePart(otp, QString(), node)
563 , mPreferredMode(preferredMode)
564{ 563{
565 KMime::Content *dataIcal = findTypeInDirectChilds(mNode, "text/calendar"); 564 KMime::Content *dataIcal = findTypeInDirectChilds(mNode, "text/calendar");
566 KMime::Content *dataHtml = findTypeInDirectChilds(mNode, "text/html"); 565 KMime::Content *dataHtml = findTypeInDirectChilds(mNode, "text/html");
@@ -612,11 +611,6 @@ AlternativeMessagePart::~AlternativeMessagePart()
612 611
613} 612}
614 613
615Util::HtmlMode AlternativeMessagePart::preferredMode() const
616{
617 return mPreferredMode;
618}
619
620QList<Util::HtmlMode> AlternativeMessagePart::availableModes() 614QList<Util::HtmlMode> AlternativeMessagePart::availableModes()
621{ 615{
622 return mChildParts.keys(); 616 return mChildParts.keys();
diff --git a/framework/src/domain/mime/mimetreeparser/messagepart.h b/framework/src/domain/mime/mimetreeparser/messagepart.h
index 8f34c582..124bc50e 100644
--- a/framework/src/domain/mime/mimetreeparser/messagepart.h
+++ b/framework/src/domain/mime/mimetreeparser/messagepart.h
@@ -235,13 +235,11 @@ class AlternativeMessagePart : public MessagePart
235 Q_OBJECT 235 Q_OBJECT
236public: 236public:
237 typedef QSharedPointer<AlternativeMessagePart> Ptr; 237 typedef QSharedPointer<AlternativeMessagePart> Ptr;
238 AlternativeMessagePart(MimeTreeParser::ObjectTreeParser *otp, KMime::Content *node, Util::HtmlMode preferredMode); 238 AlternativeMessagePart(MimeTreeParser::ObjectTreeParser *otp, KMime::Content *node);
239 virtual ~AlternativeMessagePart(); 239 virtual ~AlternativeMessagePart();
240 240
241 QString text() const Q_DECL_OVERRIDE; 241 QString text() const Q_DECL_OVERRIDE;
242 242
243 Util::HtmlMode preferredMode() const;
244
245 bool isHtml() const Q_DECL_OVERRIDE; 243 bool isHtml() const Q_DECL_OVERRIDE;
246 244
247 QString plaintextContent() const Q_DECL_OVERRIDE; 245 QString plaintextContent() const Q_DECL_OVERRIDE;
@@ -249,8 +247,6 @@ public:
249 247
250 QList<Util::HtmlMode> availableModes(); 248 QList<Util::HtmlMode> availableModes();
251private: 249private:
252 Util::HtmlMode mPreferredMode;
253
254 QMap<Util::HtmlMode, KMime::Content *> mChildNodes; 250 QMap<Util::HtmlMode, KMime::Content *> mChildNodes;
255 QMap<Util::HtmlMode, MimeMessagePart::Ptr> mChildParts; 251 QMap<Util::HtmlMode, MimeMessagePart::Ptr> mChildParts;
256 252
diff --git a/framework/src/domain/mime/mimetreeparser/multipartalternative.cpp b/framework/src/domain/mime/mimetreeparser/multipartalternative.cpp
index c2a6f270..9b7954b5 100644
--- a/framework/src/domain/mime/mimetreeparser/multipartalternative.cpp
+++ b/framework/src/domain/mime/mimetreeparser/multipartalternative.cpp
@@ -49,7 +49,7 @@ MessagePart::Ptr MultiPartAlternativeBodyPartFormatter::process(Interface::BodyP
49 49
50 //Hardcoded after removing the source 50 //Hardcoded after removing the source
51 auto preferredMode = MimeTreeParser::Util::Html; 51 auto preferredMode = MimeTreeParser::Util::Html;
52 AlternativeMessagePart::Ptr mp(new AlternativeMessagePart(part.objectTreeParser(), node, preferredMode)); 52 AlternativeMessagePart::Ptr mp(new AlternativeMessagePart(part.objectTreeParser(), node));
53 if (mp->mChildNodes.isEmpty()) { 53 if (mp->mChildNodes.isEmpty()) {
54 return MimeMessagePart::Ptr(new MimeMessagePart(part.objectTreeParser(), node->contents().at(0), false)); 54 return MimeMessagePart::Ptr(new MimeMessagePart(part.objectTreeParser(), node->contents().at(0), false));
55 } 55 }
@@ -77,6 +77,5 @@ MessagePart::Ptr MultiPartAlternativeBodyPartFormatter::process(Interface::BodyP
77 part.nodeHelper()->setNodeProcessed(dataHtml, false); 77 part.nodeHelper()->setNodeProcessed(dataHtml, false);
78 preferredMode = Util::MultipartPlain; 78 preferredMode = Util::MultipartPlain;
79 } 79 }
80 mp->mPreferredMode = preferredMode;
81 return mp; 80 return mp;
82} 81}