diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-06-05 16:21:07 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-06-05 16:21:07 +0200 |
commit | b855ff80c908cec835dc888899fd168abcf842ae (patch) | |
tree | 79ff223eff147e3e7c89a9e8bcdbebef87828efb | |
parent | ae55044fe476262f68ef8ffddbad168b55bdfe6b (diff) | |
download | kube-b855ff80c908cec835dc888899fd168abcf842ae.tar.gz kube-b855ff80c908cec835dc888899fd168abcf842ae.zip |
Resolved some warnings
-rw-r--r-- | framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp b/framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp index a37c8b27..b137be87 100644 --- a/framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp +++ b/framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp | |||
@@ -213,27 +213,6 @@ static QVector<MessagePart::Ptr> collect(MessagePart::Ptr start, const std::func | |||
213 | return list; | 213 | return list; |
214 | } | 214 | } |
215 | 215 | ||
216 | static bool isAttachment(MessagePart::Ptr part) | ||
217 | { | ||
218 | //TODO | ||
219 | // show everything but the first text/plain body as attachment | ||
220 | if (part->disposition() == MessagePart::Inline) { | ||
221 | return false; | ||
222 | } | ||
223 | if (part->disposition() == MessagePart::Attachment) { | ||
224 | return true; | ||
225 | } | ||
226 | // text/* w/o filename parameter should go inline | ||
227 | if (part->node()) { | ||
228 | const auto ct = part->node()->contentType(false); | ||
229 | if (ct && ct->isText() && ct->name().trimmed().isEmpty() && part->filename().trimmed().isEmpty()) { | ||
230 | return false; | ||
231 | } | ||
232 | return true; | ||
233 | } | ||
234 | return false; | ||
235 | } | ||
236 | |||
237 | QVector<MessagePart::Ptr> ObjectTreeParser::collectContentParts() | 216 | QVector<MessagePart::Ptr> ObjectTreeParser::collectContentParts() |
238 | { | 217 | { |
239 | QVector<MessagePart::Ptr> contentParts = ::collect(mParsedPart, | 218 | QVector<MessagePart::Ptr> contentParts = ::collect(mParsedPart, |
@@ -242,7 +221,7 @@ QVector<MessagePart::Ptr> ObjectTreeParser::collectContentParts() | |||
242 | return true; | 221 | return true; |
243 | }, | 222 | }, |
244 | [] (const MessagePartPtr &part) { | 223 | [] (const MessagePartPtr &part) { |
245 | if (const auto attachment = dynamic_cast<MimeTreeParser::AttachmentMessagePart*>(part.data())) { | 224 | if (dynamic_cast<MimeTreeParser::AttachmentMessagePart*>(part.data())) { |
246 | return false; | 225 | return false; |
247 | } else if (const auto text = dynamic_cast<MimeTreeParser::TextMessagePart*>(part.data())) { | 226 | } else if (const auto text = dynamic_cast<MimeTreeParser::TextMessagePart*>(part.data())) { |
248 | auto enc = dynamic_cast<MimeTreeParser::EncryptedMessagePart*>(text->parentPart()); | 227 | auto enc = dynamic_cast<MimeTreeParser::EncryptedMessagePart*>(text->parentPart()); |
@@ -250,9 +229,9 @@ QVector<MessagePart::Ptr> ObjectTreeParser::collectContentParts() | |||
250 | return false; | 229 | return false; |
251 | } | 230 | } |
252 | return true; | 231 | return true; |
253 | } else if (const auto alternative = dynamic_cast<MimeTreeParser::AlternativeMessagePart*>(part.data())) { | 232 | } else if (dynamic_cast<MimeTreeParser::AlternativeMessagePart*>(part.data())) { |
254 | return true; | 233 | return true; |
255 | } else if (const auto html = dynamic_cast<MimeTreeParser::HtmlMessagePart*>(part.data())) { | 234 | } else if (dynamic_cast<MimeTreeParser::HtmlMessagePart*>(part.data())) { |
256 | return true; | 235 | return true; |
257 | } else if (const auto enc = dynamic_cast<MimeTreeParser::EncryptedMessagePart*>(part.data())) { | 236 | } else if (const auto enc = dynamic_cast<MimeTreeParser::EncryptedMessagePart*>(part.data())) { |
258 | if (enc->error()) { | 237 | if (enc->error()) { |
@@ -392,7 +371,7 @@ void ObjectTreeParser::parseObjectTree(KMime::Content *node) | |||
392 | return true; | 371 | return true; |
393 | }, | 372 | }, |
394 | [] (const MessagePartPtr &part) { | 373 | [] (const MessagePartPtr &part) { |
395 | if (const auto html = dynamic_cast<MimeTreeParser::HtmlMessagePart*>(part.data())) { | 374 | if (dynamic_cast<MimeTreeParser::HtmlMessagePart*>(part.data())) { |
396 | return true; | 375 | return true; |
397 | } | 376 | } |
398 | return false; | 377 | return false; |