1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QNI NetworkManager: Extract Method primaryConnectionDevicePath()

Browse Source 
Avoids duplication of complex code (RB tree lookup).

Change-Id: I70ac7095b05ee56cdf7c86dd1d1a7c9c3232c9d4
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Marc Mutz 2021-11-03 17:49:35 +01:00
parent 4a3996e98b
commit 5d19219eeb
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.cpp
View File

@ -135,19 +135,25 @@ static QDBusInterface getPrimaryDevice(const QDBusObjectPath &devicePath)
QDBusConnection::systemBus()); QDBusConnection::systemBus());
} }
auto QNetworkManagerInterface::deviceType() const -> NMDeviceType std::optional<QDBusObjectPath> QNetworkManagerInterface::primaryConnectionDevicePath() const
{ {
auto it = propertyMap.constFind(u"PrimaryConnection"_qs); auto it = propertyMap.constFind(u"PrimaryConnection"_qs);
if (it != propertyMap.cend()) if (it != propertyMap.cend())
return extractDeviceType(it->value<QDBusObjectPath>()); return it->value<QDBusObjectPath>();
return std::nullopt;
}
auto QNetworkManagerInterface::deviceType() const -> NMDeviceType
{
if (const auto path = primaryConnectionDevicePath())
return extractDeviceType(*path);
return NM_DEVICE_TYPE_UNKNOWN; return NM_DEVICE_TYPE_UNKNOWN;
} }
auto QNetworkManagerInterface::meteredState() const -> NMMetered auto QNetworkManagerInterface::meteredState() const -> NMMetered
{ {
auto it = propertyMap.constFind(u"PrimaryConnection"_qs); if (const auto path = primaryConnectionDevicePath())
if (it != propertyMap.cend()) return extractDeviceMetered(*path);
return extractDeviceMetered(it->value<QDBusObjectPath>());
return NM_METERED_UNKNOWN; return NM_METERED_UNKNOWN;
} }

4
src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h
View File

@ -55,6 +55,8 @@
#include <QtDBus/QDBusPendingCallWatcher> #include <QtDBus/QDBusPendingCallWatcher>
#include <QtDBus/QDBusObjectPath> #include <QtDBus/QDBusObjectPath>
#include <optional>
// Matches 'NMDeviceState' from https://developer.gnome.org/NetworkManager/stable/nm-dbus-types.html // Matches 'NMDeviceState' from https://developer.gnome.org/NetworkManager/stable/nm-dbus-types.html
enum NMDeviceState { enum NMDeviceState {
NM_DEVICE_STATE_UNKNOWN = 0, NM_DEVICE_STATE_UNKNOWN = 0,
@ -184,6 +186,8 @@ private:
NMDeviceType extractDeviceType(const QDBusObjectPath &devicePath) const; NMDeviceType extractDeviceType(const QDBusObjectPath &devicePath) const;
NMMetered extractDeviceMetered(const QDBusObjectPath &devicePath) const; NMMetered extractDeviceMetered(const QDBusObjectPath &devicePath) const;
std::optional<QDBusObjectPath> primaryConnectionDevicePath() const;
QVariantMap propertyMap; QVariantMap propertyMap;
}; };