From f6af8d5cec744474563f473d1e7499a18e96f8cf Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Mon, 16 Nov 2020 17:21:48 +0100
Subject: [PATCH] cleanup old code

---
 libnymea-app/zigbee/zigbeemanager.cpp | 9 +--------
 libnymea-app/zigbee/zigbeemanager.h   | 4 ----
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/libnymea-app/zigbee/zigbeemanager.cpp b/libnymea-app/zigbee/zigbeemanager.cpp
index 193fa88f..868a918a 100644
--- a/libnymea-app/zigbee/zigbeemanager.cpp
+++ b/libnymea-app/zigbee/zigbeemanager.cpp
@@ -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;
diff --git a/libnymea-app/zigbee/zigbeemanager.h b/libnymea-app/zigbee/zigbeemanager.h
index 73cbff98..0e51c35c 100644
--- a/libnymea-app/zigbee/zigbeemanager.h
+++ b/libnymea-app/zigbee/zigbeemanager.h
@@ -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);