From 7a960de69aaf735622ef8e5158e7bc4bf7c0e840 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Fri, 31 Aug 2018 20:02:12 +0200 Subject: [PATCH] The deviceManager doesn't try to find itself going through the Engine any more :D:D:D:D --- libnymea-app-core/devicemanager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libnymea-app-core/devicemanager.cpp b/libnymea-app-core/devicemanager.cpp index afa06356..a980503d 100644 --- a/libnymea-app-core/devicemanager.cpp +++ b/libnymea-app-core/devicemanager.cpp @@ -161,7 +161,7 @@ void DeviceManager::getSupportedDevicesResponse(const QVariantMap ¶ms) if (params.value("params").toMap().keys().contains("deviceClasses")) { QVariantList deviceClassList = params.value("params").toMap().value("deviceClasses").toList(); foreach (QVariant deviceClassVariant, deviceClassList) { - DeviceClass *deviceClass = JsonTypes::unpackDeviceClass(deviceClassVariant.toMap(), Engine::instance()->deviceManager()->deviceClasses()); + DeviceClass *deviceClass = JsonTypes::unpackDeviceClass(deviceClassVariant.toMap(), deviceClasses()); m_deviceClasses->addDeviceClass(deviceClass); } } @@ -174,7 +174,7 @@ void DeviceManager::getPluginsResponse(const QVariantMap ¶ms) if (params.value("params").toMap().keys().contains("plugins")) { QVariantList pluginList = params.value("params").toMap().value("plugins").toList(); foreach (QVariant pluginVariant, pluginList) { - Plugin *plugin = JsonTypes::unpackPlugin(pluginVariant.toMap(), Engine::instance()->deviceManager()->plugins()); + Plugin *plugin = JsonTypes::unpackPlugin(pluginVariant.toMap(), plugins()); m_plugins->addPlugin(plugin); } } @@ -249,7 +249,7 @@ void DeviceManager::getConfiguredDevicesResponse(const QVariantMap ¶ms) } device->setStateValue(stateTypeId, value); } - Engine::instance()->deviceManager()->devices()->addDevice(device); + devices()->addDevice(device); } } m_fetchingData = false;