From 724309463d63480ca755d5f309825a9dd078d012 Mon Sep 17 00:00:00 2001
From: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Date: Wed, 22 Nov 2017 17:01:06 +0200
Subject: 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>
---
 src/networksettings/wpasupplicant/qnetworksettingsinterface_p.cpp | 4 ++++
 src/networksettings/wpasupplicant/qnetworksettingsinterface_p.h   | 4 ++++
 src/networksettings/wpasupplicant/qnetworksettingsmanager_p.cpp   | 4 ++++
 src/networksettings/wpasupplicant/qnetworksettingsmanager_p.h     | 5 ++++-
 src/networksettings/wpasupplicant/qnetworksettingsservice_p.cpp   | 4 ++++
 src/networksettings/wpasupplicant/qnetworksettingsservice_p.h     | 6 +++++-
 src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.cpp | 4 ++++
 src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h   | 4 ++++
 8 files changed, 33 insertions(+), 2 deletions(-)

(limited to 'src/networksettings/wpasupplicant')

diff --git a/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.cpp b/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.cpp
index a2440a1..7db5c61 100644
--- a/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.cpp
+++ b/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.cpp
@@ -30,6 +30,8 @@
 #include "qnetworksettingsmanager_p.h"
 #include "qwifidevice.h"
 
+QT_BEGIN_NAMESPACE
+
 QNetworkSettingsInterfacePrivate::QNetworkSettingsInterfacePrivate(QNetworkSettingsInterface* parent)
     :QObject(parent)
     ,q_ptr(parent)
@@ -61,3 +63,5 @@ void QNetworkSettingsInterfacePrivate::scan()
 {
     m_manager->call(QStringLiteral("SCAN"));
 }
+
+QT_END_NAMESPACE
diff --git a/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.h b/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.h
index 7016bf4..0c07c9c 100644
--- a/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.h
+++ b/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.h
@@ -45,6 +45,8 @@
 #include "qnetworksettingsinterface.h"
 #include "qnetworksettingsmanager_p.h"
 
+QT_BEGIN_NAMESPACE
+
 class QNetworkSettingsInterfacePrivate : public QObject
 {
     Q_OBJECT
@@ -88,5 +90,7 @@ public:
     }
 };
 
+QT_END_NAMESPACE
+
 #endif // QNETWORKSETTINGSINTERFACEPRIVATE_H
 
diff --git a/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.cpp b/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.cpp
index 8721257..d1baffa 100644
--- a/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.cpp
+++ b/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.cpp
@@ -34,6 +34,8 @@
 #include "qnetworksettingsuseragent.h"
 #include "qwifisupplicant_p.h"
 
+QT_BEGIN_NAMESPACE
+
 QNetworkSettingsManagerPrivate::QNetworkSettingsManagerPrivate(QNetworkSettingsManager *parent)
     :QObject(parent)
     ,q_ptr(parent)
@@ -431,3 +433,5 @@ void QNetworkSettingsManagerPrivate::parseScanResults(const QString &results)
         }
     }
 }
+
+QT_END_NAMESPACE
diff --git a/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.h b/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.h
index 4881166..eb894f4 100644
--- a/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.h
+++ b/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.h
@@ -47,7 +47,9 @@
 #include "qnetworksettingsservicemodel.h"
 #include "qwificontroller_p.h"
 
-class WpaSupplicantService;
+QT_FORWARD_DECLARE_CLASS(WpaSupplicantService)
+
+QT_BEGIN_NAMESPACE
 
 class QNetworkSettingsManagerPrivate : public QObject
 {
@@ -95,5 +97,6 @@ private:
     QString m_currentSSID;
 };
 
+QT_END_NAMESPACE
 
 #endif // QNETWORKSETTINGSMANAGERPRIVATE_H
diff --git a/src/networksettings/wpasupplicant/qnetworksettingsservice_p.cpp b/src/networksettings/wpasupplicant/qnetworksettingsservice_p.cpp
index 974f85b..78b6c72 100644
--- a/src/networksettings/wpasupplicant/qnetworksettingsservice_p.cpp
+++ b/src/networksettings/wpasupplicant/qnetworksettingsservice_p.cpp
@@ -29,6 +29,8 @@
 #include "qnetworksettingsservice_p.h"
 #include "qnetworksettingsmanager_p.h"
 
+QT_BEGIN_NAMESPACE
+
 QNetworkSettingsServicePrivate::QNetworkSettingsServicePrivate(const QString& bssid, QNetworkSettingsService *parent) :
     QObject(parent)
     ,q_ptr(parent)
@@ -118,3 +120,5 @@ void WpaSupplicantService::setState(QNetworkSettingsState::States aState)
     d->m_state.setState(aState);
     emit stateChanged();
 }
+
+QT_EMD_NAMESPACE
diff --git a/src/networksettings/wpasupplicant/qnetworksettingsservice_p.h b/src/networksettings/wpasupplicant/qnetworksettingsservice_p.h
index 98652a9..0232663 100644
--- a/src/networksettings/wpasupplicant/qnetworksettingsservice_p.h
+++ b/src/networksettings/wpasupplicant/qnetworksettingsservice_p.h
@@ -44,7 +44,9 @@
 #include "qnetworksettings.h"
 #include "qnetworksettingsservice.h"
 
-class QNetworkSettingsManagerPrivate;
+QT_FORWARD_DECLARE_CLASS(QNetworkSettingsManagerPrivate)
+
+QT_BEGIN_NAMESPACE
 
 class QNetworkSettingsServicePrivate : public QObject
 {
@@ -88,4 +90,6 @@ public:
     void setState(QNetworkSettingsState::States aState);
 };
 
+QT_END_NAMESPACE
+
 #endif // QNETWORKSETTINGSSERVICEPRIVATE_H
diff --git a/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.cpp b/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.cpp
index 4d49127..22960c0 100644
--- a/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.cpp
+++ b/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.cpp
@@ -28,6 +28,8 @@
 ****************************************************************************/
 #include "qnetworksettingsuseragent_p.h"
 
+QT_BEGIN_NAMESPACE
+
 QNetworkSettingsUserAgentPrivate::QNetworkSettingsUserAgentPrivate(QNetworkSettingsUserAgent* parent)
     :QObject(parent)
     ,q_ptr(parent)
@@ -47,3 +49,5 @@ void QNetworkSettingsUserAgentPrivate::cancel()
     Q_Q(QNetworkSettingsUserAgent);
     emit q->ready(true);
 }
+
+QT_END_NAMESPACE
diff --git a/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h b/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h
index f2051c2..8f1d36a 100644
--- a/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h
+++ b/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h
@@ -43,6 +43,8 @@
 #include <QObject>
 #include "qnetworksettingsuseragent.h"
 
+QT_BEGIN_NAMESPACE
+
 class QNetworkSettingsUserAgentPrivate : public QObject
 {
     Q_OBJECT
@@ -56,4 +58,6 @@ public:
     QNetworkSettingsUserAgent *q_ptr;
 };
 
+QT_END_NAMESPACE
+
 #endif // QNETWORKSETTINGSUSERAGENTPRIVATE_H
-- 
cgit v1.2.3