From cfc965489fdcfe1430a50e332d0a5e9ca5469883 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <stuerz.simon@gmail.com>
Date: Wed, 20 Jan 2016 17:00:29 +0100
Subject: [PATCH] remove post setup

---
 .../awattar/devicepluginawattar.cpp           | 22 +++++++++----------
 .../awattar/devicepluginawattar.h             | 11 +++-------
 plugins/deviceplugins/awattar/heatpump.h      |  2 +-
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/plugins/deviceplugins/awattar/devicepluginawattar.cpp b/plugins/deviceplugins/awattar/devicepluginawattar.cpp
index 780ef7c6..dce96c0c 100644
--- a/plugins/deviceplugins/awattar/devicepluginawattar.cpp
+++ b/plugins/deviceplugins/awattar/devicepluginawattar.cpp
@@ -107,15 +107,6 @@ DeviceManager::DeviceSetupStatus DevicePluginAwattar::setupDevice(Device *device
     return DeviceManager::DeviceSetupStatusAsync;
 }
 
-void DevicePluginAwattar::postSetupDevice(Device *device)
-{
-    if (device != m_device)
-        return;
-
-    searchHeatPumps();
-    updateData();
-}
-
 void DevicePluginAwattar::deviceRemoved(Device *device)
 {
     Q_UNUSED(device)
@@ -139,7 +130,6 @@ void DevicePluginAwattar::networkManagerReplyReady(QNetworkReply *reply)
         // check HTTP status code
         if (status != 200) {
             qCWarning(dcAwattar) << "Setup reply HTTP error:" << status << reply->errorString();
-
             if (m_setupRetry == 3) {
                 emit deviceSetupFinished(m_device, DeviceManager::DeviceSetupStatusFailure);
                 m_setupRetry = 0;
@@ -166,8 +156,14 @@ void DevicePluginAwattar::networkManagerReplyReady(QNetworkReply *reply)
             return;
         }
 
+        Q_UNUSED(jsonDoc)
+
         emit deviceSetupFinished(m_device, DeviceManager::DeviceSetupStatusSuccess);
 
+        // get data
+        searchHeatPumps();
+        updateData();
+
     } else if (m_updatePrice.contains(reply)) {
 
         m_updatePrice.removeAll(reply);
@@ -234,6 +230,9 @@ void DevicePluginAwattar::networkManagerReplyReady(QNetworkReply *reply)
 
 void DevicePluginAwattar::guhTimer()
 {
+    if (!m_device)
+        return;
+
     updateData();
     searchHeatPumps();
 }
@@ -378,7 +377,7 @@ void DevicePluginAwattar::processPumpSearchData(const QByteArray &data)
     }
 }
 
-QNetworkReply *DevicePluginAwattar::requestPriceData(const QString &token)
+QNetworkReply *DevicePluginAwattar::    requestPriceData(const QString &token)
 {
     QByteArray data = QString(token + ":").toUtf8().toBase64();
     QString header = "Basic " + data;
@@ -404,7 +403,6 @@ void DevicePluginAwattar::updateData()
     m_updatePrice.append(requestPriceData(m_token));
 }
 
-
 void DevicePluginAwattar::searchHeatPumps()
 {
     QHostAddress rplAddress = QHostAddress(configuration().paramValue("RPL address").toString());
diff --git a/plugins/deviceplugins/awattar/devicepluginawattar.h b/plugins/deviceplugins/awattar/devicepluginawattar.h
index 42e85264..e8a57a7b 100644
--- a/plugins/deviceplugins/awattar/devicepluginawattar.h
+++ b/plugins/deviceplugins/awattar/devicepluginawattar.h
@@ -40,24 +40,20 @@ public:
     DeviceManager::HardwareResources requiredHardware() const override;
     DeviceManager::DeviceSetupStatus setupDevice(Device *device) override;
 
-    void postSetupDevice(Device *device) override;
-
-    void startMonitoringAutoDevices() override;
-
     void deviceRemoved(Device *device) override;
     void networkManagerReplyReady(QNetworkReply *reply) override;
 
     void guhTimer() override;
 
 private:
+    Device *m_device;
+    QList<HeatPump *> m_heatPumps;
+
     QList<QNetworkReply *> m_asyncSetup;
     QList<QNetworkReply *> m_searchPumpReplies;
     QList<QNetworkReply *> m_updatePrice;
     QList<QNetworkReply *> m_updateUserData;
 
-    Device *m_device;
-    QList<HeatPump *> m_heatPumps;
-
     QString m_token;
     QString m_userUuid;
     int m_setupRetry;
@@ -73,7 +69,6 @@ private:
     void searchHeatPumps();
     bool heatPumpExists(const QHostAddress &pumpAddress);
 
-
 private slots:
     void connectionTest();
     void onHeatPumpReachableChanged();
diff --git a/plugins/deviceplugins/awattar/heatpump.h b/plugins/deviceplugins/awattar/heatpump.h
index 6f08c8cf..6316d340 100644
--- a/plugins/deviceplugins/awattar/heatpump.h
+++ b/plugins/deviceplugins/awattar/heatpump.h
@@ -37,8 +37,8 @@ public:
 
     QHostAddress address() const;
     bool reachable() const;
-
     void setSgMode(const int &sgMode);
+
     void setLed(const bool &power);
 
 private: