Merge branch '5.7' into dev

Change-Id: I5e601ba33cf50596f873e746e9b107a560c45018

2 files changed, 28 insertions, 22 deletions

diff --git a/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp b/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp
index 2629754..ace45ec 100644
--- a/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp
+++ b/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp
@@ -69,7 +69,7 @@ public:
         climate << QIviClimateControl::ClimateOff << QIviClimateControl::ClimateOn;
         m_climateModeAttribute = climate;
         m_zones << "FrontLeft" << "Upper" << "Lower";
-        foreach (const QString &z, m_zones) {
+        for (const QString &z : qAsConst(m_zones)) {
             m_zoneTargetTemperature[z] = 0;
             m_zoneTargetTemperatureAttribute[z] = QIviPropertyAttribute<int>(0, 10);
             m_zoneSeatCooler[z] = 0;
@@ -116,7 +116,7 @@ public:
 
         QStringList zones = availableZones();
         zones.removeLast(); // Do not init zone "Dummy"
-        foreach (QString zone, zones) {
+        for (const QString &zone : qAsConst(zones)) {
             emit targetTemperatureChanged(m_zoneTargetTemperature[zone], zone);
             emit targetTemperatureAttributeChanged(m_zoneTargetTemperatureAttribute[zone], zone);
             emit seatCoolerChanged(m_zoneSeatCooler[zone], zone);
@@ -692,9 +692,10 @@ void ClimateControlTest::testIntProperties()
     cc.startAutoDiscovery();
 
     if (testZones) {
-        QStringList zones = cc.availableZones();
-        zones.removeAll("Dummy");
-        foreach (QString z, zones) {
+        const QStringList zones = cc.availableZones();
+        for (const QString &z : zones) {
+            if (z == QLatin1String("Dummy"))
+                continue;
             QIviClimateControl *climateZone = qobject_cast<QIviClimateControl*>(cc.zoneAt(z));
             testIVIProperty<QIviClimateControl, ClimateControlTestBackend, int>(testData, climateZone, service->testBackend(), z);
         }
@@ -740,9 +741,10 @@ void ClimateControlTest::testBoolProperties()
     cc.startAutoDiscovery();
 
     if (testZones) {
-        QStringList zones = cc.availableZones();
-        zones.removeAll("Dummy");
-        foreach (QString z, zones) {
+        const QStringList zones = cc.availableZones();
+        for (const QString &z : zones) {
+            if (z == QLatin1String("Dummy"))
+                continue;
             QIviClimateControl *climateZone = qobject_cast<QIviClimateControl*>(cc.zoneAt(z));
             testIVIProperty<QIviClimateControl, ClimateControlTestBackend, bool>(testData, climateZone, service->testBackend(), z);
         }
diff --git a/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp b/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp
index bf20000..bd17990 100644
--- a/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp
+++ b/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp
@@ -64,9 +64,9 @@ public:
 
     void initializeAttributes() Q_DECL_OVERRIDE
     {
-        QStringList zones = availableZones();
+        const QStringList zones = availableZones();
         //zones.removeLast(); // Do not init zone "Dummy"
-        foreach (QString zone, zones) {
+        for (const QString &zone : zones) {
             emit heaterModeChanged(m_zoneMap[zone].heaterMode, zone);
             emit heaterModeAttributeChanged(m_zoneMap[zone].heaterModeAttribute, zone);
             emit heaterEnabledChanged(m_zoneMap[zone].heaterEnabled, zone);
@@ -377,9 +377,10 @@ void WindowControlTest::testHeaterMode()
     manager->registerService(service, service->interfaces());
     QIviWindowControl wc;
     wc.startAutoDiscovery();
-    QStringList zones = wc.availableZones();
-    zones.removeAll("Dummy");
-    foreach (QString z, zones) {
+    const QStringList zones = wc.availableZones();
+    for (const QString &z : zones) {
+        if (z == QLatin1String("Dummy"))
+            continue;
         QIviWindowControl *window = qobject_cast<QIviWindowControl*>(wc.zoneAt(z));
         testIVIProperty<QIviWindowControl, WindowControlTestBackend, QIviWindowControl::HeaterMode>(testData, window, service->testBackend(), z);
     }
@@ -395,9 +396,10 @@ void WindowControlTest::testHeaterEnabled()
     manager->registerService(service, service->interfaces());
     QIviWindowControl wc;
     wc.startAutoDiscovery();
-    QStringList zones = wc.availableZones();
-    zones.removeAll("Dummy");
-    foreach (QString z, zones) {
+    const QStringList zones = wc.availableZones();
+    for (const QString &z : zones) {
+        if (z == QLatin1String("Dummy"))
+            continue;
         QIviWindowControl *window = qobject_cast<QIviWindowControl*>(wc.zoneAt(z));
         testIVIProperty<QIviWindowControl, WindowControlTestBackend, bool>(testData, window, service->testBackend(), z);
     }
@@ -416,9 +418,10 @@ void WindowControlTest::testBlindMode()
     manager->registerService(service, service->interfaces());
     QIviWindowControl wc;
     wc.startAutoDiscovery();
-    QStringList zones = wc.availableZones();
-    zones.removeAll("Dummy");
-    foreach (QString z, zones) {
+    const QStringList zones = wc.availableZones();
+    for (const QString &z : zones) {
+        if (z == QLatin1String("Dummy"))
+            continue;
         QIviWindowControl *window = qobject_cast<QIviWindowControl*>(wc.zoneAt(z));
         testIVIProperty<QIviWindowControl, WindowControlTestBackend, QIviWindowControl::BlindMode>(testData, window, service->testBackend(), z);
     }
@@ -448,9 +451,10 @@ void WindowControlTest::testStates()
     manager->registerService(service, service->interfaces());
     QIviWindowControl wc;
     wc.startAutoDiscovery();
-    QStringList zones = wc.availableZones();
-    zones.removeAll("Dummy");
-    foreach (QString z, zones) {
+    const QStringList zones = wc.availableZones();
+    for (const QString &z : zones) {
+        if (z == QLatin1String("Dummy"))
+            continue;
         QIviWindowControl *window = qobject_cast<QIviWindowControl*>(wc.zoneAt(z));
         testIVIProperty<QIviWindowControl, WindowControlTestBackend, QIviWindowControl::State>(testData, window, service->testBackend(), z);
     }