From 98e17d6a8ecd46a9d6956d81f781b05e940387e4 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Thu, 15 Sep 2016 11:58:26 +0200 Subject: Adapt to KAsync changes. --- framework/actions/actionhandler.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'framework/actions') diff --git a/framework/actions/actionhandler.cpp b/framework/actions/actionhandler.cpp index 4ae8d0a9..9d58f464 100644 --- a/framework/actions/actionhandler.cpp +++ b/framework/actions/actionhandler.cpp @@ -106,14 +106,12 @@ ActionResult ActionHandlerHelper::execute(Context *context) handlerFunction(context); result.setDone(); } else { - jobHandlerFunction(context).then([=]() { + jobHandlerFunction(context).syncThen([=](const KAsync::Error &error) { auto modifyableResult = result; - modifyableResult.setDone(); - }, - [=](int errorCode, const QString &string) { - qWarning() << "Job failed: " << errorCode << string; - auto modifyableResult = result; - modifyableResult.setError(1); + if (error) { + qWarning() << "Job failed: " << error.errorCode << error.errorMessage; + modifyableResult.setError(1); + } modifyableResult.setDone(); }).exec(); } -- cgit v1.2.3