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 --- examples/dummyresource/facade.cpp | 4 ++-- examples/dummyresource/facade.h | 2 +- examples/dummyresource/resourcefacade.cpp | 16 ++++++++-------- examples/dummyresource/resourcefacade.h | 8 ++++---- examples/dummyresource/resourcefactory.cpp | 4 ++-- examples/dummyresource/resourcefactory.h | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) (limited to 'examples/dummyresource') diff --git a/examples/dummyresource/facade.cpp b/examples/dummyresource/facade.cpp index 176d489..c0143c0 100644 --- a/examples/dummyresource/facade.cpp +++ b/examples/dummyresource/facade.cpp @@ -127,9 +127,9 @@ void DummyResourceFacade::readValue(QSharedPointer storage, c }); } -Async::Job DummyResourceFacade::load(const Akonadi2::Query &query, const QSharedPointer > &resultProvider, qint64 oldRevision, qint64 newRevision) +KAsync::Job DummyResourceFacade::load(const Akonadi2::Query &query, const QSharedPointer > &resultProvider, qint64 oldRevision, qint64 newRevision) { - return Async::start([=]() { + return KAsync::start([=]() { //Now that the sync is complete we can execute the query const auto preparedQuery = prepareQuery(query); diff --git a/examples/dummyresource/facade.h b/examples/dummyresource/facade.h index d0af487..41fb3f3 100644 --- a/examples/dummyresource/facade.h +++ b/examples/dummyresource/facade.h @@ -34,7 +34,7 @@ class DummyResourceFacade : public Akonadi2::GenericFacade load(const Akonadi2::Query &query, const QSharedPointer > &resultProvider, qint64 oldRevision, qint64 newRevision) Q_DECL_OVERRIDE; + KAsync::Job load(const Akonadi2::Query &query, const QSharedPointer > &resultProvider, qint64 oldRevision, qint64 newRevision) Q_DECL_OVERRIDE; private: void readValue(QSharedPointer storage, const QByteArray &key, const std::function &resultCallback, std::function); diff --git a/examples/dummyresource/resourcefacade.cpp b/examples/dummyresource/resourcefacade.cpp index 870bea2..af293d4 100644 --- a/examples/dummyresource/resourcefacade.cpp +++ b/examples/dummyresource/resourcefacade.cpp @@ -40,38 +40,38 @@ QSharedPointer DummyResourceConfigFacade::getSettings() return QSharedPointer::create(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/akonadi2/" + "org.kde." + instanceIdentifier + "/settings.ini", QSettings::IniFormat); } -Async::Job DummyResourceConfigFacade::create(const Akonadi2::ApplicationDomain::AkonadiResource &domainObject) +KAsync::Job DummyResourceConfigFacade::create(const Akonadi2::ApplicationDomain::AkonadiResource &domainObject) { //TODO create resource instance //This can be generalized in a base implementation - return Async::null(); + return KAsync::null(); } -Async::Job DummyResourceConfigFacade::modify(const Akonadi2::ApplicationDomain::AkonadiResource &domainObject) +KAsync::Job DummyResourceConfigFacade::modify(const Akonadi2::ApplicationDomain::AkonadiResource &domainObject) { //modify configuration //This part is likely resource specific, but could be partially generalized - return Async::start([domainObject, this]() { + return KAsync::start([domainObject, this]() { auto settings = getSettings(); //TODO Write properties to file }); } -Async::Job DummyResourceConfigFacade::remove(const Akonadi2::ApplicationDomain::AkonadiResource &domainObject) +KAsync::Job DummyResourceConfigFacade::remove(const Akonadi2::ApplicationDomain::AkonadiResource &domainObject) { //TODO remove resource instance //This can be generalized in a base implementation - return Async::null(); + return KAsync::null(); } -Async::Job DummyResourceConfigFacade::load(const Akonadi2::Query &query, const QSharedPointer > &resultProvider) +KAsync::Job DummyResourceConfigFacade::load(const Akonadi2::Query &query, const QSharedPointer > &resultProvider) { //Read configuration and list all available instances. //This includes runtime information about runing instances etc. //Part of this is generic, and part is accessing the resource specific configuration. //FIXME this currently does not support live queries (because we're not inheriting from GenericFacade) //FIXME only read what was requested in the query? - return Async::start([resultProvider, this]() { + return KAsync::start([resultProvider, this]() { auto settings = getSettings(); auto memoryAdaptor = QSharedPointer::create(); //TODO copy settings to adaptor diff --git a/examples/dummyresource/resourcefacade.h b/examples/dummyresource/resourcefacade.h index 0ba60ab..82ac41e 100644 --- a/examples/dummyresource/resourcefacade.h +++ b/examples/dummyresource/resourcefacade.h @@ -30,13 +30,13 @@ public: DummyResourceConfigFacade(); ~DummyResourceConfigFacade(); //Create an instance - Async::Job create(const Akonadi2::ApplicationDomain::AkonadiResource &domainObject) Q_DECL_OVERRIDE; + KAsync::Job create(const Akonadi2::ApplicationDomain::AkonadiResource &domainObject) Q_DECL_OVERRIDE; //Modify configuration - Async::Job modify(const Akonadi2::ApplicationDomain::AkonadiResource &domainObject) Q_DECL_OVERRIDE; + KAsync::Job modify(const Akonadi2::ApplicationDomain::AkonadiResource &domainObject) Q_DECL_OVERRIDE; //Remove instance - Async::Job remove(const Akonadi2::ApplicationDomain::AkonadiResource &domainObject) Q_DECL_OVERRIDE; + KAsync::Job remove(const Akonadi2::ApplicationDomain::AkonadiResource &domainObject) Q_DECL_OVERRIDE; //Read configuration and available instances - 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; private: QSharedPointer getSettings(); diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp index a4cd68d..e16a693 100644 --- a/examples/dummyresource/resourcefactory.cpp +++ b/examples/dummyresource/resourcefactory.cpp @@ -162,9 +162,9 @@ void findByRemoteId(QSharedPointer storage, const QString &ri }); } -Async::Job DummyResource::synchronizeWithSource(Akonadi2::Pipeline *pipeline) +KAsync::Job DummyResource::synchronizeWithSource(Akonadi2::Pipeline *pipeline) { - return Async::start([this, pipeline](Async::Future &f) { + return KAsync::start([this, pipeline](KAsync::Future &f) { //TODO use a read-only transaction during the complete sync to sync against a defined revision auto storage = QSharedPointer::create(Akonadi2::Store::storageLocation(), "org.kde.dummy"); for (auto it = s_dataSource.constBegin(); it != s_dataSource.constEnd(); it++) { diff --git a/examples/dummyresource/resourcefactory.h b/examples/dummyresource/resourcefactory.h index 7b7783e..751f2d8 100644 --- a/examples/dummyresource/resourcefactory.h +++ b/examples/dummyresource/resourcefactory.h @@ -32,7 +32,7 @@ class DummyResource : public Akonadi2::GenericResource { public: DummyResource(); - Async::Job synchronizeWithSource(Akonadi2::Pipeline *pipeline) Q_DECL_OVERRIDE; + KAsync::Job synchronizeWithSource(Akonadi2::Pipeline *pipeline) Q_DECL_OVERRIDE; void configurePipeline(Akonadi2::Pipeline *pipeline) Q_DECL_OVERRIDE; }; -- cgit v1.2.3