From b43c0cf97615957e097daef29ff8febc1ec884c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Fri, 15 May 2015 16:22:03 +0200 Subject: Adapt to KAsync namespace change --- tests/clientapitest.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'tests') diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp index 1a5d873..1ff683f 100644 --- a/tests/clientapitest.cpp +++ b/tests/clientapitest.cpp @@ -24,13 +24,13 @@ class DummyResourceFacade : public Akonadi2::StoreFacade create(const Akonadi2::ApplicationDomain::Event &domainObject) Q_DECL_OVERRIDE { return Async::null(); }; - Async::Job modify(const Akonadi2::ApplicationDomain::Event &domainObject) Q_DECL_OVERRIDE { return Async::null(); }; - Async::Job remove(const Akonadi2::ApplicationDomain::Event &domainObject) Q_DECL_OVERRIDE { return Async::null(); }; + KAsync::Job create(const Akonadi2::ApplicationDomain::Event &domainObject) Q_DECL_OVERRIDE { return KAsync::null(); }; + KAsync::Job modify(const Akonadi2::ApplicationDomain::Event &domainObject) Q_DECL_OVERRIDE { return KAsync::null(); }; + KAsync::Job remove(const Akonadi2::ApplicationDomain::Event &domainObject) Q_DECL_OVERRIDE { return KAsync::null(); }; - Async::Job load(const Akonadi2::Query &query, const std::function &resultCallback) + KAsync::Job load(const Akonadi2::Query &query, const std::function &resultCallback) { - return Async::start([this, resultCallback](Async::Future &future) { + return KAsync::start([this, resultCallback](KAsync::Future &future) { qDebug() << "load called"; for(const auto &result : results) { resultCallback(result); @@ -40,16 +40,16 @@ public: }); } - Async::Job load(const Akonadi2::Query &query, const QSharedPointer > &resultProvider) Q_DECL_OVERRIDE + KAsync::Job load(const Akonadi2::Query &query, const QSharedPointer > &resultProvider) Q_DECL_OVERRIDE { auto runner = QSharedPointer::create(query); //The runner only lives as long as the resultProvider resultProvider->setQueryRunner(runner); QWeakPointer > weakResultProvider = resultProvider; capturedResultProvider = resultProvider; - runner->setQuery([this, weakResultProvider, query](qint64 oldRevision, qint64 newRevision) -> Async::Job { + runner->setQuery([this, weakResultProvider, query](qint64 oldRevision, qint64 newRevision) -> KAsync::Job { qDebug() << "Creating query for revisions: " << oldRevision << newRevision; - return Async::start([this, weakResultProvider, query](Async::Future &future) { + return KAsync::start([this, weakResultProvider, query](KAsync::Future &future) { auto resultProvider = weakResultProvider.toStrongRef(); if (!resultProvider) { Warning() << "Tried executing query after result provider is already gone"; @@ -81,7 +81,7 @@ public: }); } - return Async::start([runner](Async::Future &future) { + return KAsync::start([runner](KAsync::Future &future) { runner->run().then([&future]() { //TODO if not live query, destroy runner. future.setFinished(); -- cgit v1.2.3