From 5b786c5c44c02a34c4e9b5658ee76ece07520c9b Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Thu, 22 Jun 2017 20:36:21 +0200
Subject: Removed async API

---
 .../src/domain/mime/mimetreeparser/messagepart.cpp | 26 ++++++++++-----------
 .../mime/mimetreeparser/objecttreeparser.cpp       | 27 ++--------------------
 .../domain/mime/mimetreeparser/objecttreeparser.h  |  6 -----
 3 files changed, 15 insertions(+), 44 deletions(-)

(limited to 'framework')

diff --git a/framework/src/domain/mime/mimetreeparser/messagepart.cpp b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
index 939554fe..b6244a5a 100644
--- a/framework/src/domain/mime/mimetreeparser/messagepart.cpp
+++ b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
@@ -730,20 +730,20 @@ bool SignedMessagePart::okVerify(const QByteArray &data, const QByteArray &signa
             }
         }
         if (m) {
-            if (mOtp->allowAsync()) {
-                QObject::connect(m, &CryptoBodyPartMemento::update,
-                                 nodeHelper, &NodeHelper::update);
-                // QObject::connect(m, SIGNAL(update(MimeTreeParser::UpdateMode)),
-                //                  _source->sourceObject(), SLOT(update(MimeTreeParser::UpdateMode)));
-
-                if (m->start()) {
-                    mMetaData.inProgress = true;
-                    mOtp->mHasPendingAsyncJobs = true;
-                }
-                //FIXME delete memento once done
-            } else {
+            // if (mOtp->allowAsync()) {
+            //     QObject::connect(m, &CryptoBodyPartMemento::update,
+            //                      nodeHelper, &NodeHelper::update);
+            //     // QObject::connect(m, SIGNAL(update(MimeTreeParser::UpdateMode)),
+            //     //                  _source->sourceObject(), SLOT(update(MimeTreeParser::UpdateMode)));
+
+            //     if (m->start()) {
+            //         mMetaData.inProgress = true;
+            //         mOtp->mHasPendingAsyncJobs = true;
+            //     }
+            //     //FIXME delete memento once done
+            // } else {
                 m->exec();
-            }
+            // }
         }
     //only relevant in async case
     // } else if (m->isRunning()) {
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;
 ObjectTreeParser::ObjectTreeParser()
     : mNodeHelper(nullptr),
       mTopLevelContent(nullptr),
-      mShowOnlyOneMimePart(false),
-      mHasPendingAsyncJobs(false),
-      mAllowAsync(false)
+      mShowOnlyOneMimePart(false)
 {
     init();
 }
@@ -75,9 +73,7 @@ ObjectTreeParser::ObjectTreeParser(MimeTreeParser::NodeHelper *nodeHelper,
                                    bool showOnlyOneMimePart)
     : mNodeHelper(nodeHelper),
       mTopLevelContent(nullptr),
-      mShowOnlyOneMimePart(showOnlyOneMimePart),
-      mHasPendingAsyncJobs(false),
-      mAllowAsync(false)
+      mShowOnlyOneMimePart(showOnlyOneMimePart)
 {
     init();
 }
@@ -100,22 +96,6 @@ ObjectTreeParser::~ObjectTreeParser()
     }
 }
 
-void ObjectTreeParser::setAllowAsync(bool allow)
-{
-    Q_ASSERT(!mHasPendingAsyncJobs);
-    mAllowAsync = allow;
-}
-
-bool ObjectTreeParser::allowAsync() const
-{
-    return mAllowAsync;
-}
-
-bool ObjectTreeParser::hasPendingAsyncJobs() const
-{
-    return mHasPendingAsyncJobs;
-}
-
 QString ObjectTreeParser::plainTextContent() const
 {
     return mPlainTextContent;
@@ -424,9 +404,6 @@ MessagePart::Ptr ObjectTreeParser::parseObjectTreeInternal(KMime::Content *node,
         return MessagePart::Ptr();
     }
 
-    // reset pending async jobs state (we'll rediscover pending jobs as we go)
-    mHasPendingAsyncJobs = false;
-
     // reset "processed" flags for...
     if (onlyOneMimePart) {
         // ... this node and all descendants
diff --git a/framework/src/domain/mime/mimetreeparser/objecttreeparser.h b/framework/src/domain/mime/mimetreeparser/objecttreeparser.h
index d219a52b..9a3f5a5c 100644
--- a/framework/src/domain/mime/mimetreeparser/objecttreeparser.h
+++ b/framework/src/domain/mime/mimetreeparser/objecttreeparser.h
@@ -243,10 +243,6 @@ public:
 
     virtual ~ObjectTreeParser();
 
-    void setAllowAsync(bool allow);
-    bool allowAsync() const;
-
-    bool hasPendingAsyncJobs() const;
     void print();
 
     /**
@@ -330,8 +326,6 @@ private:
     /// the children can be completely displayed again.
     bool mShowOnlyOneMimePart;
 
-    bool mHasPendingAsyncJobs;
-    bool mAllowAsync;
     bool mDeleteNodeHelper;
     KMime::Message::Ptr mMsg;
 
-- 
cgit v1.2.3