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

Assert earlier when thenWithResult type doesn't match lambda return type.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-10-18 19:22:27 +01:00
parent 3dc99189ec
commit feeca47060
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackmisc/worker.cpp
View File

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

17
src/blackmisc/worker.h
View File

@@ -213,20 +213,29 @@ namespace BlackMisc
template <typename F>
static CWorker *fromTask(QObject *owner, const QString &name, F task)
{
return fromTaskImpl(owner, name, [task]() { return CVariant::fromResultOf(task); });
int typeId = qMetaTypeId<typename std::decay<decltype(task())>::type>();
return fromTaskImpl(owner, name, typeId, [task]() { return CVariant::fromResultOf(task); });
}
//! Connects to a functor to which will be passed the result when the task is finished.
//! \tparam R The return type of the task.
//! \threadsafe
template <typename R, typename F>
void thenWithResult(F functor) { then([this, functor]() { functor(this->result<R>()); }); }
void thenWithResult(F functor)
{
Q_ASSERT_X(m_result.canConvert<R>(), Q_FUNC_INFO, "Type in thenWithResult must match return type of task");
then([this, functor]() { functor(this->result<R>()); });
}
//! Connects to a functor or method to which will be passed the result when the task is finished.
//! \tparam R The return type of the task.
//! \threadsafe
template <typename R, typename T, typename F>
void thenWithResult(T *context, F functor) { then(context, [this, context, functor]() { invoke(context, functor, this->result<R>()); }); }
void thenWithResult(T *context, F functor)
{
Q_ASSERT_X(m_result.canConvert<R>(), Q_FUNC_INFO, "Type in thenWithResult must match return type of task");
then(context, [this, context, functor]() { invoke(context, functor, this->result<R>()); });
}
//! Returns the result of the task, waiting for it to finish if necessary.
//! \tparam R The return type of the task.
@@ -240,7 +249,7 @@ namespace BlackMisc
private:
CWorker(std::function<CVariant()> task) : m_task(task) {}
static CWorker *fromTaskImpl(QObject *owner, const QString &name, std::function<CVariant()> task);
static CWorker *fromTaskImpl(QObject *owner, const QString &name, int typeId, std::function<CVariant()> task);
std::function<CVariant()> m_task;
CVariant m_result;