diff options
author | Mårten Nordheim <marten.nordheim@qt.io> | 2021-06-03 13:27:56 +0200 |
---|---|---|
committer | Mårten Nordheim <marten.nordheim@qt.io> | 2021-06-08 14:54:16 +0200 |
commit | 14b74af0608dc833f836acac4ee93f905b449806 (patch) | |
tree | 84db5450f302d0de9ba140c8a9d223324e4fe988 /src/plugins/networkinformationbackends/networkmanager/qnetworkmanagernetworkinformationbackend.cpp | |
parent | c34b596119b1fd05082b69b77eb86a99f658a22b (diff) |
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>
Diffstat (limited to 'src/plugins/networkinformationbackends/networkmanager/qnetworkmanagernetworkinformationbackend.cpp')
-rw-r--r-- | src/plugins/networkinformationbackends/networkmanager/qnetworkmanagernetworkinformationbackend.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
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); }); } |