From 5ef90db242ad29c9772f2237b477c58ef65545c7 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Fri, 28 Jan 2022 16:54:55 -0500 Subject: Re-enable network support Rework network support code to use new connman-glib library instead of the previously disabled agl-service-network API. The only user visible change is that a few extra previously exported header files have been pruned from installation to avoid exposing GLib usage and potentially requiring users needing to build against it. Bug-AGL: SPEC-4182 Signed-off-by: Scott Murray Change-Id: Iab8f3c9d04ee603e06b80dfd92ac03d9d52af477 --- network/wirednetworkmodel.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'network/wirednetworkmodel.h') diff --git a/network/wirednetworkmodel.h b/network/wirednetworkmodel.h index c8ea92d..352d9b3 100644 --- a/network/wirednetworkmodel.h +++ b/network/wirednetworkmodel.h @@ -5,16 +5,16 @@ class WiredNetworkModel : public AbstractNetworkModel { - Q_OBJECT + Q_OBJECT - public: +public: enum WiredNetworkRoles { - AddressRole = Qt::UserRole + 1, - SecurityRole, - ServiceRole, - StateRole, - RouteRole, - NameServerRole, + AddressRole = Qt::UserRole + 1, + SecurityRole, + ServiceRole, + StateRole, + RouteRole, + NameServerRole, }; WiredNetworkModel(QObject *parent = Q_NULLPTR); @@ -23,9 +23,9 @@ class WiredNetworkModel : public AbstractNetworkModel Q_INVOKABLE QVariantList readCurrentNameServerConfig(const QModelIndex &index) const; QString getType() const override { return "wired"; } QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; - void updateProperties(QString service, QJsonObject properties) override; + void updateProperties(const QString &service, const QVariantMap &properties) override; - protected: +protected: QHash roleNames() const; }; -- cgit 1.2.3-korg