diff options
| author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-01-24 10:50:28 +0100 |
|---|---|---|
| committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-01-24 10:50:28 +0100 |
| commit | c607a01b6931604baffef846dccad38f7a71a192 (patch) | |
| tree | 3d29fc49740068c5c66f5da95aea11d884e5a30e /framework/actions | |
| parent | 1bafda42888c37b47bdd5d18118bf3e6912f0f82 (diff) | |
| parent | 07b55e8e8b21873eeb5b39f1306f6665b1630c46 (diff) | |
| download | kube-c607a01b6931604baffef846dccad38f7a71a192.tar.gz kube-c607a01b6931604baffef846dccad38f7a71a192.zip | |
Merge branch 'dev/imapsync' into develop
Diffstat (limited to 'framework/actions')
| -rw-r--r-- | framework/actions/actionhandler.cpp | 2 | ||||
| -rw-r--r-- | framework/actions/actionhandler.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/framework/actions/actionhandler.cpp b/framework/actions/actionhandler.cpp index eb7b3224..99fdf66a 100644 --- a/framework/actions/actionhandler.cpp +++ b/framework/actions/actionhandler.cpp | |||
| @@ -138,7 +138,7 @@ ActionResult ActionHandlerHelper::execute(Context *context) | |||
| 138 | handlerFunction(context); | 138 | handlerFunction(context); |
| 139 | result.setDone(); | 139 | result.setDone(); |
| 140 | } else { | 140 | } else { |
| 141 | jobHandlerFunction(context).syncThen<void>([=](const KAsync::Error &error) { | 141 | jobHandlerFunction(context).then([=](const KAsync::Error &error) { |
| 142 | auto modifyableResult = result; | 142 | auto modifyableResult = result; |
| 143 | if (error) { | 143 | if (error) { |
| 144 | qWarning() << "Job failed: " << error.errorCode << error.errorMessage; | 144 | qWarning() << "Job failed: " << error.errorCode << error.errorMessage; |
diff --git a/framework/actions/actionhandler.h b/framework/actions/actionhandler.h index 5ccf0ac7..c0e1b318 100644 --- a/framework/actions/actionhandler.h +++ b/framework/actions/actionhandler.h | |||
| @@ -73,7 +73,7 @@ public: | |||
| 73 | ActionResult result; | 73 | ActionResult result; |
| 74 | auto wrapper = ContextType{*c}; | 74 | auto wrapper = ContextType{*c}; |
| 75 | execute(wrapper) | 75 | execute(wrapper) |
| 76 | .template syncThen<void>([=](const KAsync::Error &error) { | 76 | .template then([=](const KAsync::Error &error) { |
| 77 | auto modifyableResult = result; | 77 | auto modifyableResult = result; |
| 78 | if (error) { | 78 | if (error) { |
| 79 | qWarning() << "Job failed: " << error.errorCode << error.errorMessage; | 79 | qWarning() << "Job failed: " << error.errorCode << error.errorMessage; |