Fix QNetworkSettingsManager usage from the C++

Fixed servicesChanged signal handling.
Fixed services and interfaces functions return types in QNetworkSettingsManager.

Task-number: QTBUG-56760
Change-Id: Iaade0d5c06e8ff8f8dea4b421e226ae6348a9fe5
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>

1 files changed, 8 insertions, 5 deletions

diff --git a/src/networksettings/qnetworksettingsmanager.h b/src/networksettings/qnetworksettingsmanager.h
index ba34974..86a60c4 100644
--- a/src/networksettings/qnetworksettingsmanager.h
+++ b/src/networksettings/qnetworksettingsmanager.h
@@ -35,24 +35,27 @@
 
 QT_FORWARD_DECLARE_CLASS(QNetworkSettingsManagerPrivate)
 QT_FORWARD_DECLARE_CLASS(QNetworkSettingsService)
+QT_FORWARD_DECLARE_CLASS(QNetworkSettingsServiceModel)
 QT_FORWARD_DECLARE_CLASS(QNetworkSettingsUserAgent)
+QT_FORWARD_DECLARE_CLASS(QNetworkSettingsServiceFilter)
+QT_FORWARD_DECLARE_CLASS(QNetworkSettingsInterfaceModel)
 
 class Q_DECL_EXPORT QNetworkSettingsManager : public QObject
 {
     Q_OBJECT
     Q_ENUMS(StateTypes NetworkTypeTypes)
-    Q_PROPERTY(QAbstractItemModel* services READ services NOTIFY servicesChanged)
-    Q_PROPERTY(QAbstractItemModel* interfaces READ interfaces NOTIFY interfacesChanged)
+    Q_PROPERTY(QNetworkSettingsServiceFilter* services READ services NOTIFY servicesChanged)
+    Q_PROPERTY(QNetworkSettingsInterfaceModel* interfaces READ interfaces NOTIFY interfacesChanged)
     Q_PROPERTY(QNetworkSettingsUserAgent* userAgent READ userAgent CONSTANT)
 
 public:
     explicit QNetworkSettingsManager(QObject* parent = Q_NULLPTR);
-    QAbstractItemModel* services();
-    QAbstractItemModel* interfaces();
+    QNetworkSettingsServiceFilter* services();
+    QNetworkSettingsInterfaceModel* interfaces();
     void setUserAgent(QNetworkSettingsUserAgent *agent);
     QNetworkSettingsUserAgent* userAgent();
 
-    Q_INVOKABLE QNetworkSettingsService* getService(const QString& name, const int type);
+    Q_INVOKABLE QNetworkSettingsService* service(const QString& name, const int type);
 
 Q_SIGNALS:
     void servicesChanged();