4 files changed, 55 insertions, 43 deletions

diff --git a/framework/src/async.h b/framework/src/async.h
new file mode 100644
index 00000000..34233244
--- /dev/null
+++ b/framework/src/async.h
@@ -0,0 +1,40 @@
+/*
+    Copyright (c) 2017 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+#pragma once
+
+#include <QtConcurrent/QtConcurrentRun>
+#include <QFuture>
+#include <QFutureWatcher>
+#include <QPointer>
+
+template<typename T>
+void asyncRun(QObject *object, std::function<T()> run, std::function<void(T)> continuation)
+{
+    auto guard = QPointer<QObject>{object};
+    auto future = QtConcurrent::run(run);
+    auto watcher = new QFutureWatcher<T>;
+    QObject::connect(watcher, &QFutureWatcher<T>::finished, watcher, [watcher, continuation, guard]() {
+        if (guard) {
+            continuation(watcher->future().result());
+        }
+        delete watcher;
+    });
+    watcher->setFuture(future);
+}
+
diff --git a/framework/src/domain/composercontroller.cpp b/framework/src/domain/composercontroller.cpp
index 471c30f8..e3218007 100644
--- a/framework/src/domain/composercontroller.cpp
+++ b/framework/src/domain/composercontroller.cpp
@@ -17,22 +17,16 @@
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301, USA.
 */
-
-
 #include "composercontroller.h"
 #include <settings/settings.h>
 #include <KMime/Message>
 #include <QVariant>
-#include <QSortFilterProxyModel>
 #include <QList>
 #include <QDebug>
 #include <QMimeDatabase>
 #include <QUrlQuery>
 #include <QFileInfo>
 #include <QFile>
-#include <QtConcurrent/QtConcurrentRun>
-#include <QFuture>
-#include <QFutureWatcher>
 #include <sink/store.h>
 #include <sink/log.h>
 
@@ -40,6 +34,7 @@
 #include "recepientautocompletionmodel.h"
 #include "mime/mailtemplates.h"
 #include "mime/mailcrypto.h"
+#include "async.h"
 
 std::vector<GpgME::Key> &operator+=(std::vector<GpgME::Key> &list, const std::vector<GpgME::Key> &add)
 {
@@ -97,21 +92,6 @@ public:
     }
 };
 
-template<typename T>
-void asyncRun(QObject *object, std::function<T()> run, std::function<void(T)> continuation)
-{
-    auto guard = QPointer<QObject>{object};
-    auto future = QtConcurrent::run(run);
-    auto watcher = new QFutureWatcher<T>;
-    QObject::connect(watcher, &QFutureWatcher<T>::finished, watcher, [watcher, continuation, guard]() {
-        if (guard) {
-            continuation(watcher->future().result());
-        }
-        delete watcher;
-    });
-    watcher->setFuture(future);
-}
-
 class AddresseeController : public Kube::ListPropertyController
 {
 public:
diff --git a/framework/src/domain/composercontroller.h b/framework/src/domain/composercontroller.h
index 70a88900..df3c7b1b 100644
--- a/framework/src/domain/composercontroller.h
+++ b/framework/src/domain/composercontroller.h
@@ -22,10 +22,8 @@
 
 #include <QObject>
 #include <QString>
-#include <QStringList>
-#include <QStringListModel>
-#include <QStandardItemModel>
 #include <QVariant>
+#include <QStandardItemModel>
 #include <sink/applicationdomaintype.h>
 #include <KMime/Message>
 #include <gpgme++/key.h>
diff --git a/framework/src/domain/mime/messageparser.cpp b/framework/src/domain/mime/messageparser.cpp
index 6dc880f3..bc7535ec 100644
--- a/framework/src/domain/mime/messageparser.cpp
+++ b/framework/src/domain/mime/messageparser.cpp
@@ -18,15 +18,12 @@
 */
 #include "messageparser.h"
 
+#include <mimetreeparser/objecttreeparser.h>
+
 #include "partmodel.h"
 #include "attachmentmodel.h"
 #include "modeltest.h"
-#include <mimetreeparser/objecttreeparser.h>
-
-#include <QDebug>
-#include <QtConcurrent/QtConcurrentRun>
-#include <QFuture>
-#include <QFutureWatcher>
+#include "async.h"
 
 class MessagePartPrivate
 {
@@ -54,19 +51,16 @@ QVariant MessageParser::message() const
 void MessageParser::setMessage(const QVariant &message)
 {
     mRawContent = message.toString();
-    auto future = QtConcurrent::run([message] {
-        auto parser = std::make_shared<MimeTreeParser::ObjectTreeParser>();
-        parser->parseObjectTree(message.toByteArray());
-        parser->decryptParts();
-        return parser;
-    });
-    auto watcher = new QFutureWatcher<std::shared_ptr<MimeTreeParser::ObjectTreeParser>>;
-    QObject::connect(watcher, &QFutureWatcher<std::shared_ptr<MimeTreeParser::ObjectTreeParser>>::finished, watcher, [this, watcher]() {
-        d->mParser = watcher->future().result();
-        delete watcher;
-        emit htmlChanged();
-    });
-    watcher->setFuture(future);
+    asyncRun<std::shared_ptr<MimeTreeParser::ObjectTreeParser>>(this, [=] {
+            auto parser = std::make_shared<MimeTreeParser::ObjectTreeParser>();
+            parser->parseObjectTree(message.toByteArray());
+            parser->decryptParts();
+            return parser;
+        },
+        [this](const std::shared_ptr<MimeTreeParser::ObjectTreeParser> &parser) {
+            d->mParser = parser;
+            emit htmlChanged();
+        });
 }
 
 QString MessageParser::rawContent() const