Merge branch 'feature/modelresult' into develop

1 files changed, 5 insertions, 17 deletions

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<Akonadi2::ApplicationDomain::Mail>(instanceIdentifier, QSharedPointer<DummyMailAdaptorFactory>::create())
 {
@@ -39,25 +40,12 @@ DummyResourceMailFacade::~DummyResourceMailFacade()
 {
 }
 
-static void addFolder(const QSharedPointer<Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Folder::Ptr> > &resultProvider, QByteArray uid, QString name, QString icon)
+
+DummyResourceFolderFacade::DummyResourceFolderFacade(const QByteArray &instanceIdentifier)
+    : Akonadi2::GenericFacade<Akonadi2::ApplicationDomain::Folder>(instanceIdentifier, QSharedPointer<DummyFolderAdaptorFactory>::create())
 {
-    auto folder = Akonadi2::ApplicationDomain::Folder::Ptr::create();
-    folder->setProperty("name", name);
-    folder->setProperty("uid", uid);
-    resultProvider->add(folder);
 }
 
-KAsync::Job<void> load(const Akonadi2::Query &query, const QSharedPointer<Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Folder::Ptr> > &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<void>();
 }
-