diff options
Diffstat (limited to 'framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp')
-rw-r--r-- | framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp b/framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp index 8d8ddf12..0c3f60aa 100644 --- a/framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp +++ b/framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp | |||
@@ -64,9 +64,7 @@ using namespace MimeTreeParser; | |||
64 | ObjectTreeParser::ObjectTreeParser() | 64 | ObjectTreeParser::ObjectTreeParser() |
65 | : mNodeHelper(nullptr), | 65 | : mNodeHelper(nullptr), |
66 | mTopLevelContent(nullptr), | 66 | mTopLevelContent(nullptr), |
67 | mShowOnlyOneMimePart(false), | 67 | mShowOnlyOneMimePart(false) |
68 | mHasPendingAsyncJobs(false), | ||
69 | mAllowAsync(false) | ||
70 | { | 68 | { |
71 | init(); | 69 | init(); |
72 | } | 70 | } |
@@ -75,9 +73,7 @@ ObjectTreeParser::ObjectTreeParser(MimeTreeParser::NodeHelper *nodeHelper, | |||
75 | bool showOnlyOneMimePart) | 73 | bool showOnlyOneMimePart) |
76 | : mNodeHelper(nodeHelper), | 74 | : mNodeHelper(nodeHelper), |
77 | mTopLevelContent(nullptr), | 75 | mTopLevelContent(nullptr), |
78 | mShowOnlyOneMimePart(showOnlyOneMimePart), | 76 | mShowOnlyOneMimePart(showOnlyOneMimePart) |
79 | mHasPendingAsyncJobs(false), | ||
80 | mAllowAsync(false) | ||
81 | { | 77 | { |
82 | init(); | 78 | init(); |
83 | } | 79 | } |
@@ -100,22 +96,6 @@ ObjectTreeParser::~ObjectTreeParser() | |||
100 | } | 96 | } |
101 | } | 97 | } |
102 | 98 | ||
103 | void ObjectTreeParser::setAllowAsync(bool allow) | ||
104 | { | ||
105 | Q_ASSERT(!mHasPendingAsyncJobs); | ||
106 | mAllowAsync = allow; | ||
107 | } | ||
108 | |||
109 | bool ObjectTreeParser::allowAsync() const | ||
110 | { | ||
111 | return mAllowAsync; | ||
112 | } | ||
113 | |||
114 | bool ObjectTreeParser::hasPendingAsyncJobs() const | ||
115 | { | ||
116 | return mHasPendingAsyncJobs; | ||
117 | } | ||
118 | |||
119 | QString ObjectTreeParser::plainTextContent() const | 99 | QString ObjectTreeParser::plainTextContent() const |
120 | { | 100 | { |
121 | return mPlainTextContent; | 101 | return mPlainTextContent; |
@@ -424,9 +404,6 @@ MessagePart::Ptr ObjectTreeParser::parseObjectTreeInternal(KMime::Content *node, | |||
424 | return MessagePart::Ptr(); | 404 | return MessagePart::Ptr(); |
425 | } | 405 | } |
426 | 406 | ||
427 | // reset pending async jobs state (we'll rediscover pending jobs as we go) | ||
428 | mHasPendingAsyncJobs = false; | ||
429 | |||
430 | // reset "processed" flags for... | 407 | // reset "processed" flags for... |
431 | if (onlyOneMimePart) { | 408 | if (onlyOneMimePart) { |
432 | // ... this node and all descendants | 409 | // ... this node and all descendants |