From 20f9d05d780f160f2918fc96dbbc49c683104fce Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Thu, 25 Jan 2018 11:57:40 +0100
Subject: Remvoed unused code

---
 .../src/domain/mime/mimetreeparser/objecttreeparser.cpp      | 12 ++++++------
 framework/src/domain/mime/mimetreeparser/objecttreeparser.h  |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'framework')

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
     return mParsedPart;
 }
 
-MessagePartPtr ObjectTreeParser::processType(KMime::Content *node, const QByteArray &mediaType, const QByteArray &subType, bool onlyOneMimePart)
+MessagePartPtr ObjectTreeParser::processType(KMime::Content *node, const QByteArray &mediaType, const QByteArray &subType)
 {
     static MimeTreeParser::BodyPartFormatterBaseFactory factory;
     const auto sub = factory.subtypeRegistry(mediaType.constData());
@@ -455,18 +455,18 @@ MessagePart::Ptr ObjectTreeParser::parseObjectTreeInternal(KMime::Content *node,
         }
 
         //Try the specific type handler
-        if (auto mp = processType(node, mediaType, subType, onlyOneMimePart)) {
+        if (auto mp = processType(node, mediaType, subType)) {
             if (mp) {
                 parsedPart->appendSubPart(mp);
             }
         //Fallback to the generic handler
-        } else if (auto mp = processType(node, mediaType, "*", onlyOneMimePart)) {
+        } else if (auto mp = processType(node, mediaType, "*")) {
             if (mp) {
                 parsedPart->appendSubPart(mp);
             }
         //Fallback to the default handler
         } else {
-            if (auto mp = defaultHandling(node, onlyOneMimePart)) {
+            if (auto mp = defaultHandling(node)) {
                 parsedPart->appendSubPart(mp);
             }
         }
@@ -480,14 +480,14 @@ MessagePart::Ptr ObjectTreeParser::parseObjectTreeInternal(KMime::Content *node,
     return parsedPart;
 }
 
-MessagePart::Ptr ObjectTreeParser::defaultHandling(KMime::Content *node, bool onlyOneMimePart)
+MessagePart::Ptr ObjectTreeParser::defaultHandling(KMime::Content *node)
 {
     if (node->contentType()->mimeType() == QByteArrayLiteral("application/octet-stream") &&
             (node->contentType()->name().endsWith(QLatin1String("p7m")) ||
              node->contentType()->name().endsWith(QLatin1String("p7s")) ||
              node->contentType()->name().endsWith(QLatin1String("p7c"))
             )) {
-        if (auto mp = processType(node, "application", "pkcs7-mime", onlyOneMimePart)) {
+        if (auto mp = processType(node, "application", "pkcs7-mime")) {
             return mp;
         }
     }
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:
     * top-level content.
     */
     MessagePartPtr parseObjectTreeInternal(KMime::Content *node, bool mOnlyOneMimePart);
-    MessagePartPtr processType(KMime::Content *node, const QByteArray &mediaType, const QByteArray &subType, bool onlyOneMimePart);
+    MessagePartPtr processType(KMime::Content *node, const QByteArray &mediaType, const QByteArray &subType);
 
-    MessagePartPtr defaultHandling(KMime::Content *node, bool onlyOneMimePart);
+    MessagePartPtr defaultHandling(KMime::Content *node);
 
 private:
 
-- 
cgit v1.2.3