From bdb01c2c068df326f5a8328ed1492ab1bea388c5 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Wed, 20 Jan 2016 19:07:07 +0100 Subject: Renamed Akonadi2 to Sink (except for documentation). --- common/domain/applicationdomaintype.cpp | 6 +++--- common/domain/applicationdomaintype.h | 36 ++++++++++++++++----------------- common/domain/dummy.fbs | 2 +- common/domain/event.cpp | 8 ++++---- common/domain/event.fbs | 2 +- common/domain/event.h | 14 ++++++------- common/domain/folder.cpp | 8 ++++---- common/domain/folder.fbs | 2 +- common/domain/folder.h | 14 ++++++------- common/domain/mail.cpp | 8 ++++---- common/domain/mail.fbs | 2 +- common/domain/mail.h | 14 ++++++------- 12 files changed, 58 insertions(+), 58 deletions(-) (limited to 'common/domain') diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp index c9a8bba..b0433be 100644 --- a/common/domain/applicationdomaintype.cpp +++ b/common/domain/applicationdomaintype.cpp @@ -21,7 +21,7 @@ #include "log.h" #include "../bufferadaptor.h" -namespace Akonadi2 { +namespace Sink { namespace ApplicationDomain { ApplicationDomainType::ApplicationDomainType() @@ -113,9 +113,9 @@ QByteArray getTypeName() } template<> -QByteArray getTypeName() +QByteArray getTypeName() { - return "akonadiresource"; + return "sinkresource"; } template<> diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h index 44d8743..63f030c 100644 --- a/common/domain/applicationdomaintype.h +++ b/common/domain/applicationdomaintype.h @@ -24,7 +24,7 @@ #include #include "bufferadaptor.h" -namespace Akonadi2 { +namespace Sink { namespace ApplicationDomain { @@ -48,7 +48,7 @@ public: template static typename DomainType::Ptr getInMemoryRepresentation(const ApplicationDomainType &domainType, const QList properties = QList()) { - auto memoryAdaptor = QSharedPointer::create(*(domainType.mAdaptor), properties); + auto memoryAdaptor = QSharedPointer::create(*(domainType.mAdaptor), properties); //The identifier still internal refers to the memory-mapped pointer, we need to copy the memory or it will become invalid return QSharedPointer::create(domainType.mResourceInstanceIdentifier, QByteArray(domainType.mIdentifier.constData(), domainType.mIdentifier.size()), domainType.mRevision, memoryAdaptor); } @@ -113,13 +113,13 @@ struct Folder : public Entity { }; /** - * Represents an akonadi resource. + * Represents an sink resource. * * This type is used for configuration of resources, * and for creating and removing resource instances. */ -struct AkonadiResource : public ApplicationDomainType { - typedef QSharedPointer Ptr; +struct SinkResource : public ApplicationDomainType { + typedef QSharedPointer Ptr; using ApplicationDomainType::ApplicationDomainType; }; @@ -138,7 +138,7 @@ template<> QByteArray getTypeName(); template<> -QByteArray getTypeName(); +QByteArray getTypeName(); template<> QByteArray getTypeName(); @@ -158,15 +158,15 @@ class TypeImplementation; } } -Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::ApplicationDomainType) -Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr) -Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::Entity) -Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::Entity::Ptr) -Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::Event) -Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::Event::Ptr) -Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::Mail) -Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::Mail::Ptr) -Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::Folder) -Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::Folder::Ptr) -Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::AkonadiResource) -Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::AkonadiResource::Ptr) +Q_DECLARE_METATYPE(Sink::ApplicationDomain::ApplicationDomainType) +Q_DECLARE_METATYPE(Sink::ApplicationDomain::ApplicationDomainType::Ptr) +Q_DECLARE_METATYPE(Sink::ApplicationDomain::Entity) +Q_DECLARE_METATYPE(Sink::ApplicationDomain::Entity::Ptr) +Q_DECLARE_METATYPE(Sink::ApplicationDomain::Event) +Q_DECLARE_METATYPE(Sink::ApplicationDomain::Event::Ptr) +Q_DECLARE_METATYPE(Sink::ApplicationDomain::Mail) +Q_DECLARE_METATYPE(Sink::ApplicationDomain::Mail::Ptr) +Q_DECLARE_METATYPE(Sink::ApplicationDomain::Folder) +Q_DECLARE_METATYPE(Sink::ApplicationDomain::Folder::Ptr) +Q_DECLARE_METATYPE(Sink::ApplicationDomain::SinkResource) +Q_DECLARE_METATYPE(Sink::ApplicationDomain::SinkResource::Ptr) diff --git a/common/domain/dummy.fbs b/common/domain/dummy.fbs index 8816b09..4b12827 100644 --- a/common/domain/dummy.fbs +++ b/common/domain/dummy.fbs @@ -1,4 +1,4 @@ -namespace Akonadi2.ApplicationDomain.Buffer; +namespace Sink.ApplicationDomain.Buffer; table Dummy { } diff --git a/common/domain/event.cpp b/common/domain/event.cpp index 18009fc..9f81eb8 100644 --- a/common/domain/event.cpp +++ b/common/domain/event.cpp @@ -37,7 +37,7 @@ static QMutex sMutex; -using namespace Akonadi2::ApplicationDomain; +using namespace Sink::ApplicationDomain; static TypeIndex &getIndex() { @@ -50,17 +50,17 @@ static TypeIndex &getIndex() return *index; } -ResultSet TypeImplementation::queryIndexes(const Akonadi2::Query &query, const QByteArray &resourceInstanceIdentifier, QSet &appliedFilters, Akonadi2::Storage::Transaction &transaction) +ResultSet TypeImplementation::queryIndexes(const Sink::Query &query, const QByteArray &resourceInstanceIdentifier, QSet &appliedFilters, Sink::Storage::Transaction &transaction) { return getIndex().query(query, appliedFilters, transaction); } -void TypeImplementation::index(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction) +void TypeImplementation::index(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Sink::Storage::Transaction &transaction) { return getIndex().add(identifier, bufferAdaptor, transaction); } -void TypeImplementation::removeIndex(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction) +void TypeImplementation::removeIndex(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Sink::Storage::Transaction &transaction) { return getIndex().remove(identifier, bufferAdaptor, transaction); } diff --git a/common/domain/event.fbs b/common/domain/event.fbs index 0c6628b..69148ef 100644 --- a/common/domain/event.fbs +++ b/common/domain/event.fbs @@ -1,4 +1,4 @@ -namespace Akonadi2.ApplicationDomain.Buffer; +namespace Sink.ApplicationDomain.Buffer; table Event { uid:string; diff --git a/common/domain/event.h b/common/domain/event.h index 577367b..479969d 100644 --- a/common/domain/event.h +++ b/common/domain/event.h @@ -30,7 +30,7 @@ class ReadPropertyMapper; template class WritePropertyMapper; -namespace Akonadi2 { +namespace Sink { class Query; namespace ApplicationDomain { @@ -45,19 +45,19 @@ namespace ApplicationDomain { * These are type specifiy default implementations. Theoretically a resource could implement it's own implementation. */ template<> -class TypeImplementation { +class TypeImplementation { public: - typedef Akonadi2::ApplicationDomain::Buffer::Event Buffer; - typedef Akonadi2::ApplicationDomain::Buffer::EventBuilder BufferBuilder; + typedef Sink::ApplicationDomain::Buffer::Event Buffer; + typedef Sink::ApplicationDomain::Buffer::EventBuilder BufferBuilder; static QSet indexedProperties(); /** * Returns the potential result set based on the indexes. * * An empty result set indicates that a full scan is required. */ - static ResultSet queryIndexes(const Akonadi2::Query &query, const QByteArray &resourceInstanceIdentifier, QSet &appliedFilters, Akonadi2::Storage::Transaction &transaction); - static void index(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction); - static void removeIndex(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction); + static ResultSet queryIndexes(const Sink::Query &query, const QByteArray &resourceInstanceIdentifier, QSet &appliedFilters, Sink::Storage::Transaction &transaction); + static void index(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Sink::Storage::Transaction &transaction); + static void removeIndex(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Sink::Storage::Transaction &transaction); static QSharedPointer > initializeReadPropertyMapper(); static QSharedPointer > initializeWritePropertyMapper(); }; diff --git a/common/domain/folder.cpp b/common/domain/folder.cpp index 7934841..16b2ec9 100644 --- a/common/domain/folder.cpp +++ b/common/domain/folder.cpp @@ -37,7 +37,7 @@ static QMutex sMutex; -using namespace Akonadi2::ApplicationDomain; +using namespace Sink::ApplicationDomain; static TypeIndex &getIndex() { @@ -51,18 +51,18 @@ static TypeIndex &getIndex() return *index; } -ResultSet TypeImplementation::queryIndexes(const Akonadi2::Query &query, const QByteArray &resourceInstanceIdentifier, QSet &appliedFilters, Akonadi2::Storage::Transaction &transaction) +ResultSet TypeImplementation::queryIndexes(const Sink::Query &query, const QByteArray &resourceInstanceIdentifier, QSet &appliedFilters, Sink::Storage::Transaction &transaction) { return getIndex().query(query, appliedFilters, transaction); } -void TypeImplementation::index(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction) +void TypeImplementation::index(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Sink::Storage::Transaction &transaction) { Trace() << "Indexing " << identifier; getIndex().add(identifier, bufferAdaptor, transaction); } -void TypeImplementation::removeIndex(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction) +void TypeImplementation::removeIndex(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Sink::Storage::Transaction &transaction) { getIndex().remove(identifier, bufferAdaptor, transaction); } diff --git a/common/domain/folder.fbs b/common/domain/folder.fbs index 31dc32a..b5d01ef 100644 --- a/common/domain/folder.fbs +++ b/common/domain/folder.fbs @@ -1,4 +1,4 @@ -namespace Akonadi2.ApplicationDomain.Buffer; +namespace Sink.ApplicationDomain.Buffer; table Folder { name:string; diff --git a/common/domain/folder.h b/common/domain/folder.h index 545836f..40c799c 100644 --- a/common/domain/folder.h +++ b/common/domain/folder.h @@ -30,7 +30,7 @@ class ReadPropertyMapper; template class WritePropertyMapper; -namespace Akonadi2 { +namespace Sink { class Query; namespace ApplicationDomain { @@ -40,14 +40,14 @@ namespace ApplicationDomain { } template<> -class TypeImplementation { +class TypeImplementation { public: - typedef Akonadi2::ApplicationDomain::Buffer::Folder Buffer; - typedef Akonadi2::ApplicationDomain::Buffer::FolderBuilder BufferBuilder; + typedef Sink::ApplicationDomain::Buffer::Folder Buffer; + typedef Sink::ApplicationDomain::Buffer::FolderBuilder BufferBuilder; static QSet indexedProperties(); - static ResultSet queryIndexes(const Akonadi2::Query &query, const QByteArray &resourceInstanceIdentifier, QSet &appliedFilters, Akonadi2::Storage::Transaction &transaction); - static void index(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction); - static void removeIndex(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction); + static ResultSet queryIndexes(const Sink::Query &query, const QByteArray &resourceInstanceIdentifier, QSet &appliedFilters, Sink::Storage::Transaction &transaction); + static void index(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Sink::Storage::Transaction &transaction); + static void removeIndex(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Sink::Storage::Transaction &transaction); static QSharedPointer > initializeReadPropertyMapper(); static QSharedPointer > initializeWritePropertyMapper(); }; diff --git a/common/domain/mail.cpp b/common/domain/mail.cpp index 8875d88..518331f 100644 --- a/common/domain/mail.cpp +++ b/common/domain/mail.cpp @@ -37,7 +37,7 @@ static QMutex sMutex; -using namespace Akonadi2::ApplicationDomain; +using namespace Sink::ApplicationDomain; static TypeIndex &getIndex() { @@ -55,18 +55,18 @@ static TypeIndex &getIndex() return *index; } -ResultSet TypeImplementation::queryIndexes(const Akonadi2::Query &query, const QByteArray &resourceInstanceIdentifier, QSet &appliedFilters, Akonadi2::Storage::Transaction &transaction) +ResultSet TypeImplementation::queryIndexes(const Sink::Query &query, const QByteArray &resourceInstanceIdentifier, QSet &appliedFilters, Sink::Storage::Transaction &transaction) { return getIndex().query(query, appliedFilters, transaction); } -void TypeImplementation::index(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction) +void TypeImplementation::index(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Sink::Storage::Transaction &transaction) { Trace() << "Indexing " << identifier; getIndex().add(identifier, bufferAdaptor, transaction); } -void TypeImplementation::removeIndex(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction) +void TypeImplementation::removeIndex(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Sink::Storage::Transaction &transaction) { getIndex().remove(identifier, bufferAdaptor, transaction); } diff --git a/common/domain/mail.fbs b/common/domain/mail.fbs index 17b29a0..0d11e32 100644 --- a/common/domain/mail.fbs +++ b/common/domain/mail.fbs @@ -1,4 +1,4 @@ -namespace Akonadi2.ApplicationDomain.Buffer; +namespace Sink.ApplicationDomain.Buffer; table Mail { uid:string; diff --git a/common/domain/mail.h b/common/domain/mail.h index d1ef8d6..e45d64d 100644 --- a/common/domain/mail.h +++ b/common/domain/mail.h @@ -30,7 +30,7 @@ class ReadPropertyMapper; template class WritePropertyMapper; -namespace Akonadi2 { +namespace Sink { class Query; namespace ApplicationDomain { @@ -40,19 +40,19 @@ namespace ApplicationDomain { } template<> -class TypeImplementation { +class TypeImplementation { public: - typedef Akonadi2::ApplicationDomain::Buffer::Mail Buffer; - typedef Akonadi2::ApplicationDomain::Buffer::MailBuilder BufferBuilder; + typedef Sink::ApplicationDomain::Buffer::Mail Buffer; + typedef Sink::ApplicationDomain::Buffer::MailBuilder BufferBuilder; static QSet indexedProperties(); /** * Returns the potential result set based on the indexes. * * An empty result set indicates that a full scan is required. */ - static ResultSet queryIndexes(const Akonadi2::Query &query, const QByteArray &resourceInstanceIdentifier, QSet &appliedFilters, Akonadi2::Storage::Transaction &transaction); - static void index(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction); - static void removeIndex(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Akonadi2::Storage::Transaction &transaction); + static ResultSet queryIndexes(const Sink::Query &query, const QByteArray &resourceInstanceIdentifier, QSet &appliedFilters, Sink::Storage::Transaction &transaction); + static void index(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Sink::Storage::Transaction &transaction); + static void removeIndex(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Sink::Storage::Transaction &transaction); static QSharedPointer > initializeReadPropertyMapper(); static QSharedPointer > initializeWritePropertyMapper(); }; -- cgit v1.2.3