diff options
| author | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-11-22 17:01:06 +0200 |
|---|---|---|
| committer | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-11-24 11:53:21 +0000 |
| commit | 724309463d63480ca755d5f309825a9dd078d012 (patch) | |
| tree | ef26954371c0b56141ca59894f67dd14446f933b /src/networksettings/connman/qnetworksettingsmanager_p.h | |
| parent | 5f7d1bacb8701e24ea185c63e05e5f8883cbef2c (diff) | |
Fix compilation with namespaces
Task-number: QTBUG-64693
Change-Id: I35487b54271f031077c0f96a90eb47f0683caa77
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'src/networksettings/connman/qnetworksettingsmanager_p.h')
| -rw-r--r-- | src/networksettings/connman/qnetworksettingsmanager_p.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.h b/src/networksettings/connman/qnetworksettingsmanager_p.h index 933f69c..579d857 100644 --- a/src/networksettings/connman/qnetworksettingsmanager_p.h +++ b/src/networksettings/connman/qnetworksettingsmanager_p.h @@ -46,10 +46,13 @@ #include "qnetworksettingsmanager.h" #include "qnetworksettingsinterfacemodel.h" +// Automatically generated class in global namespace class NetConnmanManagerInterface; -class QNetworkSettingsServiceModel; -class QNetworkSettingsServiceFilter; -class QNetworkSettingsService; +QT_FORWARD_DECLARE_CLASS(QNetworkSettingsServiceModel) +QT_FORWARD_DECLARE_CLASS(QNetworkSettingsServiceFilter) +QT_FORWARD_DECLARE_CLASS(QNetworkSettingsService) + +QT_BEGIN_NAMESPACE class QNetworkSettingsManagerPrivate : public QObject { @@ -59,7 +62,11 @@ public: explicit QNetworkSettingsManagerPrivate(QNetworkSettingsManager *parent); QNetworkSettingsManager *q_ptr; void setUserAgent(QNetworkSettingsUserAgent *agent); - QNetworkSettingsUserAgent *userAgent() {return m_agent;} + QNetworkSettingsUserAgent *userAgent() const {return m_agent;} + QNetworkSettingsInterfaceModel* interfaceModel() {return &m_interfaceModel;} + QNetworkSettingsServiceModel* serviceModel() const {return m_serviceModel;} + QNetworkSettingsServiceFilter* serviceFilter() const {return m_serviceFilter;} + public slots: void getServicesFinished(QDBusPendingCallWatcher *watcher); void getTechnologiesFinished(QDBusPendingCallWatcher *watcher); @@ -77,4 +84,6 @@ private: QNetworkSettingsUserAgent *m_agent; }; +QT_END_NAMESPACE + #endif // QNETWORKSETTINGSMANAGERPRIVATE_H |