From 39b52a4f7e9a5416eeb75499370f072b2ac920fc Mon Sep 17 00:00:00 2001
From: "bernhard.trinnes" <bernhard.trinnes@nymea.io>
Date: Thu, 28 May 2020 14:10:23 +0200
Subject: [PATCH] changes requested by reviewer

---
 tado/integrationplugintado.cpp                       | 12 ++++++------
 ...ts => b4f2d2ee-50bb-4786-b7f5-261fed204fa5-de.ts} |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename tado/translations/{b4f2d2ee-50bb-4786-b7f5-261fed204fa5-de_DE.ts => b4f2d2ee-50bb-4786-b7f5-261fed204fa5-de.ts} (99%)

diff --git a/tado/integrationplugintado.cpp b/tado/integrationplugintado.cpp
index 6f5a16d9..bb236ff3 100644
--- a/tado/integrationplugintado.cpp
+++ b/tado/integrationplugintado.cpp
@@ -48,8 +48,7 @@ void IntegrationPluginTado::startPairing(ThingPairingInfo *info)
     // Checking the internet connection
     NetworkAccessManager *network = hardwareManager()->networkManager();
     QNetworkReply *reply = network->get(QNetworkRequest(QUrl("https://my.tado.com/api/v2")));
-    connect(reply, &QNetworkReply::finished, this, [reply, info] {
-        reply->deleteLater();
+    connect(reply, &QNetworkReply::finished, info, [reply, info] {
 
         if (reply->error() == QNetworkReply::NetworkError::HostNotFoundError) {
             info->finish(Thing::ThingErrorHardwareNotAvailable, QT_TR_NOOP("Tado server is not reachable."));
@@ -57,6 +56,7 @@ void IntegrationPluginTado::startPairing(ThingPairingInfo *info)
             info->finish(Thing::ThingErrorNoError, QT_TR_NOOP("Please enter the login credentials for your Tado account."));
         }
     });
+    connect(reply, &QNetworkReply::finished, this, &QNetworkReply::deleteLater);
 }
 
 void IntegrationPluginTado::confirmPairing(ThingPairingInfo *info, const QString &username, const QString &password)
@@ -240,9 +240,9 @@ void IntegrationPluginTado::onConnectionChanged(bool connected)
     Tado *tado = static_cast<Tado*>(sender());
 
     if (m_asyncDeviceSetup.contains(tado)) {
-        // thing setup failed, try as lon as ThingSetupInfo is valid.
+        //Thing setup failed, try as long as ThingSetupInfo is valid.
         if (!connected) {
-            QTimer::singleShot(2000, [tado, this]{
+            QTimer::singleShot(2000, tado, [tado, this]{
                 if(m_asyncDeviceSetup.contains(tado)){
                     //Check once more if the ThingSetupInfo is still valid
                     pluginStorage()->beginGroup(m_asyncDeviceSetup.value(tado)->thing()->id().toString());
@@ -283,7 +283,7 @@ void IntegrationPluginTado::onAuthenticationStatusChanged(bool authenticated)
         thing->setStateValue(tadoConnectionLoggedInStateTypeId, authenticated);
 
         if (!authenticated) {
-            QTimer::singleShot(5000, [this, tado, thing] {
+            QTimer::singleShot(5000, tado, [this, tado, thing] {
                 if (!tado->connected()) {
                     pluginStorage()->beginGroup(thing->id().toString());
                     QString password = pluginStorage()->value("password").toString();
@@ -309,7 +309,7 @@ void IntegrationPluginTado::onRequestExecuted(QUuid requestId, bool success)
 
 void IntegrationPluginTado::onTokenReceived(Tado::Token token)
 {
-    Q_UNUSED(token);
+    Q_UNUSED(token)
 
     qCDebug(dcTado()) << "Token received";
     Tado *tado = static_cast<Tado*>(sender());
diff --git a/tado/translations/b4f2d2ee-50bb-4786-b7f5-261fed204fa5-de_DE.ts b/tado/translations/b4f2d2ee-50bb-4786-b7f5-261fed204fa5-de.ts
similarity index 99%
rename from tado/translations/b4f2d2ee-50bb-4786-b7f5-261fed204fa5-de_DE.ts
rename to tado/translations/b4f2d2ee-50bb-4786-b7f5-261fed204fa5-de.ts
index 511057f9..3740f582 100644
--- a/tado/translations/b4f2d2ee-50bb-4786-b7f5-261fed204fa5-de_DE.ts
+++ b/tado/translations/b4f2d2ee-50bb-4786-b7f5-261fed204fa5-de.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="de_DE">
+<TS version="2.1" language="de">
 <context>
     <name>IntegrationPluginTado</name>
     <message>