From 3f93933d66f872c9954ef0fbb6b3ef9f2ab8178d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20Knau=C3=9F?= Date: Mon, 28 Nov 2016 10:46:36 +0100 Subject: create a complete tree for every content type, so that qml can deside what to show --- framework/domain/messageparser_new.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'framework/domain') diff --git a/framework/domain/messageparser_new.cpp b/framework/domain/messageparser_new.cpp index b95a6472..c15958c6 100644 --- a/framework/domain/messageparser_new.cpp +++ b/framework/domain/messageparser_new.cpp @@ -113,13 +113,15 @@ public: auto entry = new Entry(mNewModelPrivate); entry->mData = mNewModelPrivate->getVar(part); addChild(entry); - foreach(const auto &content, part->content()) { - auto _entry = entry; - _entry = _entry->addEncryptions(content->encryptions().mid(part->encryptions().size())); - _entry = _entry->addSignatures(content->signatures().mid(part->signatures().size())); - auto c = new Entry(mNewModelPrivate); - c->mData = mNewModelPrivate->getVar(content); - _entry->addChild(c); + foreach(const auto &content, part->availableContents()) { + foreach(const auto &contentPart, part->content(content)) { + auto _entry = entry; + _entry = _entry->addEncryptions(contentPart->encryptions().mid(part->encryptions().size())); + _entry = _entry->addSignatures(contentPart->signatures().mid(part->signatures().size())); + auto c = new Entry(mNewModelPrivate); + c->mData = mNewModelPrivate->getVar(contentPart); + _entry->addChild(c); + } } foreach(const auto &sp, part->subParts()) { auto _entry = entry; -- cgit v1.2.3