From c34b596119b1fd05082b69b77eb86a99f658a22b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io>
Date: Wed, 26 May 2021 11:55:46 +0200
Subject: [PATCH] QNetworkInformation: Some cleanup in NetworkManager

Change-Id: I7e0fce63883019278ceb9dc757bf10ee9d77097c
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
---
 .../qnetworkmanagernetworkinformationbackend.cpp | 16 ++++++----------
 .../networkmanager/qnetworkmanagerservice.cpp    |  4 ++--
 .../networkmanager/qnetworkmanagerservice.h      |  4 ++--
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagernetworkinformationbackend.cpp b/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagernetworkinformationbackend.cpp
index f0627c092a4..a22be93f6c4 100644
--- a/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagernetworkinformationbackend.cpp
+++ b/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagernetworkinformationbackend.cpp
@@ -101,7 +101,6 @@ private:
     Q_DISABLE_COPY_MOVE(QNetworkManagerNetworkInformationBackend)
 
     QNetworkManagerInterface iface;
-    QNetworkManagerInterface::NMState prevState;
 };
 
 class QNetworkManagerNetworkInformationBackendFactory : public QNetworkInformationBackendFactory
@@ -137,15 +136,12 @@ private:
 
 QNetworkManagerNetworkInformationBackend::QNetworkManagerNetworkInformationBackend()
 {
-    prevState = iface.state();
-    setReachability(reachabilityFromNMState(prevState));
-    connect(&iface, &QNetworkManagerInterface::stateChanged, this, [this]() {
-        auto newState = iface.state();
-        if (newState != prevState) {
-            prevState = newState;
-            setReachability(reachabilityFromNMState(prevState));
-        }
-    });
+    using NMState = QNetworkManagerInterface::NMState;
+    setReachability(reachabilityFromNMState(iface.state()));
+    connect(&iface, &QNetworkManagerInterface::stateChanged, this,
+            [this](NMState newState) {
+                setReachability(reachabilityFromNMState(newState));
+            });
 
     using ConnectivityState = QNetworkManagerInterface::NMConnectivityState;
     using TriState = QNetworkInformation::TriState;
diff --git a/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagerservice.cpp b/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagerservice.cpp
index bf9f156cb24..764507fd4b8 100644
--- a/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagerservice.cpp
+++ b/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagerservice.cpp
@@ -98,7 +98,7 @@ QNetworkManagerInterface::~QNetworkManagerInterface()
             SLOT(setProperties(QMap<QString, QVariant>)));
 }
 
-QNetworkManagerInterface::NMState QNetworkManagerInterface::state()
+QNetworkManagerInterface::NMState QNetworkManagerInterface::state() const
 {
     if (propertyMap.contains("State"))
         return static_cast<QNetworkManagerInterface::NMState>(propertyMap.value("State").toUInt());
@@ -131,7 +131,7 @@ void QNetworkManagerInterface::setProperties(const QMap<QString, QVariant> &map)
 
         if (stateUpdate) {
             quint32 state = i.value().toUInt();
-            Q_EMIT stateChanged(state);
+            Q_EMIT stateChanged(static_cast<NMState>(state));
         } else if (connectivityUpdate) {
             quint32 state = i.value().toUInt();
             Q_EMIT connectivityChanged(static_cast<NMConnectivityState>(state));
diff --git a/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagerservice.h b/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagerservice.h
index 067ade6cbdd..57c5aed7635 100644
--- a/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagerservice.h
+++ b/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagerservice.h
@@ -123,11 +123,11 @@ public:
     QNetworkManagerInterface(QObject *parent = nullptr);
     ~QNetworkManagerInterface();
 
-    NMState state();
+    NMState state() const;
     NMConnectivityState connectivityState() const;
 
 Q_SIGNALS:
-    void stateChanged(quint32);
+    void stateChanged(NMState);
     void connectivityChanged(NMConnectivityState);
 
 private Q_SLOTS: