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

---
 common/genericresource.cpp | 4 ++--
 common/resource.h          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'common')

diff --git a/common/genericresource.cpp b/common/genericresource.cpp
index b6485d7..139ae98 100644
--- a/common/genericresource.cpp
+++ b/common/genericresource.cpp
@@ -155,8 +155,8 @@ private:
 
 GenericResource::GenericResource(const QByteArray &resourceInstanceIdentifier)
     : Akonadi2::Resource(),
-    mUserQueue(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/akonadi2/storage", "org.kde." + resourceInstanceIdentifier + ".userqueue"),
-    mSynchronizerQueue(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/akonadi2/storage", "org.kde." + resourceInstanceIdentifier + ".synchronizerqueue"),
+    mUserQueue(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/akonadi2/storage", resourceInstanceIdentifier + ".userqueue"),
+    mSynchronizerQueue(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/akonadi2/storage", resourceInstanceIdentifier + ".synchronizerqueue"),
     mResourceInstanceIdentifier(resourceInstanceIdentifier),
     mError(0)
 {
diff --git a/common/resource.h b/common/resource.h
index ea1e9d8..ebbc2e1 100644
--- a/common/resource.h
+++ b/common/resource.h
@@ -58,7 +58,7 @@ public:
     ResourceFactory(QObject *parent);
     virtual ~ResourceFactory();
 
-    virtual Resource *createResource() = 0;
+    virtual Resource *createResource(const QByteArray &instanceIdentifier) = 0;
     virtual void registerFacades(FacadeFactory &factory) = 0;
 
 private:
-- 
cgit v1.2.3