From 45eb4de576a1d4b789f96b8dee6eecedb9e92106 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sun, 30 Jan 2022 14:06:22 +0100 Subject: [PATCH] deConz: Remove unused/redundant firmware version string member variable and functions --- .../backends/deconz/zigbeebridgecontrollerdeconz.cpp | 6 ------ .../backends/deconz/zigbeebridgecontrollerdeconz.h | 1 - libnymea-zigbee/backends/deconz/zigbeenetworkdeconz.cpp | 4 ++-- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/libnymea-zigbee/backends/deconz/zigbeebridgecontrollerdeconz.cpp b/libnymea-zigbee/backends/deconz/zigbeebridgecontrollerdeconz.cpp index 7990782..d76dfd7 100644 --- a/libnymea-zigbee/backends/deconz/zigbeebridgecontrollerdeconz.cpp +++ b/libnymea-zigbee/backends/deconz/zigbeebridgecontrollerdeconz.cpp @@ -56,12 +56,6 @@ DeconzNetworkConfiguration ZigbeeBridgeControllerDeconz::networkConfiguration() return m_networkConfiguration; } -void ZigbeeBridgeControllerDeconz::setFirmwareVersionString(const QString &firmwareVersion) -{ - m_firmwareVersion = firmwareVersion; - emit firmwareVersionChanged(m_firmwareVersion); -} - Deconz::NetworkState ZigbeeBridgeControllerDeconz::networkState() const { return m_networkState; diff --git a/libnymea-zigbee/backends/deconz/zigbeebridgecontrollerdeconz.h b/libnymea-zigbee/backends/deconz/zigbeebridgecontrollerdeconz.h index 088148d..c2cd3e1 100644 --- a/libnymea-zigbee/backends/deconz/zigbeebridgecontrollerdeconz.h +++ b/libnymea-zigbee/backends/deconz/zigbeebridgecontrollerdeconz.h @@ -83,7 +83,6 @@ public: ~ZigbeeBridgeControllerDeconz() override; DeconzNetworkConfiguration networkConfiguration() const; - void setFirmwareVersionString(const QString &firmwareVersion); Deconz::NetworkState networkState() const; void rebootController(); diff --git a/libnymea-zigbee/backends/deconz/zigbeenetworkdeconz.cpp b/libnymea-zigbee/backends/deconz/zigbeenetworkdeconz.cpp index 866c645..c3210f1 100644 --- a/libnymea-zigbee/backends/deconz/zigbeenetworkdeconz.cpp +++ b/libnymea-zigbee/backends/deconz/zigbeenetworkdeconz.cpp @@ -491,9 +491,9 @@ void ZigbeeNetworkDeconz::runNetworkInitProcess() } if (!m_firmwareVersion.isEmpty()) { - m_controller->setFirmwareVersionString(QString("%1 - %2").arg(m_firmwareVersion).arg(m_protocolVersion)); + m_controller->setFirmwareVersion(QString("%1 - %2").arg(m_firmwareVersion).arg(m_protocolVersion)); } else { - m_controller->setFirmwareVersionString(m_protocolVersion); + m_controller->setFirmwareVersion(m_protocolVersion); } qCDebug(dcZigbeeNetwork()) << "Reading current network state";