flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-27 02:55:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #77 Break dependency of worker on variant

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-08-29 22:46:28 +01:00
parent 43bb72788e
commit 1c8fd1b47e
3 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/blackmisc/variant.h
View File

@@ -127,12 +127,6 @@ namespace BlackMisc
return CVariant(QVariant::fromValue(std::forward<T>(value))); return CVariant(QVariant::fromValue(std::forward<T>(value)));
} }
//! Call a function and construct a variant from its return value.
template <typename F> static CVariant fromResultOf(F &&func)
{
return fromResultOfImpl(std::forward<F>(func), typename std::is_void<decltype(func())>::type());
}
//! Change the value. //! Change the value.
template <typename T> void setValue(T &&value) { m_v.setValue(std::forward<T>(value)); } template <typename T> void setValue(T &&value) { m_v.setValue(std::forward<T>(value)); }
@@ -296,9 +290,6 @@ namespace BlackMisc
return result; return result;
} }
bool isVariantList() const; bool isVariantList() const;
template <typename F> static CVariant fromResultOfImpl(F &&func, std::true_type) { std::forward<F>(func)(); return {}; }
template <typename F> static CVariant fromResultOfImpl(F &&func, std::false_type) { return from(std::forward<F>(func)()); }
}; };
} // namespace } // namespace

4
src/blackmisc/worker.cpp
View File

@@ -67,14 +67,14 @@ namespace BlackMisc
Q_UNUSED(ok) Q_UNUSED(ok)
} }
CWorker *CWorker::fromTaskImpl(QObject *owner, const QString &name, int typeId, const std::function<CVariant()> &task) CWorker *CWorker::fromTaskImpl(QObject *owner, const QString &name, int typeId, const std::function<QVariant()> &task)
{ {
auto *worker = new CWorker(task); auto *worker = new CWorker(task);
emit worker->aboutToStart(); emit worker->aboutToStart();
worker->setStarted(); worker->setStarted();
auto *thread = new CRegularThread(owner); auto *thread = new CRegularThread(owner);
if (typeId != QMetaType::Void) { worker->m_result = CVariant(typeId, nullptr); } if (typeId != QMetaType::Void) { worker->m_result = QVariant(typeId, nullptr); }
const QString ownerName = owner->objectName().isEmpty() ? owner->metaObject()->className() : owner->objectName(); const QString ownerName = owner->objectName().isEmpty() ? owner->metaObject()->className() : owner->objectName();
thread->setObjectName(ownerName + ":" + name); thread->setObjectName(ownerName + ":" + name);

17
src/blackmisc/worker.h
View File

@@ -17,7 +17,6 @@
#include "blackmisc/invoke.h" #include "blackmisc/invoke.h"
#include "blackmisc/promise.h" #include "blackmisc/promise.h"
#include "blackmisc/stacktrace.h" #include "blackmisc/stacktrace.h"
#include "blackmisc/variant.h"
#include <QFuture> #include <QFuture>
#include <QMetaObject> #include <QMetaObject>
@@ -30,6 +29,7 @@
#include <QString> #include <QString>
#include <QThread> #include <QThread>
#include <QTimer> #include <QTimer>
#include <QVariant>
#include <QWeakPointer> #include <QWeakPointer>
#include <QtGlobal> #include <QtGlobal>
#include <algorithm> #include <algorithm>
@@ -211,7 +211,7 @@ namespace BlackMisc
static CWorker *fromTask(QObject *owner, const QString &name, F &&task) static CWorker *fromTask(QObject *owner, const QString &name, F &&task)
{ {
int typeId = qMetaTypeId<std::decay_t<decltype(std::forward<F>(task)())>>(); int typeId = qMetaTypeId<std::decay_t<decltype(std::forward<F>(task)())>>();
return fromTaskImpl(owner, name, typeId, [task = std::forward<F>(task)]() mutable { return CVariant::fromResultOf(std::move(task)); }); return fromTaskImpl(owner, name, typeId, [task = std::forward<F>(task)]() mutable { return fromResultOf(std::move(task), 0); });
} }
//! Connects to a functor to which will be passed the result when the task is finished. //! Connects to a functor to which will be passed the result when the task is finished.
@@ -252,14 +252,19 @@ namespace BlackMisc
void ps_runTask(); void ps_runTask();
private: private:
CWorker(const std::function<CVariant()> &task) : m_task(task) {} CWorker(const std::function<QVariant()> &task) : m_task(task) {}
static CWorker *fromTaskImpl(QObject *owner, const QString &name, int typeId, const std::function<CVariant()> &task); static CWorker *fromTaskImpl(QObject *owner, const QString &name, int typeId, const std::function<QVariant()> &task);
template <typename F>
static auto fromResultOf(F &&func, std::enable_if_t<std::is_void<decltype(func())>::value, int>) { func(); return QVariant(); }
template <typename F>
static auto fromResultOf(F &&func, std::enable_if_t<!std::is_void<decltype(func())>::value, int>) { return QVariant::fromValue(func()); }
template <typename R> template <typename R>
R resultNoWait() { Q_ASSERT(m_result.canConvert<R>()); return m_result.value<R>(); } R resultNoWait() { Q_ASSERT(m_result.canConvert<R>()); return m_result.value<R>(); }
std::function<CVariant()> m_task; std::function<QVariant()> m_task;
CVariant m_result; QVariant m_result;
}; };
/*! /*!