From 9144e0d2b6c06a17069d10b655dddab024818b11 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 16 Nov 2020 17:09:41 +0100 Subject: [PATCH] drop unused files --- libnymea-app/libnymea-app.pro | 6 ++--- .../zigbee/zigbeenetworksandadapters.cpp | 21 --------------- .../zigbee/zigbeenetworksandadapters.h | 26 ------------------ nymea-app/ui/system/ZigbeeSettingsPage.qml | 27 ++++++++++--------- 4 files changed, 16 insertions(+), 64 deletions(-) delete mode 100644 libnymea-app/zigbee/zigbeenetworksandadapters.cpp delete mode 100644 libnymea-app/zigbee/zigbeenetworksandadapters.h diff --git a/libnymea-app/libnymea-app.pro b/libnymea-app/libnymea-app.pro index 0ca71ae5..b0cdc5b9 100644 --- a/libnymea-app/libnymea-app.pro +++ b/libnymea-app/libnymea-app.pro @@ -165,8 +165,7 @@ SOURCES += \ zigbee/zigbeemanager.cpp \ zigbee/zigbeeadapter.cpp \ zigbee/zigbeenetwork.cpp \ - zigbee/zigbeenetworks.cpp \ - zigbee/zigbeenetworksandadapters.cpp + zigbee/zigbeenetworks.cpp @@ -312,8 +311,7 @@ HEADERS += \ zigbee/zigbeemanager.h \ zigbee/zigbeeadapter.h \ zigbee/zigbeenetwork.h \ - zigbee/zigbeenetworks.h \ - zigbee/zigbeenetworksandadapters.h + zigbee/zigbeenetworks.h ubports: { DEFINES += UBPORTS diff --git a/libnymea-app/zigbee/zigbeenetworksandadapters.cpp b/libnymea-app/zigbee/zigbeenetworksandadapters.cpp deleted file mode 100644 index 311fe652..00000000 --- a/libnymea-app/zigbee/zigbeenetworksandadapters.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "zigbeenetworksandadapters.h" - -#include "zigbeemanager.h" - -ZigbeeNetworksAndAdapters::ZigbeeNetworksAndAdapters(ZigbeeManager *manager): - QAbstractListModel(manager), - m_manager(manager) -{ - -} - -int ZigbeeNetworksAndAdapters::rowCount(const QModelIndex &/*parent*/) const -{ -// return m_list.count(); - return 0; -} - -QVariant ZigbeeNetworksAndAdapters::data(const QModelIndex &index, int role) const -{ - return QVariant(); -} diff --git a/libnymea-app/zigbee/zigbeenetworksandadapters.h b/libnymea-app/zigbee/zigbeenetworksandadapters.h deleted file mode 100644 index 9977555d..00000000 --- a/libnymea-app/zigbee/zigbeenetworksandadapters.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef ZIGBEENETWORKSANDADAPTERS_H -#define ZIGBEENETWORKSANDADAPTERS_H - -#include - -class ZigbeeManager; - -class ZigbeeNetworksAndAdapters : public QAbstractListModel -{ - Q_OBJECT - -public: - explicit ZigbeeNetworksAndAdapters(ZigbeeManager *manager); - - int rowCount(const QModelIndex &parent) const override; - QVariant data(const QModelIndex &index, int role) const override; - -signals: - -private: - ZigbeeManager *m_manager = nullptr; - -// QList< -}; - -#endif // ZIGBEENETWORKSANDADAPTERS_H diff --git a/nymea-app/ui/system/ZigbeeSettingsPage.qml b/nymea-app/ui/system/ZigbeeSettingsPage.qml index 8c659685..26661f6a 100644 --- a/nymea-app/ui/system/ZigbeeSettingsPage.qml +++ b/nymea-app/ui/system/ZigbeeSettingsPage.qml @@ -54,20 +54,21 @@ SettingsPageBase { engine: _engine } - SettingsPageSectionHeader { - text: qsTr("General") - } + // Disabled for now, the Resources API won't make it in time +// SettingsPageSectionHeader { +// text: qsTr("General") +// } - NymeaListItemDelegate { - Layout.fillWidth: true - text: qsTr("Zigbee enabled") - subText: qsTr("Enable or disable Zigbee altogether") - prominentSubText: false - progressive: false - additionalItem: Switch { - anchors.centerIn: parent - } - } +// NymeaListItemDelegate { +// Layout.fillWidth: true +// text: qsTr("Zigbee enabled") +// subText: qsTr("Enable or disable Zigbee altogether") +// prominentSubText: false +// progressive: false +// additionalItem: Switch { +// anchors.centerIn: parent +// } +// } SettingsPageSectionHeader { text: qsTr("Zigbee networks")