Cleanup code

* Replace Q_NULLPTR with nullptr
* Remove usage of QT_FORWARD_DECLARE_CLASS
* Clean header includes

Task-number: QTBUG-99742
Change-Id: I1d33f33620fa70062381ba2d8597810e8840183c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 4227ce75067551ab5821e880d93df1fa353ccaa4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

20 files changed, 71 insertions, 79 deletions

diff --git a/src/networksettings/connman/connmancommon.cpp b/src/networksettings/connman/connmancommon.cpp
index 887af48..a77bb1d 100644
--- a/src/networksettings/connman/connmancommon.cpp
+++ b/src/networksettings/connman/connmancommon.cpp
@@ -28,6 +28,8 @@
 ****************************************************************************/
 #include "connmancommon.h"
 
+#include <QtNetworkSettings/qnetworksettings.h>
+
 QT_BEGIN_NAMESPACE
 
 //Conversion operations for datatypes
diff --git a/src/networksettings/connman/connmancommon.h b/src/networksettings/connman/connmancommon.h
index 6b9dd31..3b3cb79 100644
--- a/src/networksettings/connman/connmancommon.h
+++ b/src/networksettings/connman/connmancommon.h
@@ -31,7 +31,6 @@
 
 #include <QtCore/QMetaType>
 #include <QtDBus/QtDBus>
-#include <QtNetworkSettings/qnetworksettings.h>
 
 #define PropertyAgentPath QStringLiteral("/ConnmanAgent")
 #define PropertyState QStringLiteral("State")
@@ -54,6 +53,9 @@
 
 QT_BEGIN_NAMESPACE
 
+class QNetworkSettingsType;
+class QNetworkSettingsState;
+
 struct ConnmanMapStruct {
     QDBusObjectPath objectPath;
     QVariantMap propertyMap;
diff --git a/src/networksettings/connman/qnetworksettingsinterface_p.cpp b/src/networksettings/connman/qnetworksettingsinterface_p.cpp
index 98f66a7..eeb2abc 100644
--- a/src/networksettings/connman/qnetworksettingsinterface_p.cpp
+++ b/src/networksettings/connman/qnetworksettingsinterface_p.cpp
@@ -27,7 +27,6 @@
 **
 ****************************************************************************/
 #include "qnetworksettingsinterface_p.h"
-#include "qnetworksettingsinterface.h"
 #include "connman_technology_interface.h"
 #include "connmancommon.h"
 
@@ -35,10 +34,9 @@ QT_BEGIN_NAMESPACE
 
 QNetworkSettingsInterfacePrivate::QNetworkSettingsInterfacePrivate(QNetworkSettingsInterface* parent)
     : QObject(parent)
-    , m_technology(Q_NULLPTR)
+    , m_technology(nullptr)
     ,q_ptr(parent)
 {
-
 }
 
 void QNetworkSettingsInterfacePrivate::initialize(const QString& path, const QVariantMap& properties)
diff --git a/src/networksettings/connman/qnetworksettingsinterface_p.h b/src/networksettings/connman/qnetworksettingsinterface_p.h
index 483e736..25fbd2d 100644
--- a/src/networksettings/connman/qnetworksettingsinterface_p.h
+++ b/src/networksettings/connman/qnetworksettingsinterface_p.h
@@ -41,10 +41,11 @@
 //
 
 #include <QObject>
-#include <QtDBus>
+#include <QtDBus/QDBusVariant>
 #include "qnetworksettings.h"
 #include "qnetworksettingsinterface.h"
 
+// Automatically generated class in global namespace
 class NetConnmanTechnologyInterface;
 
 QT_BEGIN_NAMESPACE
@@ -84,7 +85,7 @@ class ConnmanSettingsInterface : public QNetworkSettingsInterface
 {
     Q_OBJECT
 public:
-    ConnmanSettingsInterface(const QString& path, const QVariantMap& properties, QObject *parent = Q_NULLPTR)
+    ConnmanSettingsInterface(const QString& path, const QVariantMap& properties, QObject *parent = nullptr)
         :QNetworkSettingsInterface(parent)
     {
         if (d_ptr)
@@ -96,9 +97,7 @@ public:
         d->setState(aState);
     }
 
-    virtual ~ConnmanSettingsInterface() {
-
-    }
+    virtual ~ConnmanSettingsInterface() {}
 
     QString path() const {
         if (d_ptr)
diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/networksettings/connman/qnetworksettingsmanager_p.cpp
index 7321a32..9a812d1 100644
--- a/src/networksettings/connman/qnetworksettingsmanager_p.cpp
+++ b/src/networksettings/connman/qnetworksettingsmanager_p.cpp
@@ -26,10 +26,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QFile>
-#include <QNetworkInterface>
+#include "qnetworksettingsservice.h"
 #include "qnetworksettingsmanager_p.h"
-#include "qnetworksettingsinterface.h"
 #include "qnetworksettingsinterface_p.h"
 #include "qnetworksettingsservicemodel.h"
 #include "qnetworksettingsuseragent.h"
@@ -42,14 +40,14 @@ const QString ConnManServiceName(QStringLiteral("net.connman"));
 QNetworkSettingsManagerPrivate::QNetworkSettingsManagerPrivate(QNetworkSettingsManager *parent)
     :QObject(parent)
     ,q_ptr(parent)
-    , m_interfaceModel(Q_NULLPTR)
-    , m_serviceModel(Q_NULLPTR)
-    , m_serviceFilter(Q_NULLPTR)
-    , m_manager(Q_NULLPTR)
-    , m_agent(Q_NULLPTR)
-    , m_serviceWatcher(Q_NULLPTR)
-    , m_currentWifiConnection(Q_NULLPTR)
-    , m_currentWiredConnection(Q_NULLPTR)
+    , m_interfaceModel(nullptr)
+    , m_serviceModel(nullptr)
+    , m_serviceFilter(nullptr)
+    , m_manager(nullptr)
+    , m_agent(nullptr)
+    , m_serviceWatcher(nullptr)
+    , m_currentWifiConnection(nullptr)
+    , m_currentWiredConnection(nullptr)
     , m_initialized(false)
 {
     qRegisterMetaType<ConnmanMapStruct>("ConnmanMapStruct");
diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.h b/src/networksettings/connman/qnetworksettingsmanager_p.h
index 7d0cd54..0b0c39b 100644
--- a/src/networksettings/connman/qnetworksettingsmanager_p.h
+++ b/src/networksettings/connman/qnetworksettingsmanager_p.h
@@ -41,20 +41,22 @@
 //
 
 #include <QObject>
-#include <QtDBus>
 #include <QMap>
 #include <QPointer>
+#include <QtDBus/QDBusServiceWatcher>
 #include "connmancommon.h"
 #include "qnetworksettingsmanager.h"
 #include "qnetworksettingsinterfacemodel.h"
 #include "connman_manager_interface.h"
 
-QT_FORWARD_DECLARE_CLASS(QNetworkSettingsServiceModel)
-QT_FORWARD_DECLARE_CLASS(QNetworkSettingsServiceFilter)
-QT_FORWARD_DECLARE_CLASS(QNetworkSettingsService)
-
 QT_BEGIN_NAMESPACE
 
+class QDBusObjectPath;
+class QDBusPendingCallWatcher;
+class QNetworkSettingsService;
+class QNetworkSettingsServiceModel;
+class QNetworkSettingsServiceFilter;
+
 class QNetworkSettingsManagerPrivate : public QObject
 {
     Q_OBJECT
diff --git a/src/networksettings/connman/qnetworksettingsservice_p.h b/src/networksettings/connman/qnetworksettingsservice_p.h
index 9190e2d..8c798c3 100644
--- a/src/networksettings/connman/qnetworksettingsservice_p.h
+++ b/src/networksettings/connman/qnetworksettingsservice_p.h
@@ -43,20 +43,19 @@
 #include "qnetworksettingsservice.h"
 #include "qnetworksettings.h"
 
-QT_FORWARD_DECLARE_CLASS(QDBusPendingCallWatcher)
-QT_FORWARD_DECLARE_CLASS(QDBusVariant)
-
 // Automatically generated class in global namespace
 class NetConnmanServiceInterface;
 
 QT_BEGIN_NAMESPACE
 
+class QDBusVariant;
+class QDBusPendingCallWatcher;
 class QNetworkSettingsServicePrivate : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PUBLIC(QNetworkSettingsService)
 public:
-    QNetworkSettingsServicePrivate(const QString& aPath, QNetworkSettingsService *parent = Q_NULLPTR);
+    QNetworkSettingsServicePrivate(const QString& aPath, QNetworkSettingsService *parent = nullptr);
 
     QNetworkSettingsService *q_ptr;
 private slots:
diff --git a/src/networksettings/connman/qnetworksettingsuseragent_p.cpp b/src/networksettings/connman/qnetworksettingsuseragent_p.cpp
index 2c1e399..6ba8be7 100644
--- a/src/networksettings/connman/qnetworksettingsuseragent_p.cpp
+++ b/src/networksettings/connman/qnetworksettingsuseragent_p.cpp
@@ -26,6 +26,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+#include <QtDBus/QDBusConnection>
+
+#include "qnetworksettingsuseragent.h"
 #include "qnetworksettingsuseragent_p.h"
 #include "connmancommon.h"
 
diff --git a/src/networksettings/connman/qnetworksettingsuseragent_p.h b/src/networksettings/connman/qnetworksettingsuseragent_p.h
index b85ddd2..8f356d9 100644
--- a/src/networksettings/connman/qnetworksettingsuseragent_p.h
+++ b/src/networksettings/connman/qnetworksettingsuseragent_p.h
@@ -41,25 +41,20 @@
 //
 
 #include <QtCore/QObject>
-#include <QtDBus/QtDBus>
-#include "qnetworksettingsuseragent.h"
+#include <QtDBus/QDBusMessage>
+#include <QtDBus/QDBusObjectPath>
+#include <QtDBus/QDBusAbstractAdaptor>
 
 QT_BEGIN_NAMESPACE
-class QByteArray;
-template<class T> class QList;
-template<class Key, class Value> class QMap;
-class QString;
-class QVariant;
-
-const QString AgentPath(QStringLiteral("/ConnmanAgent"));
 
+class QNetworkSettingsUserAgent;
 class QNetworkSettingsUserAgentPrivate : public QDBusAbstractAdaptor
 {
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "net.connman.Agent")
     Q_DECLARE_PUBLIC(QNetworkSettingsUserAgent)
 public:
-    QNetworkSettingsUserAgentPrivate(QNetworkSettingsUserAgent *parent = Q_NULLPTR);
+    QNetworkSettingsUserAgentPrivate(QNetworkSettingsUserAgent *parent = nullptr);
     void setPassphrase(const QString &passphrase);
     QString passphrase() const {return m_passphrase;}
     void cancel();
@@ -82,3 +77,4 @@ private:
 QT_END_NAMESPACE
 
 #endif // QNETWORKSETTINGSUSERAGENTPRIVATE_H
+
diff --git a/src/networksettings/qnetworksettings.h b/src/networksettings/qnetworksettings.h
index c4e748a..3e921c1 100644
--- a/src/networksettings/qnetworksettings.h
+++ b/src/networksettings/qnetworksettings.h
@@ -31,7 +31,6 @@
 
 #include <QObject>
 #include <QUrl>
-#include <QVariantMap>
 #include <QtNetworkSettings/qnetworksettingsaddressmodel.h>
 
 QT_BEGIN_NAMESPACE
@@ -54,8 +53,8 @@ public:
     };
     Q_ENUM(State)
 
-    explicit QNetworkSettingsState(State state, QObject *parent = Q_NULLPTR);
-    explicit QNetworkSettingsState(QObject *parent = Q_NULLPTR);
+    explicit QNetworkSettingsState(State state, QObject *parent = nullptr);
+    explicit QNetworkSettingsState(QObject *parent = nullptr);
 
     State state() const;
     void setState(const State state);
@@ -81,8 +80,8 @@ public:
     };
     Q_ENUM(Type)
 
-    explicit QNetworkSettingsType(Type type, QObject *parent = Q_NULLPTR);
-    explicit QNetworkSettingsType(QObject *parent = Q_NULLPTR);
+    explicit QNetworkSettingsType(Type type, QObject *parent = nullptr);
+    explicit QNetworkSettingsType(QObject *parent = nullptr);
 
     Type type() const;
     void setType(const Type type);
@@ -103,7 +102,7 @@ class Q_DECL_EXPORT QNetworkSettingsIPv4 : public QObject
     Q_PROPERTY(QString mask READ mask WRITE setMask NOTIFY maskChanged)
 
 public:
-    explicit QNetworkSettingsIPv4(QObject *parent = Q_NULLPTR);
+    explicit QNetworkSettingsIPv4(QObject *parent = nullptr);
 
     enum Method {
         Dhcp = 0,
@@ -144,7 +143,7 @@ class Q_DECL_EXPORT QNetworkSettingsIPv6 : public QObject
     Q_PROPERTY(int prefixLength READ prefixLength WRITE setPrefixLength NOTIFY prefixLengthChanged)
 
 public:
-    explicit QNetworkSettingsIPv6(QObject *parent = Q_NULLPTR);
+    explicit QNetworkSettingsIPv6(QObject *parent = nullptr);
 
     enum Method {
         Auto = 0,
@@ -194,7 +193,7 @@ class Q_DECL_EXPORT QNetworkSettingsProxy : public QObject
     Q_PROPERTY(QAbstractItemModel* excludes READ excludes NOTIFY excludesChanged)
     Q_PROPERTY(Method method READ method WRITE setMethod NOTIFY methodChanged)
 public:
-    explicit QNetworkSettingsProxy(QObject *parent = Q_NULLPTR);
+    explicit QNetworkSettingsProxy(QObject *parent = nullptr);
 
     enum Method {
         Direct = 0,
@@ -233,7 +232,7 @@ class Q_DECL_EXPORT QNetworkSettingsWireless : public QObject
     Q_PROPERTY(bool hidden READ hidden NOTIFY hiddenChanged)
     Q_PROPERTY(bool isOutOfRange READ outOfRange WRITE setOutOfRange NOTIFY outOfRangeChanged)
 public:
-    explicit QNetworkSettingsWireless(QObject* parent = Q_NULLPTR);
+    explicit QNetworkSettingsWireless(QObject* parent = nullptr);
 
     enum class Security {
         None    = 0x0000,
diff --git a/src/networksettings/qnetworksettingsaddressmodel.h b/src/networksettings/qnetworksettingsaddressmodel.h
index 3b0ed8d..20d2919 100644
--- a/src/networksettings/qnetworksettingsaddressmodel.h
+++ b/src/networksettings/qnetworksettingsaddressmodel.h
@@ -38,8 +38,8 @@ class Q_DECL_EXPORT QNetworkSettingsAddressModel : public QStringListModel
     Q_OBJECT
     Q_PROPERTY(int count READ count NOTIFY countChanged)
 public:
-    explicit QNetworkSettingsAddressModel(QObject *parent = Q_NULLPTR);
-    explicit QNetworkSettingsAddressModel(const QStringList &strings, QObject *parent = Q_NULLPTR);
+    explicit QNetworkSettingsAddressModel(QObject *parent = nullptr);
+    explicit QNetworkSettingsAddressModel(const QStringList &strings, QObject *parent = nullptr);
     Q_INVOKABLE void append(const QString& address);
     Q_INVOKABLE void remove(int index);
     Q_INVOKABLE void resetChanges();
diff --git a/src/networksettings/qnetworksettingsinterface.cpp b/src/networksettings/qnetworksettingsinterface.cpp
index 053820d..9907867 100644
--- a/src/networksettings/qnetworksettingsinterface.cpp
+++ b/src/networksettings/qnetworksettingsinterface.cpp
@@ -28,7 +28,6 @@
 ****************************************************************************/
 #include "qnetworksettingsinterface.h"
 #include "qnetworksettingsinterface_p.h"
-#include "qnetworksettings.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/networksettings/qnetworksettingsinterface.h b/src/networksettings/qnetworksettingsinterface.h
index 0c4b08b..997af1f 100644
--- a/src/networksettings/qnetworksettingsinterface.h
+++ b/src/networksettings/qnetworksettingsinterface.h
@@ -32,11 +32,11 @@
 #include <QObject>
 #include <QtNetworkSettings/qnetworksettings.h>
 
-QT_FORWARD_DECLARE_CLASS(QNetworkSettingsInterfacePrivate)
-
 QT_BEGIN_NAMESPACE
 
-class Q_DECL_EXPORT QNetworkSettingsInterface : public QObject {
+class QNetworkSettingsInterfacePrivate;
+class Q_DECL_EXPORT QNetworkSettingsInterface : public QObject
+{
     Q_OBJECT
     Q_PROPERTY(QString name READ name NOTIFY nameChanged)
     Q_PROPERTY(QNetworkSettingsState::State state READ state NOTIFY stateChanged)
@@ -44,7 +44,7 @@ class Q_DECL_EXPORT QNetworkSettingsInterface : public QObject {
     Q_PROPERTY(bool powered READ powered WRITE setPowered NOTIFY poweredChanged)
 
 public:
-    explicit QNetworkSettingsInterface(QObject* parent = Q_NULLPTR);
+    explicit QNetworkSettingsInterface(QObject* parent = nullptr);
     QString name() const;
     QNetworkSettingsState::State state();
     QNetworkSettingsType::Type type();
diff --git a/src/networksettings/qnetworksettingsinterfacemodel.h b/src/networksettings/qnetworksettingsinterfacemodel.h
index 42d40b6..5fd4999 100644
--- a/src/networksettings/qnetworksettingsinterfacemodel.h
+++ b/src/networksettings/qnetworksettingsinterfacemodel.h
@@ -30,18 +30,16 @@
 #define QNETWORKSETTINGSINTERFACEMODEL_H
 
 #include <QAbstractListModel>
-#include <QtNetworkSettings/qnetworksettings.h>
 
 QT_BEGIN_NAMESPACE
 
 class QNetworkSettingsInterface;
-
 class Q_DECL_EXPORT QNetworkSettingsInterfaceModel : public QAbstractListModel
 {
     Q_OBJECT
 
 public:
-    explicit QNetworkSettingsInterfaceModel(QObject *parent = Q_NULLPTR);
+    explicit QNetworkSettingsInterfaceModel(QObject *parent = nullptr);
     // from QAbstractItemModel
     int rowCount(const QModelIndex & parent = QModelIndex()) const override;
     QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const override;
diff --git a/src/networksettings/qnetworksettingsmanager.cpp b/src/networksettings/qnetworksettingsmanager.cpp
index 1ef9739..32df2de 100644
--- a/src/networksettings/qnetworksettingsmanager.cpp
+++ b/src/networksettings/qnetworksettingsmanager.cpp
@@ -26,6 +26,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+#include "qnetworksettings.h"
 #include "qnetworksettingsmanager.h"
 #include "qnetworksettingsservice.h"
 #include "qnetworksettingsservicemodel.h"
@@ -33,7 +34,6 @@
 #include "qnetworksettingsinterfacemodel.h"
 #include "qnetworksettingsmanager_p.h"
 #include "qnetworksettingsuseragent.h"
-#include <QStringListModel>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/networksettings/qnetworksettingsmanager.h b/src/networksettings/qnetworksettingsmanager.h
index 9802c4d..95b8892 100644
--- a/src/networksettings/qnetworksettingsmanager.h
+++ b/src/networksettings/qnetworksettingsmanager.h
@@ -29,19 +29,16 @@
 #ifndef QNETWORKSETTINGSMANAGER_H
 #define QNETWORKSETTINGSMANAGER_H
 
-#include <QtNetworkSettings/qnetworksettings.h>
 #include <QObject>
-#include <QStringListModel>
-#include <QtNetworkSettings/qnetworksettingsservicemodel.h>
-#include <QtNetworkSettings/qnetworksettingsinterfacemodel.h>
-#include <QtNetworkSettings/qnetworksettingsuseragent.h>
-#include <QtNetworkSettings/qnetworksettingsservice.h>
-
-QT_FORWARD_DECLARE_CLASS(QNetworkSettingsManagerPrivate)
-QT_FORWARD_DECLARE_CLASS(QNetworkSettingsInterface)
 
 QT_BEGIN_NAMESPACE
 
+class QNetworkSettingsService;
+class QNetworkSettingsInterface;
+class QNetworkSettingsUserAgent;
+class QNetworkSettingsServiceFilter;
+class QNetworkSettingsInterfaceModel;
+class QNetworkSettingsManagerPrivate;
 class Q_DECL_EXPORT QNetworkSettingsManager : public QObject
 {
     Q_OBJECT
@@ -50,9 +47,11 @@ class Q_DECL_EXPORT QNetworkSettingsManager : public QObject
     Q_PROPERTY(QNetworkSettingsUserAgent* userAgent READ userAgent CONSTANT)
     Q_PROPERTY(QNetworkSettingsService* currentWifiConnection READ currentWifiConnection NOTIFY currentWifiConnectionChanged)
     Q_PROPERTY(QNetworkSettingsService* currentWiredConnection READ currentWiredConnection NOTIFY currentWiredConnectionChanged)
+    Q_MOC_INCLUDE("qnetworksettingsservicemodel.h")
+    Q_MOC_INCLUDE("qnetworksettingsuseragent.h")
 
 public:
-    explicit QNetworkSettingsManager(QObject* parent = Q_NULLPTR);
+    explicit QNetworkSettingsManager(QObject* parent = nullptr);
     QNetworkSettingsServiceFilter* services();
     QNetworkSettingsInterfaceModel* interfaces();
     void setUserAgent(QNetworkSettingsUserAgent *agent);
@@ -80,7 +79,6 @@ protected:
 private:
     Q_DISABLE_COPY(QNetworkSettingsManager)
     Q_DECLARE_PRIVATE(QNetworkSettingsManager)
-
 };
 
 QT_END_NAMESPACE
diff --git a/src/networksettings/qnetworksettingsservice.h b/src/networksettings/qnetworksettingsservice.h
index f28e968..482db82 100644
--- a/src/networksettings/qnetworksettingsservice.h
+++ b/src/networksettings/qnetworksettingsservice.h
@@ -32,10 +32,9 @@
 #include <QObject>
 #include <QtNetworkSettings/qnetworksettings.h>
 
-QT_FORWARD_DECLARE_CLASS(QNetworkSettingsServicePrivate)
-
 QT_BEGIN_NAMESPACE
 
+class QNetworkSettingsServicePrivate;
 class Q_DECL_EXPORT QNetworkSettingsService : public QObject
 {
     Q_OBJECT
@@ -51,7 +50,7 @@ class Q_DECL_EXPORT QNetworkSettingsService : public QObject
     Q_PROPERTY(QAbstractItemModel* nameservers READ nameservers NOTIFY nameserversChanged)
     Q_PROPERTY(bool autoConnect READ autoConnect WRITE setAutoConnect NOTIFY autoConnectChanged)
 public:
-    explicit QNetworkSettingsService(const QString& aServiceId, QObject* parent = Q_NULLPTR);
+    explicit QNetworkSettingsService(const QString& aServiceId, QObject* parent = nullptr);
 
     QString id() const;
     QString name() const;
diff --git a/src/networksettings/qnetworksettingsservicemodel.cpp b/src/networksettings/qnetworksettingsservicemodel.cpp
index cba63a3..52dfd47 100644
--- a/src/networksettings/qnetworksettingsservicemodel.cpp
+++ b/src/networksettings/qnetworksettingsservicemodel.cpp
@@ -27,6 +27,7 @@
 **
 ****************************************************************************/
 #include "qnetworksettingsservicemodel.h"
+#include "qnetworksettingsservice.h"
 #include "qnetworksettings.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/networksettings/qnetworksettingsservicemodel.h b/src/networksettings/qnetworksettingsservicemodel.h
index 6617f8d..332ade8 100644
--- a/src/networksettings/qnetworksettingsservicemodel.h
+++ b/src/networksettings/qnetworksettingsservicemodel.h
@@ -31,15 +31,15 @@
 
 #include <QSortFilterProxyModel>
 #include <QtNetworkSettings/qnetworksettings.h>
-#include <QtNetworkSettings/qnetworksettingsservice.h>
 
 QT_BEGIN_NAMESPACE
 
+class QNetworkSettingsService;
 class Q_DECL_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;
@@ -80,7 +80,7 @@ class Q_DECL_EXPORT QNetworkSettingsServiceFilter : public QSortFilterProxyModel
     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::Type type() const;
diff --git a/src/networksettings/qnetworksettingsuseragent.h b/src/networksettings/qnetworksettingsuseragent.h
index 7b76c15..cbd0d8b 100644
--- a/src/networksettings/qnetworksettingsuseragent.h
+++ b/src/networksettings/qnetworksettingsuseragent.h
@@ -31,15 +31,14 @@
 
 #include <QObject>
 
-QT_FORWARD_DECLARE_CLASS(QNetworkSettingsUserAgentPrivate)
-
 QT_BEGIN_NAMESPACE
 
+class QNetworkSettingsUserAgentPrivate;
 class Q_DECL_EXPORT QNetworkSettingsUserAgent : public QObject
 {
     Q_OBJECT
 public:
-    explicit QNetworkSettingsUserAgent(QObject *parent = Q_NULLPTR);
+    explicit QNetworkSettingsUserAgent(QObject *parent = nullptr);
     Q_INVOKABLE void setPassphrase(const QString &passphrase);
     Q_INVOKABLE void cancelInput();
     QString passphrase() const;