diff options
Diffstat (limited to 'common')
-rw-r--r-- | common/queryrunner.cpp | 3 | ||||
-rw-r--r-- | common/resourcecontrol.cpp | 8 | ||||
-rw-r--r-- | common/store.cpp | 4 |
3 files changed, 4 insertions, 11 deletions
diff --git a/common/queryrunner.cpp b/common/queryrunner.cpp index 4d05721..22682d3 100644 --- a/common/queryrunner.cpp +++ b/common/queryrunner.cpp | |||
@@ -105,8 +105,7 @@ QueryRunner<DomainType>::QueryRunner(const Sink::Query &query, const Sink::Resou | |||
105 | .template then<void, qint64>([query, this](qint64 newRevision) { | 105 | .template then<void, qint64>([query, this](qint64 newRevision) { |
106 | //Only send the revision replayed information if we're connected to the resource, there's no need to start the resource otherwise. | 106 | //Only send the revision replayed information if we're connected to the resource, there's no need to start the resource otherwise. |
107 | mResourceAccess->sendRevisionReplayedCommand(newRevision); | 107 | mResourceAccess->sendRevisionReplayedCommand(newRevision); |
108 | }) | 108 | }); |
109 | .template then<void>([](){}); | ||
110 | }); | 109 | }); |
111 | //Ensure the connection is open, if it wasn't already opened | 110 | //Ensure the connection is open, if it wasn't already opened |
112 | //TODO If we are not connected already, we have to check for the latest revision once connected, otherwise we could miss some updates | 111 | //TODO If we are not connected already, we have to check for the latest revision once connected, otherwise we could miss some updates |
diff --git a/common/resourcecontrol.cpp b/common/resourcecontrol.cpp index 4a6f9b4..83558bd 100644 --- a/common/resourcecontrol.cpp +++ b/common/resourcecontrol.cpp | |||
@@ -53,9 +53,7 @@ KAsync::Job<void> ResourceControl::shutdown(const QByteArray &identifier) | |||
53 | [](int, const QString &) { | 53 | [](int, const QString &) { |
54 | Trace() << "Resource is already closed."; | 54 | Trace() << "Resource is already closed."; |
55 | //Resource isn't started, nothing to shutdown | 55 | //Resource isn't started, nothing to shutdown |
56 | }) | 56 | }); |
57 | //FIXME JOBAPI this is only required because we don't care about the return value of connectToServer | ||
58 | .template then<void>([](){}); | ||
59 | } | 57 | } |
60 | 58 | ||
61 | KAsync::Job<void> ResourceControl::start(const QByteArray &identifier) | 59 | KAsync::Job<void> ResourceControl::start(const QByteArray &identifier) |
@@ -81,9 +79,7 @@ KAsync::Job<void> ResourceControl::flushMessageQueue(const QByteArrayList &resou | |||
81 | resourceAccess->synchronizeResource(false, true).then<void>([&future, resourceAccess]() { | 79 | resourceAccess->synchronizeResource(false, true).then<void>([&future, resourceAccess]() { |
82 | future.setFinished(); | 80 | future.setFinished(); |
83 | }).exec(); | 81 | }).exec(); |
84 | }) | 82 | }); |
85 | //FIXME JOBAPI this is only required because we don't care about the return value of each (and each shouldn't even have a return value) | ||
86 | .template then<void>([](){}); | ||
87 | } | 83 | } |
88 | 84 | ||
89 | KAsync::Job<void> ResourceControl::flushReplayQueue(const QByteArrayList &resourceIdentifier) | 85 | KAsync::Job<void> ResourceControl::flushReplayQueue(const QByteArrayList &resourceIdentifier) |
diff --git a/common/store.cpp b/common/store.cpp index 7f93202..6f080b5 100644 --- a/common/store.cpp +++ b/common/store.cpp | |||
@@ -176,9 +176,7 @@ KAsync::Job<void> Store::synchronize(const Sink::Query &query) | |||
176 | resourceAccess->synchronizeResource(true, false).then<void>([&future, resourceAccess]() { | 176 | resourceAccess->synchronizeResource(true, false).then<void>([&future, resourceAccess]() { |
177 | future.setFinished(); | 177 | future.setFinished(); |
178 | }).exec(); | 178 | }).exec(); |
179 | }) | 179 | }); |
180 | //FIXME JOBAPI this is only required because we don't care about the return value of each (and each shouldn't even have a return value) | ||
181 | .template then<void>([](){}); | ||
182 | } | 180 | } |
183 | 181 | ||
184 | template <class DomainType> | 182 | template <class DomainType> |