From eb6e9229c8cecd4b573039fafd644a16912e31f6 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Mon, 12 Dec 2016 15:17:32 +0100 Subject: Adapt to kasync changes --- common/changereplay.cpp | 2 +- common/commandprocessor.cpp | 4 ++-- common/resourceaccess.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'common') diff --git a/common/changereplay.cpp b/common/changereplay.cpp index 13ed49e..5d5afbb 100644 --- a/common/changereplay.cpp +++ b/common/changereplay.cpp @@ -92,7 +92,7 @@ KAsync::Job ChangeReplay::replayNextRevision() *topRevision = DataStore::maxRevision(mMainStoreTransaction); SinkTrace() << "Changereplay from " << *lastReplayedRevision << " to " << *topRevision; }) - .then(KAsync::dowhile( + .then(KAsync::doWhile( [this, lastReplayedRevision, topRevision]() -> KAsync::Job { if (*lastReplayedRevision >= *topRevision) { return KAsync::value(KAsync::Break); diff --git a/common/commandprocessor.cpp b/common/commandprocessor.cpp index 20fcf3a..efcd077 100644 --- a/common/commandprocessor.cpp +++ b/common/commandprocessor.cpp @@ -227,7 +227,7 @@ KAsync::Job CommandProcessor::processQueue(MessageQueue *queue) { auto time = QSharedPointer::create(); return KAsync::syncStart([this]() { mPipeline->startTransaction(); }) - .then(KAsync::dowhile( + .then(KAsync::doWhile( [this, queue, time]() -> KAsync::Job { return queue->dequeueBatch(sBatchSize, [this, time](const QByteArray &data) -> KAsync::Job { @@ -265,7 +265,7 @@ KAsync::Job CommandProcessor::processPipeline() return KAsync::null(); } auto it = QSharedPointer>::create(mCommandQueues); - return KAsync::dowhile( + return KAsync::doWhile( [it, this]() { auto time = QSharedPointer::create(); time->start(); diff --git a/common/resourceaccess.cpp b/common/resourceaccess.cpp index 81715e5..22d4cdb 100644 --- a/common/resourceaccess.cpp +++ b/common/resourceaccess.cpp @@ -160,7 +160,7 @@ KAsync::Job ResourceAccess::Private::tryToConnect() // We may have a socket from the last connection leftover socket.reset(); auto counter = QSharedPointer::create(0); - return KAsync::dowhile( + return KAsync::doWhile( [this, counter]() { SinkTrace() << "Loop"; return connectToServer(resourceInstanceIdentifier) -- cgit v1.2.3