QNetworkInformation: Adjustments to captive portal API

Make it return bool since the TriState was really only used signify that
the property was unsupported but there is already a separate way to
check if it's supported. More importantly there is no different set of
actions available to a user if they're in the Unknown or False state.

Because of the change to bool, we also rename the property to have an
'is'-prefix.

Change-Id: Iaaaad5ac31e663c36e00223bf5b0e719f412fc69
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

3 files changed, 4 insertions, 11 deletions

diff --git a/src/plugins/networkinformationbackends/android/qandroidnetworkinformationbackend.cpp b/src/plugins/networkinformationbackends/android/qandroidnetworkinformationbackend.cpp
index 130b10d558..9eef471989 100644
--- a/src/plugins/networkinformationbackends/android/qandroidnetworkinformationbackend.cpp
+++ b/src/plugins/networkinformationbackends/android/qandroidnetworkinformationbackend.cpp
@@ -128,10 +128,7 @@ QAndroidNetworkInformationBackend::QAndroidNetworkInformationBackend()
     });
 
     connect(conman, &AndroidConnectivityManager::captivePortalChanged, this,
-            [this](bool state) {
-                using TriState = QNetworkInformation::TriState;
-                setBehindCaptivePortal(state ? TriState::True : TriState::False);
-            });
+            &QAndroidNetworkInformationBackend::setBehindCaptivePortal);
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/networkinformationbackends/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp b/src/plugins/networkinformationbackends/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp
index ffed43aac7..d37f83832b 100644
--- a/src/plugins/networkinformationbackends/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp
+++ b/src/plugins/networkinformationbackends/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp
@@ -365,10 +365,7 @@ void QNetworkListManagerNetworkInformationBackend::setConnectivity(NLM_CONNECTIV
 
 void QNetworkListManagerNetworkInformationBackend::checkCaptivePortal()
 {
-    const bool behindPortal = managerEvents->checkBehindCaptivePortal();
-    using TriState = QNetworkInformation::TriState;
-    const auto triState = behindPortal ? TriState::True : TriState::False;
-    setBehindCaptivePortal(triState);
+    setBehindCaptivePortal(managerEvents->checkBehindCaptivePortal());
 }
 
 bool QNetworkListManagerNetworkInformationBackend::event(QEvent *event)
diff --git a/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagernetworkinformationbackend.cpp b/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagernetworkinformationbackend.cpp
index a22be93f6c..bfb04ae4a6 100644
--- a/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagernetworkinformationbackend.cpp
+++ b/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagernetworkinformationbackend.cpp
@@ -144,16 +144,15 @@ QNetworkManagerNetworkInformationBackend::QNetworkManagerNetworkInformationBacke
             });
 
     using ConnectivityState = QNetworkManagerInterface::NMConnectivityState;
-    using TriState = QNetworkInformation::TriState;
 
     const auto connectivityState = iface.connectivityState();
     const bool behindPortal = (connectivityState == ConnectivityState::NM_CONNECTIVITY_PORTAL);
-    setBehindCaptivePortal(behindPortal ? TriState::True : TriState::False);
+    setBehindCaptivePortal(behindPortal);
 
     connect(&iface, &QNetworkManagerInterface::connectivityChanged, this,
             [this](ConnectivityState state) {
                 const bool behindPortal = (state == ConnectivityState::NM_CONNECTIVITY_PORTAL);
-                setBehindCaptivePortal(behindPortal ? TriState::True : TriState::False);
+                setBehindCaptivePortal(behindPortal);
             });
 }