From 435c2ccf9369f72b6036e594e9a82a8d0f667709 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Thu, 25 Jan 2018 10:15:41 +0100 Subject: Removed unused code --- framework/src/domain/mime/mimetreeparser/messagepart.cpp | 8 +------- framework/src/domain/mime/mimetreeparser/messagepart.h | 6 +----- framework/src/domain/mime/mimetreeparser/multipartalternative.cpp | 3 +-- 3 files changed, 3 insertions(+), 14 deletions(-) (limited to 'framework') 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 //-----AlternativeMessagePart---------------------- -AlternativeMessagePart::AlternativeMessagePart(ObjectTreeParser *otp, KMime::Content *node, Util::HtmlMode preferredMode) +AlternativeMessagePart::AlternativeMessagePart(ObjectTreeParser *otp, KMime::Content *node) : MessagePart(otp, QString(), node) - , mPreferredMode(preferredMode) { KMime::Content *dataIcal = findTypeInDirectChilds(mNode, "text/calendar"); KMime::Content *dataHtml = findTypeInDirectChilds(mNode, "text/html"); @@ -612,11 +611,6 @@ AlternativeMessagePart::~AlternativeMessagePart() } -Util::HtmlMode AlternativeMessagePart::preferredMode() const -{ - return mPreferredMode; -} - QList AlternativeMessagePart::availableModes() { 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 Q_OBJECT public: typedef QSharedPointer Ptr; - AlternativeMessagePart(MimeTreeParser::ObjectTreeParser *otp, KMime::Content *node, Util::HtmlMode preferredMode); + AlternativeMessagePart(MimeTreeParser::ObjectTreeParser *otp, KMime::Content *node); virtual ~AlternativeMessagePart(); QString text() const Q_DECL_OVERRIDE; - Util::HtmlMode preferredMode() const; - bool isHtml() const Q_DECL_OVERRIDE; QString plaintextContent() const Q_DECL_OVERRIDE; @@ -249,8 +247,6 @@ public: QList availableModes(); private: - Util::HtmlMode mPreferredMode; - QMap mChildNodes; QMap mChildParts; 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 //Hardcoded after removing the source auto preferredMode = MimeTreeParser::Util::Html; - AlternativeMessagePart::Ptr mp(new AlternativeMessagePart(part.objectTreeParser(), node, preferredMode)); + AlternativeMessagePart::Ptr mp(new AlternativeMessagePart(part.objectTreeParser(), node)); if (mp->mChildNodes.isEmpty()) { return MimeMessagePart::Ptr(new MimeMessagePart(part.objectTreeParser(), node->contents().at(0), false)); } @@ -77,6 +77,5 @@ MessagePart::Ptr MultiPartAlternativeBodyPartFormatter::process(Interface::BodyP part.nodeHelper()->setNodeProcessed(dataHtml, false); preferredMode = Util::MultipartPlain; } - mp->mPreferredMode = preferredMode; return mp; } -- cgit v1.2.3