From 0b5284d5f50d4437bfcef7f8d0e258e3da7a494e Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 5 Mar 2020 17:15:02 +0100 Subject: [PATCH] Update Experience plugin api --- libnymea/experiences/experienceplugin.cpp | 6 +++--- libnymea/experiences/experienceplugin.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libnymea/experiences/experienceplugin.cpp b/libnymea/experiences/experienceplugin.cpp index 8a1adcb7..9e1f0126 100644 --- a/libnymea/experiences/experienceplugin.cpp +++ b/libnymea/experiences/experienceplugin.cpp @@ -43,9 +43,9 @@ void ExperiencePlugin::init() } /*! Returns a pointer to the DeviceManager. The pointer won't be valid unless init() has been called. */ -ThingManager *ExperiencePlugin::deviceManager() +ThingManager *ExperiencePlugin::thingManager() { - return m_deviceManager; + return m_thingManager; } /*! Returns a pointer to the JsonRPCServer. The pointer won't be valid unless init() has been called. */ @@ -57,7 +57,7 @@ JsonRPCServer *ExperiencePlugin::jsonRpcServer() void ExperiencePlugin::initPlugin(ThingManager *deviceManager, JsonRPCServer *jsonRPCServer) { - m_deviceManager = deviceManager; + m_thingManager = deviceManager; m_jsonRpcServer = jsonRPCServer; init(); diff --git a/libnymea/experiences/experienceplugin.h b/libnymea/experiences/experienceplugin.h index dc7fb8dc..6d0ff6b7 100644 --- a/libnymea/experiences/experienceplugin.h +++ b/libnymea/experiences/experienceplugin.h @@ -48,14 +48,14 @@ public: virtual void init() = 0; protected: - ThingManager* deviceManager(); + ThingManager* thingManager(); JsonRPCServer* jsonRpcServer(); private: friend class nymeaserver::ExperienceManager; - void initPlugin(ThingManager *deviceManager, JsonRPCServer *jsonRPCServer); + void initPlugin(ThingManager *thingManager, JsonRPCServer *jsonRPCServer); - ThingManager *m_deviceManager = nullptr; + ThingManager *m_thingManager = nullptr; JsonRPCServer *m_jsonRpcServer = nullptr; };