diff --git a/src/blackcore/context/contextapplicationimpl.cpp b/src/blackcore/context/contextapplicationimpl.cpp index d05ede92b..7baa427a9 100644 --- a/src/blackcore/context/contextapplicationimpl.cpp +++ b/src/blackcore/context/contextapplicationimpl.cpp @@ -30,7 +30,7 @@ namespace BlackCore namespace Context { CContextApplication::CContextApplication(CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime) : - IContextApplication(mode, runtime) + IContextApplication(mode, runtime), CIdentifiable(this) { } CContextApplication *CContextApplication::registerWithDBus(BlackMisc::CDBusServer *server) @@ -209,8 +209,7 @@ namespace BlackCore CIdentifier CContextApplication::getApplicationIdentifier() const { if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } - static const CIdentifier identifier("swift application"); - return identifier; + return this->identifier(); } QString CContextApplication::readFromFile(const QString &fileName) const diff --git a/src/blackcore/context/contextapplicationimpl.h b/src/blackcore/context/contextapplicationimpl.h index 392a6552a..35ce3fe9d 100644 --- a/src/blackcore/context/contextapplicationimpl.h +++ b/src/blackcore/context/contextapplicationimpl.h @@ -19,7 +19,7 @@ #include "blackcore/blackcoreexport.h" #include "blackcore/context/contextapplication.h" #include "blackcore/corefacadeconfig.h" -#include "blackmisc/identifier.h" +#include "blackmisc/identifiable.h" #include "blackmisc/identifierlist.h" #include "blackmisc/statusmessage.h" #include "blackmisc/valuecache.h" @@ -36,7 +36,9 @@ namespace BlackCore namespace Context { //! Application context - class BLACKCORE_EXPORT CContextApplication : public IContextApplication + class BLACKCORE_EXPORT CContextApplication : + public IContextApplication, + public BlackMisc::CIdentifiable { Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTAPPLICATION_INTERFACENAME) Q_OBJECT diff --git a/src/blackmisc/identifiable.h b/src/blackmisc/identifiable.h index f7567389b..49a540af9 100644 --- a/src/blackmisc/identifiable.h +++ b/src/blackmisc/identifiable.h @@ -51,6 +51,12 @@ namespace BlackMisc //! Destructor ~CIdentifiable(); + //! Copy constructor + CIdentifiable(const CIdentifiable &) = default; + + //! Copy assignment operator + CIdentifiable &operator =(const CIdentifiable &) = default; + private: CIdentifier m_identifier; QMetaObject::Connection m_connection;