diff options
| author | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2021-12-16 16:31:28 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-01-17 17:55:52 +0000 |
| commit | 3d0df25c995bf798e912dd7cb7b1782b673ceef6 (patch) | |
| tree | ad1b08fa4febd0b988d3478a6475005618217ab8 /src/networksettings/qnetworksettingsmanager.h | |
| parent | 7e95c87e42a80867c11ee4f24544e3971921ae11 (diff) | |
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>
Diffstat (limited to 'src/networksettings/qnetworksettingsmanager.h')
| -rw-r--r-- | src/networksettings/qnetworksettingsmanager.h | 20 |
1 files changed, 9 insertions, 11 deletions
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 |