diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-09-15 11:58:26 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-09-15 16:22:56 +0200 |
commit | 98e17d6a8ecd46a9d6956d81f781b05e940387e4 (patch) | |
tree | b2d6164478b3356c6683d41af8b84900fce5a013 /framework/actions/actionhandler.cpp | |
parent | 711ac9758976f1e2412b28b7b1a80780eec4641f (diff) | |
download | kube-98e17d6a8ecd46a9d6956d81f781b05e940387e4.tar.gz kube-98e17d6a8ecd46a9d6956d81f781b05e940387e4.zip |
Adapt to KAsync changes.
Diffstat (limited to 'framework/actions/actionhandler.cpp')
-rw-r--r-- | framework/actions/actionhandler.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
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) | |||
106 | handlerFunction(context); | 106 | handlerFunction(context); |
107 | result.setDone(); | 107 | result.setDone(); |
108 | } else { | 108 | } else { |
109 | jobHandlerFunction(context).then<void>([=]() { | 109 | jobHandlerFunction(context).syncThen<void>([=](const KAsync::Error &error) { |
110 | auto modifyableResult = result; | 110 | auto modifyableResult = result; |
111 | modifyableResult.setDone(); | 111 | if (error) { |
112 | }, | 112 | qWarning() << "Job failed: " << error.errorCode << error.errorMessage; |
113 | [=](int errorCode, const QString &string) { | 113 | modifyableResult.setError(1); |
114 | qWarning() << "Job failed: " << errorCode << string; | 114 | } |
115 | auto modifyableResult = result; | ||
116 | modifyableResult.setError(1); | ||
117 | modifyableResult.setDone(); | 115 | modifyableResult.setDone(); |
118 | }).exec(); | 116 | }).exec(); |
119 | } | 117 | } |