refactor(core,registry): use std::async instead of QtConcurrent::run

zealdocs · Jul 19, 2021 · dbb8eb2 · dbb8eb2
1 parent 8854bf5
commit dbb8eb2
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 45 deletions.
diff --git a/src/libs/core/filemanager.cpp b/src/libs/core/filemanager.cpp
@@ -31,7 +31,7 @@
 #include <QFutureWatcher>
 #include <QLoggingCategory>
 
-#include <QtConcurrent>
+#include <future>
 
 using namespace Zeal::Core;
 
@@ -64,20 +64,17 @@ bool FileManager::removeRecursively(const QString &path)
 
     qCDebug(log, "Renamed '%s' to '%s'.", qPrintable(path), qPrintable(deletePath));
 
-    auto watcher = new QFutureWatcher<bool>();
-    connect(watcher, &QFutureWatcher<bool>::finished, [=] {
-        if (!watcher->result()) {
-            qCWarning(log, "Failed to remove '%s'.", qPrintable(deletePath));
-        } else {
-            qCDebug(log, "Removed '%s'.", qPrintable(deletePath));
-        }
-
-        watcher->deleteLater();
+    std::future<bool> f = std::async(std::launch::async, [deletePath](){
+        return QDir(deletePath).removeRecursively();
     });
 
-    watcher->setFuture(QtConcurrent::run([deletePath] {
-        return QDir(deletePath).removeRecursively();
-    }));
+    f.wait();
+
+    if (!f.get()) {
+        qCWarning(log, "Failed to remove '%s'.", qPrintable(deletePath));
+    } else {
+        qCDebug(log, "Removed '%s'.", qPrintable(deletePath));
+    }
 
     return true;
 }
diff --git a/src/libs/registry/docsetregistry.cpp b/src/libs/registry/docsetregistry.cpp
@@ -37,6 +37,7 @@
 #include <QtConcurrent>
 
 #include <functional>
+#include <future>
 
 using namespace Zeal::Registry;
 
@@ -122,45 +123,41 @@ QStringList DocsetRegistry::names() const
 
 void DocsetRegistry::loadDocset(const QString &path)
 {
-    auto watcher = new QFutureWatcher<Docset *>();
-    connect(watcher, &QFutureWatcher<Docset *>::finished, this, [this, watcher] {
-        QScopedPointer<QFutureWatcher<Docset *>, QScopedPointerDeleteLater> guard(watcher);
-
-        Docset *docset = watcher->result();
-        // TODO: Emit error
-        if (!docset->isValid()) {
-            qWarning("Could not load docset from '%s'. Reinstall the docset.",
-                     qPrintable(docset->path()));
-            delete docset;
-            return;
-        }
+    std::future<Docset *> f = std::async(std::launch::async, [path](){
+        return new Docset(path);
+    });
 
-        docset->setFuzzySearchEnabled(m_fuzzySearchEnabled);
+    f.wait();
+    Docset *docset = f.get();
+    // TODO: Emit error
+    if (!docset->isValid()) {
+        qWarning("Could not load docset from '%s'. Reinstall the docset.",
+                 qPrintable(docset->path()));
+        delete docset;
+        return;
+    }
 
-        const QString name = docset->name();
-        if (m_docsets.contains(name)) {
-            unloadDocset(name);
-        }
+    docset->setFuzzySearchEnabled(m_fuzzySearchEnabled);
 
-        // Setup HTTP mount.
-        QUrl url = Core::Application::instance()->httpServer()->mount(name, docset->documentPath());
-        if (url.isEmpty()) {
-            qWarning("Could not enable docset from '%s'. Reinstall the docset.",
-                     qPrintable(docset->path()));
-            delete docset;
-            return;
-        }
+    const QString name = docset->name();
+    if (m_docsets.contains(name)) {
+        unloadDocset(name);
+    }
 
-        docset->setBaseUrl(url);
+    // Setup HTTP mount.
+    QUrl url = Core::Application::instance()->httpServer()->mount(name, docset->documentPath());
+    if (url.isEmpty()) {
+        qWarning("Could not enable docset from '%s'. Reinstall the docset.",
+                 qPrintable(docset->path()));
+        delete docset;
+        return;
+    }
 
-        m_docsets[name] = docset;
+    docset->setBaseUrl(url);
 
-        emit docsetLoaded(name);
-    });
+    m_docsets[name] = docset;
 
-    watcher->setFuture(QtConcurrent::run([path] {
-        return new Docset(path);
-    }));
+    emit docsetLoaded(name);
 }
 
 void DocsetRegistry::unloadDocset(const QString &name)