From d565411a820c0de95d2d60b275ec1f8f2be0a905 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Tue, 12 Apr 2016 23:43:26 +0200 Subject: Got rid of unnecessary constructor parameter --- common/facadefactory.cpp | 6 +++--- common/facadefactory.h | 6 ++++++ common/resourcefacade.cpp | 6 +++--- common/resourcefacade.h | 6 +++--- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/common/facadefactory.cpp b/common/facadefactory.cpp index b4a5273..b5a0ff2 100644 --- a/common/facadefactory.cpp +++ b/common/facadefactory.cpp @@ -54,9 +54,9 @@ void FacadeFactory::resetFactory() void FacadeFactory::registerStaticFacades() { - registerFacade(QByteArray()); - registerFacade(QByteArray()); - registerFacade(QByteArray()); + registerFacade(); + registerFacade(); + registerFacade(); } std::shared_ptr FacadeFactory::getFacade(const QByteArray &resource, const QByteArray &instanceIdentifier, const QByteArray &typeName) diff --git a/common/facadefactory.h b/common/facadefactory.h index 03e0784..7313970 100644 --- a/common/facadefactory.h +++ b/common/facadefactory.h @@ -55,6 +55,12 @@ public: registerFacade(resource, [](const QByteArray &instanceIdentifier) { return std::make_shared(instanceIdentifier); }, ApplicationDomain::getTypeName()); } + template + void registerFacade() + { + registerFacade(QByteArray(), [](const QByteArray &) { return std::make_shared(); }, ApplicationDomain::getTypeName()); + } + /* * Allows the registrar to register a specific instance. * diff --git a/common/resourcefacade.cpp b/common/resourcefacade.cpp index 6ff4801..accbd6d 100644 --- a/common/resourcefacade.cpp +++ b/common/resourcefacade.cpp @@ -173,7 +173,7 @@ QPair, typename Sink::ResultEmitter: } -ResourceFacade::ResourceFacade(const QByteArray &) : LocalStorageFacade("resources") +ResourceFacade::ResourceFacade() : LocalStorageFacade("resources") { } @@ -194,7 +194,7 @@ KAsync::Job ResourceFacade::remove(const Sink::ApplicationDomain::SinkReso } -AccountFacade::AccountFacade(const QByteArray &) : LocalStorageFacade("accounts") +AccountFacade::AccountFacade() : LocalStorageFacade("accounts") { } @@ -202,7 +202,7 @@ AccountFacade::~AccountFacade() { } -IdentityFacade::IdentityFacade(const QByteArray &) : LocalStorageFacade("identitys") +IdentityFacade::IdentityFacade() : LocalStorageFacade("identities") { } diff --git a/common/resourcefacade.h b/common/resourcefacade.h index 7834dea..7c9fd13 100644 --- a/common/resourcefacade.h +++ b/common/resourcefacade.h @@ -75,7 +75,7 @@ private: class ResourceFacade : public LocalStorageFacade { public: - ResourceFacade(const QByteArray &instanceIdentifier); + ResourceFacade(); virtual ~ResourceFacade(); virtual KAsync::Job remove(const Sink::ApplicationDomain::SinkResource &resource) Q_DECL_OVERRIDE; }; @@ -83,14 +83,14 @@ public: class AccountFacade : public LocalStorageFacade { public: - AccountFacade(const QByteArray &instanceIdentifier); + AccountFacade(); virtual ~AccountFacade(); }; class IdentityFacade : public LocalStorageFacade { public: - IdentityFacade(const QByteArray &instanceIdentifier); + IdentityFacade(); virtual ~IdentityFacade(); }; -- cgit v1.2.3