From 9f6e0fbfd8cf23104eba5a78f89a69fab1a417f5 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Mon, 9 Nov 2015 16:04:46 +0100 Subject: Added a folder type --- examples/dummyresource/domainadaptor.cpp | 6 ++++++ examples/dummyresource/domainadaptor.h | 12 ++++++++++-- examples/dummyresource/facade.cpp | 22 +++++----------------- examples/dummyresource/facade.h | 6 +----- examples/dummyresource/resourcefactory.cpp | 2 ++ 5 files changed, 24 insertions(+), 24 deletions(-) (limited to 'examples/dummyresource') diff --git a/examples/dummyresource/domainadaptor.cpp b/examples/dummyresource/domainadaptor.cpp index d08a783..74b170d 100644 --- a/examples/dummyresource/domainadaptor.cpp +++ b/examples/dummyresource/domainadaptor.cpp @@ -51,3 +51,9 @@ DummyMailAdaptorFactory::DummyMailAdaptorFactory() } +DummyFolderAdaptorFactory::DummyFolderAdaptorFactory() + : DomainTypeAdaptorFactory() +{ + +} + diff --git a/examples/dummyresource/domainadaptor.h b/examples/dummyresource/domainadaptor.h index add3e8e..e5856f8 100644 --- a/examples/dummyresource/domainadaptor.h +++ b/examples/dummyresource/domainadaptor.h @@ -21,6 +21,8 @@ #include "common/domainadaptor.h" #include "event_generated.h" #include "mail_generated.h" +#include "folder_generated.h" +#include "dummy_generated.h" #include "dummycalendar_generated.h" #include "entity_generated.h" @@ -31,10 +33,16 @@ public: virtual ~DummyEventAdaptorFactory() {}; }; -//TODO replace the resource specific event class by a mail class or a dummy class if no resource type is required. -class DummyMailAdaptorFactory : public DomainTypeAdaptorFactory +class DummyMailAdaptorFactory : public DomainTypeAdaptorFactory { public: DummyMailAdaptorFactory(); virtual ~DummyMailAdaptorFactory() {}; }; + +class DummyFolderAdaptorFactory : public DomainTypeAdaptorFactory +{ +public: + DummyFolderAdaptorFactory(); + virtual ~DummyFolderAdaptorFactory() {}; +}; diff --git a/examples/dummyresource/facade.cpp b/examples/dummyresource/facade.cpp index 5a9d722..f337bdc 100644 --- a/examples/dummyresource/facade.cpp +++ b/examples/dummyresource/facade.cpp @@ -30,6 +30,7 @@ DummyResourceFacade::~DummyResourceFacade() { } + DummyResourceMailFacade::DummyResourceMailFacade(const QByteArray &instanceIdentifier) : Akonadi2::GenericFacade(instanceIdentifier, QSharedPointer::create()) { @@ -39,25 +40,12 @@ DummyResourceMailFacade::~DummyResourceMailFacade() { } -static void addFolder(const QSharedPointer > &resultProvider, QByteArray uid, QString name, QString icon) + +DummyResourceFolderFacade::DummyResourceFolderFacade(const QByteArray &instanceIdentifier) + : Akonadi2::GenericFacade(instanceIdentifier, QSharedPointer::create()) { - auto folder = Akonadi2::ApplicationDomain::Folder::Ptr::create(); - folder->setProperty("name", name); - folder->setProperty("uid", uid); - resultProvider->add(folder); } -KAsync::Job load(const Akonadi2::Query &query, const QSharedPointer > &resultProvider) +DummyResourceFolderFacade::~DummyResourceFolderFacade() { - //Dummy implementation for a fixed set of folders - addFolder(resultProvider, "inbox", "INBOX", "mail-folder-inbox"); - addFolder(resultProvider, "sent", "Sent", "mail-folder-sent"); - addFolder(resultProvider, "trash", "Trash", "user-trash"); - addFolder(resultProvider, "drafts", "Drafts", "document-edit"); - addFolder(resultProvider, "1", "dragons", "folder"); - addFolder(resultProvider, "1", "super mega long tailed dragons", "folder"); - resultProvider->initialResultSetComplete(); - resultProvider->complete(); - return KAsync::null(); } - diff --git a/examples/dummyresource/facade.h b/examples/dummyresource/facade.h index 948116b..b00e1d7 100644 --- a/examples/dummyresource/facade.h +++ b/examples/dummyresource/facade.h @@ -36,13 +36,9 @@ public: virtual ~DummyResourceMailFacade(); }; -class DummyResourceFolderFacade : public Akonadi2::StoreFacade +class DummyResourceFolderFacade : public Akonadi2::GenericFacade { public: DummyResourceFolderFacade(const QByteArray &instanceIdentifier); virtual ~DummyResourceFolderFacade(); - virtual KAsync::Job create(const Akonadi2::ApplicationDomain::Folder &domainObject) { return KAsync::null(); }; - virtual KAsync::Job modify(const Akonadi2::ApplicationDomain::Folder &domainObject) { return KAsync::null(); }; - virtual KAsync::Job remove(const Akonadi2::ApplicationDomain::Folder &domainObject) { return KAsync::null(); }; - virtual KAsync::Job load(const Akonadi2::Query &query, const QSharedPointer > &resultProvider); }; diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp index 397ca5f..edb3b42 100644 --- a/examples/dummyresource/resourcefactory.cpp +++ b/examples/dummyresource/resourcefactory.cpp @@ -40,6 +40,7 @@ //This is the resources entity type, and not the domain type #define ENTITY_TYPE_EVENT "event" #define ENTITY_TYPE_MAIL "mail" +#define ENTITY_TYPE_FOLDER "folder" /** * Index types: @@ -228,5 +229,6 @@ void DummyResourceFactory::registerFacades(Akonadi2::FacadeFactory &factory) { factory.registerFacade(PLUGIN_NAME); factory.registerFacade(PLUGIN_NAME); + factory.registerFacade(PLUGIN_NAME); } -- cgit v1.2.3