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

Use if constexpr (C++17 feature)

Browse Source
This commit is contained in:
Mat Sutcliffe
2021-04-17 21:57:20 +01:00
parent 5d67cd9f68
commit d7a461ff7a
11 changed files with 103 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/blackmisc/worker.h
View File

@@ -211,7 +211,11 @@ namespace BlackMisc
static CWorker *fromTask(QObject *owner, const QString &name, 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 fromResultOf(std::move(task), 0); });
return fromTaskImpl(owner, name, typeId, [task = std::forward<F>(task)]() mutable
{
if constexpr (std::is_void_v<decltype(task())>) { std::move(task)(); return QVariant(); }
else { return QVariant::fromValue(std::move(task)()); }
});
}
//! Connects to a functor to which will be passed the result when the task is finished.
@@ -255,11 +259,6 @@ namespace BlackMisc
CWorker(const std::function<QVariant()> &task) : m_task(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_v<decltype(func())>, int>) { func(); return QVariant(); }
template <typename F>
static auto fromResultOf(F &&func, std::enable_if_t<!std::is_void_v<decltype(func())>, int>) { return QVariant::fromValue(func()); }
template <typename R>
R resultNoWait() { Q_ASSERT(m_result.canConvert<R>()); return m_result.value<R>(); }