From cc3fed3668a80616ec78bc872e21b7ac06bcde38 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Thu, 9 Apr 2015 15:21:06 +0200 Subject: Renamed Akonadi::Domain to Akonadi::ApplicationDomain Because it's really the application domain and not the akonadi domain. --- common/clientapi.cpp | 2 +- common/clientapi.h | 36 ++++++++++++++++++------------------ common/domain/event.fbs | 2 +- common/domainadaptor.h | 4 ++-- common/test/clientapitest.cpp | 18 +++++++++--------- 5 files changed, 31 insertions(+), 31 deletions(-) (limited to 'common') diff --git a/common/clientapi.cpp b/common/clientapi.cpp index 0281b79..48de1b0 100644 --- a/common/clientapi.cpp +++ b/common/clientapi.cpp @@ -14,7 +14,7 @@ namespace async namespace Akonadi2 { -namespace Domain +namespace ApplicationDomain { template<> diff --git a/common/clientapi.h b/common/clientapi.h index 37fb185..5182547 100644 --- a/common/clientapi.h +++ b/common/clientapi.h @@ -163,7 +163,7 @@ namespace async { namespace Akonadi2 { /** - * Standardized Domain Types + * Standardized Application Domain Types * * They don't adhere to any standard and can be freely extended * Their sole purpose is providing a standardized interface to access data. @@ -172,7 +172,7 @@ namespace Akonadi2 { * * These types will be frequently modified (for every new feature that should be exposed to the any client) */ -namespace Domain { +namespace ApplicationDomain { /** * This class has to be implemented by resources and can be used as generic interface to access the buffer properties @@ -215,14 +215,14 @@ private: * * provide a unified interface to read buffers (for zero-copy reading) * * record changes to generate changesets for modifications */ -class AkonadiDomainType { +class ApplicationDomainType { public: - AkonadiDomainType() + ApplicationDomainType() :mAdaptor(new MemoryBufferAdaptor()) { } - AkonadiDomainType(const QByteArray &resourceName, const QByteArray &identifier, qint64 revision, const QSharedPointer &adaptor) + ApplicationDomainType(const QByteArray &resourceName, const QByteArray &identifier, qint64 revision, const QSharedPointer &adaptor) : mAdaptor(adaptor), mResourceName(resourceName), mIdentifier(identifier), @@ -230,7 +230,7 @@ public: { } - virtual ~AkonadiDomainType() {} + virtual ~ApplicationDomainType() {} virtual QVariant getProperty(const QByteArray &key) const { return mAdaptor->getProperty(key); } virtual void setProperty(const QByteArray &key, const QVariant &value){ mChangeSet.insert(key, value); mAdaptor->setProperty(key, value); } @@ -246,25 +246,25 @@ private: qint64 mRevision; }; -struct Event : public AkonadiDomainType { +struct Event : public ApplicationDomainType { typedef QSharedPointer Ptr; - using AkonadiDomainType::AkonadiDomainType; + using ApplicationDomainType::ApplicationDomainType; }; -struct Todo : public AkonadiDomainType { +struct Todo : public ApplicationDomainType { typedef QSharedPointer Ptr; - using AkonadiDomainType::AkonadiDomainType; + using ApplicationDomainType::ApplicationDomainType; }; -struct Calendar : public AkonadiDomainType { +struct Calendar : public ApplicationDomainType { typedef QSharedPointer Ptr; - using AkonadiDomainType::AkonadiDomainType; + using ApplicationDomainType::ApplicationDomainType; }; -class Mail : public AkonadiDomainType { +class Mail : public ApplicationDomainType { }; -class Folder : public AkonadiDomainType { +class Folder : public ApplicationDomainType { }; /** @@ -331,7 +331,7 @@ template class StoreFacade { public: virtual ~StoreFacade(){}; - QByteArray type() const { return Domain::getTypeName(); } + QByteArray type() const { return ApplicationDomain::getTypeName(); } virtual Async::Job create(const DomainType &domainObject) = 0; virtual Async::Job modify(const DomainType &domainObject) = 0; virtual Async::Job remove(const DomainType &domainObject) = 0; @@ -362,7 +362,7 @@ public: template void registerFacade(const QByteArray &resource) { - const QByteArray typeName = Domain::getTypeName(); + const QByteArray typeName = ApplicationDomain::getTypeName(); mFacadeRegistry.insert(key(resource, typeName), [](){ return new Facade; }); } @@ -378,14 +378,14 @@ public: template void registerFacade(const QByteArray &resource, const std::function &customFactoryFunction) { - const QByteArray typeName = Domain::getTypeName(); + const QByteArray typeName = ApplicationDomain::getTypeName(); mFacadeRegistry.insert(key(resource, typeName), customFactoryFunction); } template QSharedPointer > getFacade(const QByteArray &resource) { - const QByteArray typeName = Domain::getTypeName(); + const QByteArray typeName = ApplicationDomain::getTypeName(); auto factoryFunction = mFacadeRegistry.value(key(resource, typeName)); if (factoryFunction) { return QSharedPointer >(static_cast* >(factoryFunction())); diff --git a/common/domain/event.fbs b/common/domain/event.fbs index 49ff270..0c6628b 100644 --- a/common/domain/event.fbs +++ b/common/domain/event.fbs @@ -1,4 +1,4 @@ -namespace Akonadi2.Domain.Buffer; +namespace Akonadi2.ApplicationDomain.Buffer; table Event { uid:string; diff --git a/common/domainadaptor.h b/common/domainadaptor.h index 692c8c1..df3f8e5 100644 --- a/common/domainadaptor.h +++ b/common/domainadaptor.h @@ -68,8 +68,8 @@ class DomainTypeAdaptorFactory/* createAdaptor(const Akonadi2::Entity &entity) = 0; - virtual void createBuffer(const Akonadi2::Domain::Event &event, flatbuffers::FlatBufferBuilder &fbb) {}; + virtual QSharedPointer createAdaptor(const Akonadi2::Entity &entity) = 0; + virtual void createBuffer(const Akonadi2::ApplicationDomain::Event &event, flatbuffers::FlatBufferBuilder &fbb) {}; protected: QSharedPointer > mLocalMapper; diff --git a/common/test/clientapitest.cpp b/common/test/clientapitest.cpp index c9e4d6d..24b3fb9 100644 --- a/common/test/clientapitest.cpp +++ b/common/test/clientapitest.cpp @@ -4,14 +4,14 @@ #include "../clientapi.h" -class DummyResourceFacade : public Akonadi2::StoreFacade +class DummyResourceFacade : public Akonadi2::StoreFacade { public: ~DummyResourceFacade(){}; - virtual Async::Job create(const Akonadi2::Domain::Event &domainObject){ return Async::null(); }; - virtual Async::Job modify(const Akonadi2::Domain::Event &domainObject){ return Async::null(); }; - virtual Async::Job remove(const Akonadi2::Domain::Event &domainObject){ return Async::null(); }; - virtual Async::Job load(const Akonadi2::Query &query, const std::function &resultCallback) + virtual Async::Job create(const Akonadi2::ApplicationDomain::Event &domainObject){ return Async::null(); }; + virtual Async::Job modify(const Akonadi2::ApplicationDomain::Event &domainObject){ return Async::null(); }; + virtual Async::Job remove(const Akonadi2::ApplicationDomain::Event &domainObject){ return Async::null(); }; + virtual Async::Job load(const Akonadi2::Query &query, const std::function &resultCallback) { return Async::start([this, resultCallback](Async::Future &future) { qDebug() << "load called"; @@ -22,7 +22,7 @@ public: }); } - QList results; + QList results; }; class ClientAPITest : public QObject @@ -33,14 +33,14 @@ private Q_SLOTS: void testLoad() { DummyResourceFacade facade; - facade.results << QSharedPointer::create("resource", "id", 0, QSharedPointer()); + facade.results << QSharedPointer::create("resource", "id", 0, QSharedPointer()); - Akonadi2::FacadeFactory::instance().registerFacade("dummyresource", [facade](){ return new DummyResourceFacade(facade); }); + Akonadi2::FacadeFactory::instance().registerFacade("dummyresource", [facade](){ return new DummyResourceFacade(facade); }); Akonadi2::Query query; query.resources << "dummyresource"; - async::SyncListResult result(Akonadi2::Store::load(query)); + async::SyncListResult result(Akonadi2::Store::load(query)); result.exec(); QCOMPARE(result.size(), 1); } -- cgit v1.2.3