summaryrefslogtreecommitdiffstats
path: root/framework/src
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2018-01-25 11:57:40 +0100
committerChristian Mollekopf <chrigi_1@fastmail.fm>2018-01-25 14:03:13 +0100
commit20f9d05d780f160f2918fc96dbbc49c683104fce (patch)
treef910ff3b2038e63d483881c5dc48ec51d8363dc3 /framework/src
parent435c2ccf9369f72b6036e594e9a82a8d0f667709 (diff)
downloadkube-20f9d05d780f160f2918fc96dbbc49c683104fce.tar.gz
kube-20f9d05d780f160f2918fc96dbbc49c683104fce.zip
Remvoed unused code
Diffstat (limited to 'framework/src')
-rw-r--r--framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp12
-rw-r--r--framework/src/domain/mime/mimetreeparser/objecttreeparser.h4
2 files changed, 8 insertions, 8 deletions
diff --git a/framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp b/framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp
index 9102595f..b5cbd35b 100644
--- a/framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp
+++ b/framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp
@@ -395,7 +395,7 @@ MessagePartPtr ObjectTreeParser::parsedPart() const
395 return mParsedPart; 395 return mParsedPart;
396} 396}
397 397
398MessagePartPtr ObjectTreeParser::processType(KMime::Content *node, const QByteArray &mediaType, const QByteArray &subType, bool onlyOneMimePart) 398MessagePartPtr ObjectTreeParser::processType(KMime::Content *node, const QByteArray &mediaType, const QByteArray &subType)
399{ 399{
400 static MimeTreeParser::BodyPartFormatterBaseFactory factory; 400 static MimeTreeParser::BodyPartFormatterBaseFactory factory;
401 const auto sub = factory.subtypeRegistry(mediaType.constData()); 401 const auto sub = factory.subtypeRegistry(mediaType.constData());
@@ -455,18 +455,18 @@ MessagePart::Ptr ObjectTreeParser::parseObjectTreeInternal(KMime::Content *node,
455 } 455 }
456 456
457 //Try the specific type handler 457 //Try the specific type handler
458 if (auto mp = processType(node, mediaType, subType, onlyOneMimePart)) { 458 if (auto mp = processType(node, mediaType, subType)) {
459 if (mp) { 459 if (mp) {
460 parsedPart->appendSubPart(mp); 460 parsedPart->appendSubPart(mp);
461 } 461 }
462 //Fallback to the generic handler 462 //Fallback to the generic handler
463 } else if (auto mp = processType(node, mediaType, "*", onlyOneMimePart)) { 463 } else if (auto mp = processType(node, mediaType, "*")) {
464 if (mp) { 464 if (mp) {
465 parsedPart->appendSubPart(mp); 465 parsedPart->appendSubPart(mp);
466 } 466 }
467 //Fallback to the default handler 467 //Fallback to the default handler
468 } else { 468 } else {
469 if (auto mp = defaultHandling(node, onlyOneMimePart)) { 469 if (auto mp = defaultHandling(node)) {
470 parsedPart->appendSubPart(mp); 470 parsedPart->appendSubPart(mp);
471 } 471 }
472 } 472 }
@@ -480,14 +480,14 @@ MessagePart::Ptr ObjectTreeParser::parseObjectTreeInternal(KMime::Content *node,
480 return parsedPart; 480 return parsedPart;
481} 481}
482 482
483MessagePart::Ptr ObjectTreeParser::defaultHandling(KMime::Content *node, bool onlyOneMimePart) 483MessagePart::Ptr ObjectTreeParser::defaultHandling(KMime::Content *node)
484{ 484{
485 if (node->contentType()->mimeType() == QByteArrayLiteral("application/octet-stream") && 485 if (node->contentType()->mimeType() == QByteArrayLiteral("application/octet-stream") &&
486 (node->contentType()->name().endsWith(QLatin1String("p7m")) || 486 (node->contentType()->name().endsWith(QLatin1String("p7m")) ||
487 node->contentType()->name().endsWith(QLatin1String("p7s")) || 487 node->contentType()->name().endsWith(QLatin1String("p7s")) ||
488 node->contentType()->name().endsWith(QLatin1String("p7c")) 488 node->contentType()->name().endsWith(QLatin1String("p7c"))
489 )) { 489 )) {
490 if (auto mp = processType(node, "application", "pkcs7-mime", onlyOneMimePart)) { 490 if (auto mp = processType(node, "application", "pkcs7-mime")) {
491 return mp; 491 return mp;
492 } 492 }
493 } 493 }
diff --git a/framework/src/domain/mime/mimetreeparser/objecttreeparser.h b/framework/src/domain/mime/mimetreeparser/objecttreeparser.h
index d2076be4..695d5356 100644
--- a/framework/src/domain/mime/mimetreeparser/objecttreeparser.h
+++ b/framework/src/domain/mime/mimetreeparser/objecttreeparser.h
@@ -287,9 +287,9 @@ private:
287 * top-level content. 287 * top-level content.
288 */ 288 */
289 MessagePartPtr parseObjectTreeInternal(KMime::Content *node, bool mOnlyOneMimePart); 289 MessagePartPtr parseObjectTreeInternal(KMime::Content *node, bool mOnlyOneMimePart);
290 MessagePartPtr processType(KMime::Content *node, const QByteArray &mediaType, const QByteArray &subType, bool onlyOneMimePart); 290 MessagePartPtr processType(KMime::Content *node, const QByteArray &mediaType, const QByteArray &subType);
291 291
292 MessagePartPtr defaultHandling(KMime::Content *node, bool onlyOneMimePart); 292 MessagePartPtr defaultHandling(KMime::Content *node);
293 293
294private: 294private:
295 295