diff --git a/mimetreeparser/src/interfaces/bodypart.h b/mimetreeparser/src/interfaces/bodypart.h --- a/mimetreeparser/src/interfaces/bodypart.h +++ b/mimetreeparser/src/interfaces/bodypart.h @@ -73,14 +73,6 @@ */ virtual BodyPartMemento *memento() const = 0; - enum Display { - None, AsIcon, Inline - }; - /** - @return whether this body part should be displayed iconic or inline - */ - virtual Display defaultDisplay() const = 0; - /** Returns the KMime::Content node represented here. Makes most of the above obsolete and probably should be used in the interfaces in the first place. */ diff --git a/mimetreeparser/src/objecttreeparser.cpp b/mimetreeparser/src/objecttreeparser.cpp --- a/mimetreeparser/src/objecttreeparser.cpp +++ b/mimetreeparser/src/objecttreeparser.cpp @@ -198,10 +198,6 @@ Q_ASSERT(!formatters.empty()); for (auto formatter : formatters) { PartNodeBodyPart part(this, &processResult, mTopLevelContent, node, mNodeHelper); - // Set the default display strategy for this body part relying on the - // identity of Interface::BodyPart::Display and AttachmentStrategy::Display - part.setDefaultDisplay((Interface::BodyPart::Display)attachmentStrategy()->defaultDisplay(node)); - mNodeHelper->setNodeDisplayedEmbedded(node, true); const MessagePart::Ptr result = formatter->process(part); diff --git a/mimetreeparser/src/partnodebodypart.h b/mimetreeparser/src/partnodebodypart.h --- a/mimetreeparser/src/partnodebodypart.h +++ b/mimetreeparser/src/partnodebodypart.h @@ -55,8 +55,6 @@ explicit PartNodeBodyPart(ObjectTreeParser *otp, ProcessResult *result, KMime::Content *topLevelContent, KMime::Content *content, NodeHelper *nodeHelper); Interface::BodyPartMemento *memento() const override; - BodyPart::Display defaultDisplay() const override; - void setDefaultDisplay(BodyPart::Display); KMime::Content *content() const override { return mContent; @@ -86,7 +84,6 @@ private: KMime::Content *mTopLevelContent = nullptr; KMime::Content *mContent = nullptr; - BodyPart::Display mDefaultDisplay; NodeHelper *mNodeHelper = nullptr; ObjectTreeParser *mObjectTreeParser = nullptr; ProcessResult *mProcessResult = nullptr; diff --git a/mimetreeparser/src/partnodebodypart.cpp b/mimetreeparser/src/partnodebodypart.cpp --- a/mimetreeparser/src/partnodebodypart.cpp +++ b/mimetreeparser/src/partnodebodypart.cpp @@ -43,7 +43,6 @@ : Interface::BodyPart() , mTopLevelContent(topLevelContent) , mContent(content) - , mDefaultDisplay(Interface::BodyPart::None) , mNodeHelper(nodeHelper) , mObjectTreeParser(otp) , mProcessResult(result) @@ -58,15 +57,7 @@ return mNodeHelper->bodyPartMemento(mContent, "__plugin__"); } -Interface::BodyPart::Display PartNodeBodyPart::defaultDisplay() const -{ - return mDefaultDisplay; -} -void PartNodeBodyPart::setDefaultDisplay(Interface::BodyPart::Display d) -{ - mDefaultDisplay = d; -} Interface::ObjectTreeSource *PartNodeBodyPart::source() const {