1 files changed, 10 insertions, 10 deletions
diff --git a/src/networksettings/qnetworksettingsservicemodel.h b/src/networksettings/qnetworksettingsservicemodel.h
index 01447f6..b4392d2 100644
--- a/src/networksettings/qnetworksettingsservicemodel.h
+++ b/src/networksettings/qnetworksettingsservicemodel.h
@@ -29,17 +29,17 @@
 #ifndef QNETWORKSETTINGSSERVICEMODEL_H
 #define QNETWORKSETTINGSSERVICEMODEL_H
 
-#include <QSortFilterProxyModel>
+#include <QtCore/qsortfilterproxymodel.h>
 #include <QtNetworkSettings/qnetworksettings.h>
-#include <QtNetworkSettings/qnetworksettingsservice.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_DECL_EXPORT QNetworkSettingsServiceModel : public QAbstractListModel
+class QNetworkSettingsService;
+class Q_NETWORKSETTINGS_EXPORT QNetworkSettingsServiceModel : public QAbstractListModel
 {
     Q_OBJECT
 public:
-    explicit QNetworkSettingsServiceModel(QObject *parent = Q_NULLPTR);
+    explicit QNetworkSettingsServiceModel(QObject *parent = nullptr);
     virtual ~QNetworkSettingsServiceModel();
     // from QAbstractItemModel
     int rowCount(const QModelIndex & parent = QModelIndex()) const override;
@@ -74,17 +74,17 @@ private:
     QHash<int, QByteArray> m_roleNames;
 };
 
-class Q_DECL_EXPORT QNetworkSettingsServiceFilter : public QSortFilterProxyModel
+class Q_NETWORKSETTINGS_EXPORT QNetworkSettingsServiceFilter : public QSortFilterProxyModel
 {
     Q_OBJECT
-    Q_PROPERTY(QNetworkSettingsType::Types type READ type WRITE setType NOTIFY typeChanged)
+    Q_PROPERTY(QNetworkSettingsType::Type type READ type WRITE setType NOTIFY typeChanged)
     Q_PROPERTY(bool wiredNetworksAvailable MEMBER m_wiredNetworksAvailable WRITE setWiredNetworksAvailable NOTIFY wiredNetworksAvailableChanged)
 public:
-    explicit QNetworkSettingsServiceFilter(QObject* parent = Q_NULLPTR);
+    explicit QNetworkSettingsServiceFilter(QObject* parent = nullptr);
     virtual ~QNetworkSettingsServiceFilter();
     bool filterAcceptsRow( int source_row, const QModelIndex& source_parent ) const override;
-    QNetworkSettingsType::Types type() const;
-    void setType(QNetworkSettingsType::Types type);
+    QNetworkSettingsType::Type type() const;
+    void setType(QNetworkSettingsType::Type type);
     Q_INVOKABLE QVariant itemFromRow(const int row) const;
     Q_INVOKABLE int activeRow() const;
     void setWiredNetworksAvailable(bool);
@@ -92,7 +92,7 @@ Q_SIGNALS:
     void typeChanged();
     void wiredNetworksAvailableChanged();
 private:
-    QNetworkSettingsType::Types m_type;
+    QNetworkSettingsType::Type m_type;
     bool m_wiredNetworksAvailable;
 };