Always guard async callbacks

1 files changed, 1 insertions, 21 deletions

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: