ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The deviceManager doesn't try to find itself going through the Engine any more :D:D:D:D

Browse Source
This commit is contained in:
Michael Zanetti 2018-08-31 20:02:12 +02:00
parent 647edaf72e
commit 7a960de69a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libnymea-app-core/devicemanager.cpp
View File

@ -161,7 +161,7 @@ void DeviceManager::getSupportedDevicesResponse(const QVariantMap &params)
if (params.value("params").toMap().keys().contains("deviceClasses")) { if (params.value("params").toMap().keys().contains("deviceClasses")) {
QVariantList deviceClassList = params.value("params").toMap().value("deviceClasses").toList(); QVariantList deviceClassList = params.value("params").toMap().value("deviceClasses").toList();
foreach (QVariant deviceClassVariant, deviceClassList) { 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); m_deviceClasses->addDeviceClass(deviceClass);
} }
} }
@ -174,7 +174,7 @@ void DeviceManager::getPluginsResponse(const QVariantMap &params)
if (params.value("params").toMap().keys().contains("plugins")) { if (params.value("params").toMap().keys().contains("plugins")) {
QVariantList pluginList = params.value("params").toMap().value("plugins").toList(); QVariantList pluginList = params.value("params").toMap().value("plugins").toList();
foreach (QVariant pluginVariant, pluginList) { 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); m_plugins->addPlugin(plugin);
} }
} }
@ -249,7 +249,7 @@ void DeviceManager::getConfiguredDevicesResponse(const QVariantMap &params)
} }
device->setStateValue(stateTypeId, value); device->setStateValue(stateTypeId, value);
} }
Engine::instance()->deviceManager()->devices()->addDevice(device); devices()->addDevice(device);
} }
} }
m_fetchingData = false; m_fetchingData = false;