1 files changed, 40 insertions, 5 deletions
diff --git a/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h b/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h
index 57c5aed763..98708268d1 100644
--- a/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h
+++ b/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h
@@ -55,11 +55,6 @@
 #include <QtDBus/QDBusPendingCallWatcher>
 #include <QtDBus/QDBusObjectPath>
 
-#define NM_DBUS_SERVICE "org.freedesktop.NetworkManager"
-
-#define NM_DBUS_PATH "/org/freedesktop/NetworkManager"
-#define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager"
-
 // Matches 'NMDeviceState' from https://developer.gnome.org/NetworkManager/stable/nm-dbus-types.html
 enum NMDeviceState {
     NM_DEVICE_STATE_UNKNOWN = 0,
@@ -119,16 +114,54 @@ public:
         NM_CONNECTIVITY_FULL = 4,
     };
     Q_ENUM(NMConnectivityState);
+    // Matches 'NMDeviceType' from
+    // https://developer-old.gnome.org/NetworkManager/stable/nm-dbus-types.html#NMDeviceType
+    enum NMDeviceType {
+        NM_DEVICE_TYPE_UNKNOWN = 0,
+        NM_DEVICE_TYPE_GENERIC = 14,
+        NM_DEVICE_TYPE_ETHERNET = 1,
+        NM_DEVICE_TYPE_WIFI = 2,
+        NM_DEVICE_TYPE_UNUSED1 = 3,
+        NM_DEVICE_TYPE_UNUSED2 = 4,
+        NM_DEVICE_TYPE_BT = 5,
+        NM_DEVICE_TYPE_OLPC_MESH = 6,
+        NM_DEVICE_TYPE_WIMAX = 7,
+        NM_DEVICE_TYPE_MODEM = 8,
+        NM_DEVICE_TYPE_INFINIBAND = 9,
+        NM_DEVICE_TYPE_BOND = 10,
+        NM_DEVICE_TYPE_VLAN = 11,
+        NM_DEVICE_TYPE_ADSL = 12,
+        NM_DEVICE_TYPE_BRIDGE = 13,
+        NM_DEVICE_TYPE_TEAM = 15,
+        NM_DEVICE_TYPE_TUN = 16,
+        NM_DEVICE_TYPE_IP_TUNNEL = 17,
+        NM_DEVICE_TYPE_MACVLAN = 18,
+        NM_DEVICE_TYPE_VXLAN = 19,
+        NM_DEVICE_TYPE_VETH = 20,
+        NM_DEVICE_TYPE_MACSEC = 21,
+        NM_DEVICE_TYPE_DUMMY = 22,
+        NM_DEVICE_TYPE_PPP = 23,
+        NM_DEVICE_TYPE_OVS_INTERFACE = 24,
+        NM_DEVICE_TYPE_OVS_PORT = 25,
+        NM_DEVICE_TYPE_OVS_BRIDGE = 26,
+        NM_DEVICE_TYPE_WPAN = 27,
+        NM_DEVICE_TYPE_6LOWPAN = 28,
+        NM_DEVICE_TYPE_WIREGUARD = 29,
+        NM_DEVICE_TYPE_WIFI_P2P = 30,
+        NM_DEVICE_TYPE_VRF = 31,
+    };
 
     QNetworkManagerInterface(QObject *parent = nullptr);
     ~QNetworkManagerInterface();
 
     NMState state() const;
     NMConnectivityState connectivityState() const;
+    NMDeviceType deviceType() const;
 
 Q_SIGNALS:
     void stateChanged(NMState);
     void connectivityChanged(NMConnectivityState);
+    void deviceTypeChanged(NMDeviceType);
 
 private Q_SLOTS:
     void setProperties(const QMap<QString, QVariant> &map);
@@ -136,6 +169,8 @@ private Q_SLOTS:
 private:
     Q_DISABLE_COPY_MOVE(QNetworkManagerInterface)
 
+    NMDeviceType extractDeviceType(QDBusObjectPath devicePath) const;
+
     QVariantMap propertyMap;
 };