ETM-Schurig
/
nymea-app
mirror of https://github.com/nymea/nymea-app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup old code

pull/459/head
Michael Zanetti 2020-11-16 17:21:48 +01:00
parent 747c5a5343
commit f6af8d5cec
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libnymea-app/zigbee/zigbeemanager.cpp
View File

@ -36,15 +36,13 @@
#include "zigbee/zigbeeadapters.h"
#include "zigbee/zigbeenetwork.h"
#include "zigbee/zigbeenetworks.h"
#include "zigbeenetworksandadapters.h"
#include <QMetaEnum>
ZigbeeManager::ZigbeeManager(QObject *parent) :
JsonHandler(parent),
m_adapters(new ZigbeeAdapters(this)),
m_networks(new ZigbeeNetworks(this)),
m_networksAndAdapters(new ZigbeeNetworksAndAdapters(this))
m_networks(new ZigbeeNetworks(this))
{
qRegisterMetaType<ZigbeeAdapter::ZigbeeBackendType>();
@ -84,11 +82,6 @@ ZigbeeNetworks *ZigbeeManager::networks() const
return m_networks;
}
ZigbeeNetworksAndAdapters *ZigbeeManager::networksAndAdapters() const
{
return m_networksAndAdapters;
}
int ZigbeeManager::addNetwork(const QString &serialPort, uint baudRate, ZigbeeAdapter::ZigbeeBackendType backendType)
{
QVariantMap params;

4
libnymea-app/zigbee/zigbeemanager.h
View File

@ -39,7 +39,6 @@ class JsonRpcClient;
class ZigbeeAdapters;
class ZigbeeNetwork;
class ZigbeeNetworks;
class ZigbeeNetworksAndAdapters;
class Engine;
class ZigbeeManager : public JsonHandler
@ -49,7 +48,6 @@ class ZigbeeManager : public JsonHandler
Q_PROPERTY(ZigbeeAdapters *adapters READ adapters CONSTANT)
Q_PROPERTY(ZigbeeNetworks *networks READ networks CONSTANT)
Q_PROPERTY(ZigbeeNetworksAndAdapters *networksAndAdapters READ networksAndAdapters CONSTANT)
public:
explicit ZigbeeManager(QObject *parent = nullptr);
@ -62,7 +60,6 @@ public:
ZigbeeAdapters *adapters() const;
ZigbeeNetworks *networks() const;
ZigbeeNetworksAndAdapters *networksAndAdapters() const;
Q_INVOKABLE int addNetwork(const QString &serialPort, uint baudRate, ZigbeeAdapter::ZigbeeBackendType backendType);
Q_INVOKABLE void removeNetwork(const QUuid &networkUuid);
@ -91,7 +88,6 @@ private:
Engine* m_engine = nullptr;
ZigbeeAdapters *m_adapters = nullptr;
ZigbeeNetworks *m_networks = nullptr;
ZigbeeNetworksAndAdapters *m_networksAndAdapters = nullptr;
ZigbeeAdapter *unpackAdapter(const QVariantMap &adapterMap);
ZigbeeNetwork *unpackNetwork(const QVariantMap &networkMap);