From 12a87e1d6d5c0e4b5a5aacbfa880678629321c1d Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Tue, 7 Jul 2015 11:05:03 +0200
Subject: Use the resource instance name

---
 examples/dummyresource/resourcefactory.cpp | 9 ++++-----
 examples/dummyresource/resourcefactory.h   | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'examples')

diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp
index e244131..de13aa9 100644
--- a/examples/dummyresource/resourcefactory.cpp
+++ b/examples/dummyresource/resourcefactory.cpp
@@ -105,9 +105,8 @@ QMap<QString, QString> populate()
 static QMap<QString, QString> s_dataSource = populate();
 
 
-//FIXME We need to pass the resource-instance name to generic resource, not the plugin name
-DummyResource::DummyResource()
-    : Akonadi2::GenericResource(PLUGIN_NAME ".instance1")
+DummyResource::DummyResource(const QByteArray &instanceIdentifier)
+    : Akonadi2::GenericResource(instanceIdentifier)
 {
 }
 
@@ -213,9 +212,9 @@ DummyResourceFactory::DummyResourceFactory(QObject *parent)
 
 }
 
-Akonadi2::Resource *DummyResourceFactory::createResource()
+Akonadi2::Resource *DummyResourceFactory::createResource(const QByteArray &instanceIdentifier)
 {
-    return new DummyResource();
+    return new DummyResource(instanceIdentifier);
 }
 
 void DummyResourceFactory::registerFacades(Akonadi2::FacadeFactory &factory)
diff --git a/examples/dummyresource/resourcefactory.h b/examples/dummyresource/resourcefactory.h
index f5caf61..f2362bc 100644
--- a/examples/dummyresource/resourcefactory.h
+++ b/examples/dummyresource/resourcefactory.h
@@ -32,7 +32,7 @@
 class DummyResource : public Akonadi2::GenericResource
 {
 public:
-    DummyResource();
+    DummyResource(const QByteArray &instanceIdentifier);
     KAsync::Job<void> synchronizeWithSource(Akonadi2::Pipeline *pipeline) Q_DECL_OVERRIDE;
     void configurePipeline(Akonadi2::Pipeline *pipeline) Q_DECL_OVERRIDE;
 };
@@ -46,7 +46,7 @@ class DummyResourceFactory : public Akonadi2::ResourceFactory
 public:
     DummyResourceFactory(QObject *parent = 0);
 
-    Akonadi2::Resource *createResource();
-    void registerFacades(Akonadi2::FacadeFactory &factory);
+    Akonadi2::Resource *createResource(const QByteArray &instanceIdentifier) Q_DECL_OVERRIDE;
+    void registerFacades(Akonadi2::FacadeFactory &factory) Q_DECL_OVERRIDE;
 };
 
-- 
cgit v1.2.3