From b6df43f7d56247a9b7c930b36e22dadd2c4d2537 Mon Sep 17 00:00:00 2001
From: "bernhard.trinnes" <bernhard.trinnes@nymea.io>
Date: Wed, 1 Apr 2020 17:12:02 +0200
Subject: [PATCH] cleaned up a bit

---
 netatmo/integrationpluginnetatmo.cpp | 23 ++++++-----------------
 netatmo/integrationpluginnetatmo.h   |  3 ---
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/netatmo/integrationpluginnetatmo.cpp b/netatmo/integrationpluginnetatmo.cpp
index 5574eb50..10b0b15d 100644
--- a/netatmo/integrationpluginnetatmo.cpp
+++ b/netatmo/integrationpluginnetatmo.cpp
@@ -42,16 +42,6 @@ IntegrationPluginNetatmo::IntegrationPluginNetatmo()
 
 }
 
-IntegrationPluginNetatmo::~IntegrationPluginNetatmo()
-{
-
-}
-
-void IntegrationPluginNetatmo::init()
-{
-
-}
-
 void IntegrationPluginNetatmo::startPairing(ThingPairingInfo *info)
 {
     info->finish(Thing::ThingErrorNoError, QT_TR_NOOP("Please enter the login credentials for your Netatmo account."));
@@ -65,7 +55,6 @@ void IntegrationPluginNetatmo::confirmPairing(ThingPairingInfo *info, const QStr
     authentication->setPassword(password);
     authentication->setScope("read_station read_thermostat write_thermostat");
 
-    // Update thing connected state based on OAuth connected state
     connect(authentication, &OAuth2::authenticationChanged, info, [this, info, username, password, authentication](){
         if (authentication->authenticated()) {
             pluginStorage()->beginGroup(info->thingId().toString());
@@ -88,11 +77,6 @@ void IntegrationPluginNetatmo::setupThing(ThingSetupInfo *info)
     if (thing->thingClassId() == netatmoConnectionThingClassId) {
         qCDebug(dcNetatmo) << "Setup netatmo connection" << thing->name() << thing->params();
 
-        if (!m_pluginTimer) {
-            m_pluginTimer = hardwareManager()->pluginTimerManager()->registerTimer(600);
-            connect(m_pluginTimer, &PluginTimer::timeout, this, &IntegrationPluginNetatmo::onPluginTimer);
-        }
-
         QString username;
         QString password;
 
@@ -215,7 +199,7 @@ void IntegrationPluginNetatmo::thingRemoved(Thing *thing)
     }
 
     if (myThings().isEmpty() && m_pluginTimer) {
-        m_pluginTimer->deleteLater();
+        hardwareManager()->pluginTimerManager()->unregisterTimer(m_pluginTimer);
         m_pluginTimer = nullptr;
     }
 }
@@ -233,6 +217,11 @@ void IntegrationPluginNetatmo::postSetupThing(Thing *thing)
             m_outdoorDevices.key(thing)->updateStates(m_outdoorStationInitData.take(stationId));
         }
     }
+
+    if (!m_pluginTimer) {
+        m_pluginTimer = hardwareManager()->pluginTimerManager()->registerTimer(600);
+        connect(m_pluginTimer, &PluginTimer::timeout, this, &IntegrationPluginNetatmo::onPluginTimer);
+    }
 }
 
 void IntegrationPluginNetatmo::refreshData(Thing *thing, const QString &token)
diff --git a/netatmo/integrationpluginnetatmo.h b/netatmo/integrationpluginnetatmo.h
index 27a497c4..25aff367 100644
--- a/netatmo/integrationpluginnetatmo.h
+++ b/netatmo/integrationpluginnetatmo.h
@@ -48,9 +48,7 @@ class IntegrationPluginNetatmo : public IntegrationPlugin
 
 public:
     explicit IntegrationPluginNetatmo();
-    ~IntegrationPluginNetatmo();
 
-    void init() override;
     void startPairing(ThingPairingInfo *info) override;
     void confirmPairing(ThingPairingInfo *info, const QString &username, const QString &secret) override;
     void setupThing(ThingSetupInfo *info) override;
@@ -80,7 +78,6 @@ private slots:
     void onNetworkReplyFinished();
     void onIndoorStatesChanged();
     void onOutdoorStatesChanged();
-
 };
 
 #endif // INTEGRATIONPLUGINNETATMO_H