summaryrefslogtreecommitdiffstats
path: root/src/networksettings
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2017-12-19 11:53:05 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2017-12-19 11:57:48 +0200
commit44d7f1865af8a8b4491f2d272f9e8e16f09c741b (patch)
treeab9b7cd2d5986e9707dad18f8447be3cc469d468 /src/networksettings
parent34ed89b61c06c4674260aa6f5f3139aa6310aee5 (diff)
parentb5eea82532059738a7da751222ebef68539508f1 (diff)
Merge remote-tracking branch 'origin/5.10' into dev
* origin/5.10: Merge remote-tracking branch 'origin/5.9' into 5.10 Fix compilation with namespaces Import only available modules Update license headers Verify that Qtdbus module is available tests: add tests.pro for CI Doc: Bump version to 5.9.3 Conflicts: src/bluetoothsettings/discoverymodel.cpp src/localesettings/localefiltermodel.cpp src/localesettings/localemodel.cpp src/timedatesettings/timezonefiltermodel.cpp Change-Id: Iabf7f372c634abea2734c97d748b3e836394ddb1
Diffstat (limited to 'src/networksettings')
-rw-r--r--src/networksettings/connman/connmancommon.cpp4
-rw-r--r--src/networksettings/connman/connmancommon.h4
-rw-r--r--src/networksettings/connman/qnetworksettingsinterface_p.cpp4
-rw-r--r--src/networksettings/connman/qnetworksettingsinterface_p.h9
-rw-r--r--src/networksettings/connman/qnetworksettingsmanager_p.cpp4
-rw-r--r--src/networksettings/connman/qnetworksettingsmanager_p.h17
-rw-r--r--src/networksettings/connman/qnetworksettingsservice_p.cpp3
-rw-r--r--src/networksettings/connman/qnetworksettingsservice_p.h10
-rw-r--r--src/networksettings/connman/qnetworksettingsuseragent_p.cpp4
-rw-r--r--src/networksettings/connman/qnetworksettingsuseragent_p.h4
-rw-r--r--src/networksettings/qnetworksettings.cpp3
-rw-r--r--src/networksettings/qnetworksettingsaddressmodel.cpp4
-rw-r--r--src/networksettings/qnetworksettingsinterface.cpp12
-rw-r--r--src/networksettings/qnetworksettingsinterface.h4
-rw-r--r--src/networksettings/qnetworksettingsinterfacemodel.cpp4
-rw-r--r--src/networksettings/qnetworksettingsmanager.cpp10
-rw-r--r--src/networksettings/qnetworksettingsservice.cpp4
-rw-r--r--src/networksettings/qnetworksettingsservicemodel.cpp4
-rw-r--r--src/networksettings/qnetworksettingsuseragent.cpp6
-rw-r--r--src/networksettings/wpasupplicant/qnetworksettingsinterface_p.cpp4
-rw-r--r--src/networksettings/wpasupplicant/qnetworksettingsinterface_p.h4
-rw-r--r--src/networksettings/wpasupplicant/qnetworksettingsmanager_p.cpp4
-rw-r--r--src/networksettings/wpasupplicant/qnetworksettingsmanager_p.h5
-rw-r--r--src/networksettings/wpasupplicant/qnetworksettingsservice_p.cpp4
-rw-r--r--src/networksettings/wpasupplicant/qnetworksettingsservice_p.h6
-rw-r--r--src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.cpp4
-rw-r--r--src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h4
27 files changed, 128 insertions, 21 deletions
diff --git a/src/networksettings/connman/connmancommon.cpp b/src/networksettings/connman/connmancommon.cpp
index 572c564..887af48 100644
--- a/src/networksettings/connman/connmancommon.cpp
+++ b/src/networksettings/connman/connmancommon.cpp
@@ -28,6 +28,8 @@
****************************************************************************/
#include "connmancommon.h"
+QT_BEGIN_NAMESPACE
+
//Conversion operations for datatypes
const QDBusArgument &operator>>(const QDBusArgument &argument, ConnmanMapStruct &obj)
{
@@ -91,3 +93,5 @@ const QString &operator>>(const QString &argument, QNetworkSettingsState &obj)
}
return argument;
}
+
+QT_END_NAMESPACE
diff --git a/src/networksettings/connman/connmancommon.h b/src/networksettings/connman/connmancommon.h
index 8153507..442730f 100644
--- a/src/networksettings/connman/connmancommon.h
+++ b/src/networksettings/connman/connmancommon.h
@@ -66,9 +66,9 @@ const QString &operator>>(const QString &argument, QNetworkSettingsState &obj);
typedef QList<ConnmanMapStruct> ConnmanMapStructList;
+QT_END_NAMESPACE
+
Q_DECLARE_METATYPE( ConnmanMapStruct )
Q_DECLARE_METATYPE( ConnmanMapStructList )
-QT_END_NAMESPACE
-
#endif // CONNMANCOMMON_H
diff --git a/src/networksettings/connman/qnetworksettingsinterface_p.cpp b/src/networksettings/connman/qnetworksettingsinterface_p.cpp
index b5a8c38..5a64c15 100644
--- a/src/networksettings/connman/qnetworksettingsinterface_p.cpp
+++ b/src/networksettings/connman/qnetworksettingsinterface_p.cpp
@@ -31,6 +31,8 @@
#include "connman_technology_interface.h"
#include "connmancommon.h"
+QT_BEGIN_NAMESPACE
+
QNetworkSettingsInterfacePrivate::QNetworkSettingsInterfacePrivate(QNetworkSettingsInterface* parent)
: QObject(parent)
, m_technology(Q_NULLPTR)
@@ -100,3 +102,5 @@ void QNetworkSettingsInterfacePrivate::scan()
else
qDebug() << "Tried to scan while not powered";
}
+
+QT_END_NAMESPACE
diff --git a/src/networksettings/connman/qnetworksettingsinterface_p.h b/src/networksettings/connman/qnetworksettingsinterface_p.h
index 37aceaf..728e64a 100644
--- a/src/networksettings/connman/qnetworksettingsinterface_p.h
+++ b/src/networksettings/connman/qnetworksettingsinterface_p.h
@@ -47,6 +47,8 @@
class NetConnmanTechnologyInterface;
+QT_BEGIN_NAMESPACE
+
class QNetworkSettingsInterfacePrivate : public QObject
{
Q_OBJECT
@@ -57,6 +59,10 @@ public:
void setPowered(const bool power);
void setState(QNetworkSettingsState::States aState);
void scan();
+ QString name() const {return m_name;}
+ QNetworkSettingsType::Types type() const {return m_type.type();}
+ QNetworkSettingsState::States state() const {return m_state.state();}
+ bool powered() const {return m_powered;}
public slots:
void updateProperty(const QString &name, const QDBusVariant &value);
@@ -93,4 +99,7 @@ public:
}
};
+
+QT_END_NAMESPACE
+
#endif // QNETWORKSETTINGSINTERFACEPRIVATE_H
diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/networksettings/connman/qnetworksettingsmanager_p.cpp
index d666b10..b3373ee 100644
--- a/src/networksettings/connman/qnetworksettingsmanager_p.cpp
+++ b/src/networksettings/connman/qnetworksettingsmanager_p.cpp
@@ -34,6 +34,8 @@
#include "qnetworksettingsservicemodel.h"
#include "qnetworksettingsuseragent.h"
+QT_BEGIN_NAMESPACE
+
QNetworkSettingsManagerPrivate::QNetworkSettingsManagerPrivate(QNetworkSettingsManager *parent)
:QObject(parent)
,q_ptr(parent)
@@ -195,3 +197,5 @@ void QNetworkSettingsManagerPrivate::serviceReady()
}
}
+
+QT_END_NAMESPACE
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
diff --git a/src/networksettings/connman/qnetworksettingsservice_p.cpp b/src/networksettings/connman/qnetworksettingsservice_p.cpp
index f5876e7..f7e6ef1 100644
--- a/src/networksettings/connman/qnetworksettingsservice_p.cpp
+++ b/src/networksettings/connman/qnetworksettingsservice_p.cpp
@@ -31,6 +31,8 @@
#include "connmancommon.h"
#include <QHostAddress>
+QT_BEGIN_NAMESPACE
+
const QString PropertyIPv4(QStringLiteral("IPv4"));
const QString PropertyQNetworkSettingsIPv4(QStringLiteral("IPv4.Configuration"));
const QString PropertyIPv6(QStringLiteral("IPv6"));
@@ -430,3 +432,4 @@ void QNetworkSettingsServicePrivate::setupConfiguration(const QVariantMap &prope
}
}
+QT_END_NAMESPACE
diff --git a/src/networksettings/connman/qnetworksettingsservice_p.h b/src/networksettings/connman/qnetworksettingsservice_p.h
index 76b5182..2e12179 100644
--- a/src/networksettings/connman/qnetworksettingsservice_p.h
+++ b/src/networksettings/connman/qnetworksettingsservice_p.h
@@ -43,10 +43,14 @@
#include "qnetworksettingsservice.h"
#include "qnetworksettings.h"
-class QDBusPendingCallWatcher;
-class QDBusVariant;
+QT_FORWARD_DECLARE_CLASS(QDBusPendingCallWatcher)
+QT_FORWARD_DECLARE_CLASS(QDBusVariant)
+
+// Automatically generated class in global namespace
class NetConnmanServiceInterface;
+QT_BEGIN_NAMESPACE
+
class QNetworkSettingsServicePrivate : public QObject
{
Q_OBJECT
@@ -89,4 +93,6 @@ protected:
bool m_placeholderState;
};
+QT_END_NAMESPACE
+
#endif // QNETWORKSETTINGSSERVICEPRIVATE_H
diff --git a/src/networksettings/connman/qnetworksettingsuseragent_p.cpp b/src/networksettings/connman/qnetworksettingsuseragent_p.cpp
index ede5095..e9e8063 100644
--- a/src/networksettings/connman/qnetworksettingsuseragent_p.cpp
+++ b/src/networksettings/connman/qnetworksettingsuseragent_p.cpp
@@ -29,6 +29,8 @@
#include "qnetworksettingsuseragent_p.h"
#include "connmancommon.h"
+QT_BEGIN_NAMESPACE
+
const QString PropertyPassphrase(QStringLiteral("Passphrase"));
QNetworkSettingsUserAgentPrivate::QNetworkSettingsUserAgentPrivate(QNetworkSettingsUserAgent *parent)
@@ -101,3 +103,5 @@ void QNetworkSettingsUserAgentPrivate::setPassphrase(const QString& passphrase)
m_pendingReply = false;
QDBusConnection::systemBus().send(reply);
}
+
+QT_END_NAMESPACE
diff --git a/src/networksettings/connman/qnetworksettingsuseragent_p.h b/src/networksettings/connman/qnetworksettingsuseragent_p.h
index 248b9ad..180eea5 100644
--- a/src/networksettings/connman/qnetworksettingsuseragent_p.h
+++ b/src/networksettings/connman/qnetworksettingsuseragent_p.h
@@ -51,7 +51,6 @@ template<class Key, class Value> class QMap;
class QString;
class QStringList;
class QVariant;
-QT_END_NAMESPACE
const QString AgentPath(QStringLiteral("/ConnmanAgent"));
@@ -63,6 +62,7 @@ class QNetworkSettingsUserAgentPrivate : public QDBusAbstractAdaptor
public:
QNetworkSettingsUserAgentPrivate(QNetworkSettingsUserAgent *parent = Q_NULLPTR);
void setPassphrase(const QString &passphrase);
+ QString passphrase() const {return m_passphrase;}
void cancel();
void release();
public Q_SLOTS: // Dbus methods
@@ -77,4 +77,6 @@ private:
QString m_passphrase;
};
+QT_END_NAMESPACE
+
#endif // QNETWORKSETTINGSUSERAGENTPRIVATE_H
diff --git a/src/networksettings/qnetworksettings.cpp b/src/networksettings/qnetworksettings.cpp
index fae1b7d..66a9ba2 100644
--- a/src/networksettings/qnetworksettings.cpp
+++ b/src/networksettings/qnetworksettings.cpp
@@ -28,6 +28,8 @@
****************************************************************************/
#include "qnetworksettings.h"
+QT_BEGIN_NAMESPACE
+
QNetworkSettingsState::QNetworkSettingsState(States state, QObject *parent)
: QObject(parent)
, m_state(state)
@@ -257,3 +259,4 @@ bool QNetworkSettingsWireless::outOfRange() const {
return m_isOutOfRange;
}
+QT_END_NAMESPACE
diff --git a/src/networksettings/qnetworksettingsaddressmodel.cpp b/src/networksettings/qnetworksettingsaddressmodel.cpp
index 5b72d46..d86318b 100644
--- a/src/networksettings/qnetworksettingsaddressmodel.cpp
+++ b/src/networksettings/qnetworksettingsaddressmodel.cpp
@@ -28,6 +28,8 @@
****************************************************************************/
#include "qnetworksettingsaddressmodel.h"
+QT_BEGIN_NAMESPACE
+
QNetworkSettingsAddressModel::QNetworkSettingsAddressModel(QObject *parent)
:QStringListModel(parent)
{
@@ -74,3 +76,5 @@ void QNetworkSettingsAddressModel::resetChanges()
{
QStringListModel::setStringList(m_addresses);
}
+
+QT_END_NAMESPACE
diff --git a/src/networksettings/qnetworksettingsinterface.cpp b/src/networksettings/qnetworksettingsinterface.cpp
index fcde01a..9fb0147 100644
--- a/src/networksettings/qnetworksettingsinterface.cpp
+++ b/src/networksettings/qnetworksettingsinterface.cpp
@@ -30,6 +30,8 @@
#include "qnetworksettingsinterface_p.h"
#include "qnetworksettings.h"
+QT_BEGIN_NAMESPACE
+
/*!
\qmltype NetworkInterface
\inqmlmodule QtDeviceUtilities.NetworkSettings
@@ -59,7 +61,7 @@ QNetworkSettingsInterface::QNetworkSettingsInterface(QObject *parent) :
QString QNetworkSettingsInterface::name() const
{
Q_D(const QNetworkSettingsInterface);
- return d->m_name;
+ return d->name();
}
/*!
@@ -96,7 +98,7 @@ QString QNetworkSettingsInterface::name() const
QNetworkSettingsState::States QNetworkSettingsInterface::state()
{
Q_D(QNetworkSettingsInterface);
- return d->m_state.state();
+ return d->state();
}
/*!
@@ -114,7 +116,7 @@ QNetworkSettingsState::States QNetworkSettingsInterface::state()
QNetworkSettingsType::Types QNetworkSettingsInterface::type()
{
Q_D(QNetworkSettingsInterface);
- return d->m_type.type();
+ return d->type();
}
/*!
@@ -124,7 +126,7 @@ QNetworkSettingsType::Types QNetworkSettingsInterface::type()
bool QNetworkSettingsInterface::powered() const
{
Q_D(const QNetworkSettingsInterface);
- return d->m_powered;
+ return d->powered();
}
void QNetworkSettingsInterface::setPowered(const bool powered)
@@ -142,3 +144,5 @@ void QNetworkSettingsInterface::scanServices()
Q_D(QNetworkSettingsInterface);
d->scan();
}
+
+QT_END_NAMESPACE
diff --git a/src/networksettings/qnetworksettingsinterface.h b/src/networksettings/qnetworksettingsinterface.h
index 3961d22..20c1187 100644
--- a/src/networksettings/qnetworksettingsinterface.h
+++ b/src/networksettings/qnetworksettingsinterface.h
@@ -32,10 +32,10 @@
#include <QObject>
#include <QtNetworkSettings/qnetworksettings.h>
-QT_BEGIN_NAMESPACE
-
QT_FORWARD_DECLARE_CLASS(QNetworkSettingsInterfacePrivate)
+QT_BEGIN_NAMESPACE
+
class Q_DECL_EXPORT QNetworkSettingsInterface : public QObject {
Q_OBJECT
Q_PROPERTY(QString name READ name NOTIFY nameChanged)
diff --git a/src/networksettings/qnetworksettingsinterfacemodel.cpp b/src/networksettings/qnetworksettingsinterfacemodel.cpp
index 700db10..8854d5f 100644
--- a/src/networksettings/qnetworksettingsinterfacemodel.cpp
+++ b/src/networksettings/qnetworksettingsinterfacemodel.cpp
@@ -29,6 +29,8 @@
#include "qnetworksettingsinterfacemodel.h"
#include "qnetworksettingsinterface.h"
+QT_BEGIN_NAMESPACE
+
QNetworkSettingsInterfaceModel::QNetworkSettingsInterfaceModel(QObject *parent)
: QAbstractListModel(parent)
{
@@ -104,3 +106,5 @@ QList<QNetworkSettingsInterface*> QNetworkSettingsInterfaceModel::getModel()
{
return m_items;
}
+
+QT_END_NAMESPACE
diff --git a/src/networksettings/qnetworksettingsmanager.cpp b/src/networksettings/qnetworksettingsmanager.cpp
index eb687d1..71aa081 100644
--- a/src/networksettings/qnetworksettingsmanager.cpp
+++ b/src/networksettings/qnetworksettingsmanager.cpp
@@ -34,6 +34,8 @@
#include "qnetworksettingsmanager_p.h"
#include <QStringListModel>
+QT_BEGIN_NAMESPACE
+
QNetworkSettingsManager::QNetworkSettingsManager(QObject *parent) :
QObject(parent)
,d_ptr(new QNetworkSettingsManagerPrivate(this))
@@ -43,20 +45,20 @@ QNetworkSettingsManager::QNetworkSettingsManager(QObject *parent) :
QNetworkSettingsServiceFilter *QNetworkSettingsManager::services()
{
Q_D(QNetworkSettingsManager);
- return d->m_serviceFilter;
+ return d->serviceFilter();
}
QNetworkSettingsInterfaceModel *QNetworkSettingsManager::interfaces()
{
Q_D(QNetworkSettingsManager);
- return &d->m_interfaceModel;
+ return d->interfaceModel();
}
QNetworkSettingsService* QNetworkSettingsManager::service(const QString& name, int type)
{
Q_D(QNetworkSettingsManager);
- foreach (QNetworkSettingsService* service, d->m_serviceModel->getModel()) {
+ foreach (QNetworkSettingsService* service, d->serviceModel()->getModel()) {
if (service->name() == name && service->type() == type) {
return service;
}
@@ -91,3 +93,5 @@ QNetworkSettingsUserAgent* QNetworkSettingsManager::userAgent()
Q_D(QNetworkSettingsManager);
return d->userAgent();
}
+
+QT_END_NAMESPACE
diff --git a/src/networksettings/qnetworksettingsservice.cpp b/src/networksettings/qnetworksettingsservice.cpp
index e910bc3..39ad53d 100644
--- a/src/networksettings/qnetworksettingsservice.cpp
+++ b/src/networksettings/qnetworksettingsservice.cpp
@@ -29,6 +29,8 @@
#include "qnetworksettingsservice.h"
#include "qnetworksettingsservice_p.h"
+QT_BEGIN_NAMESPACE
+
/*!
\qmltype NetworkService
\inqmlmodule QtDeviceUtilities.NetworkSettings
@@ -335,3 +337,5 @@ void QNetworkSettingsService::disconnectService()
Q_D(QNetworkSettingsService);
d->disconnectService();
}
+
+QT_END_NAMESPACE
diff --git a/src/networksettings/qnetworksettingsservicemodel.cpp b/src/networksettings/qnetworksettingsservicemodel.cpp
index a85883e..3040dab 100644
--- a/src/networksettings/qnetworksettingsservicemodel.cpp
+++ b/src/networksettings/qnetworksettingsservicemodel.cpp
@@ -29,6 +29,8 @@
#include "qnetworksettingsservicemodel.h"
#include "qnetworksettings.h"
+QT_BEGIN_NAMESPACE
+
QNetworkSettingsServiceModel::QNetworkSettingsServiceModel(QObject *parent)
: QAbstractListModel(parent)
{
@@ -299,3 +301,5 @@ void QNetworkSettingsServiceFilter::setWiredNetworksAvailable(bool wiredNetworks
m_wiredNetworksAvailable = wiredNetworksAvailable;
emit wiredNetworksAvailableChanged();
}
+
+QT_END_NAMESPACE
diff --git a/src/networksettings/qnetworksettingsuseragent.cpp b/src/networksettings/qnetworksettingsuseragent.cpp
index b29cdf4..8740cf4 100644
--- a/src/networksettings/qnetworksettingsuseragent.cpp
+++ b/src/networksettings/qnetworksettingsuseragent.cpp
@@ -29,6 +29,8 @@
#include "qnetworksettingsuseragent.h"
#include "qnetworksettingsuseragent_p.h"
+QT_BEGIN_NAMESPACE
+
QNetworkSettingsUserAgent::QNetworkSettingsUserAgent(QObject *parent)
:QObject(parent)
,d_ptr(new QNetworkSettingsUserAgentPrivate(this))
@@ -50,5 +52,7 @@ void QNetworkSettingsUserAgent::cancelInput()
QString QNetworkSettingsUserAgent::passphrase() const
{
Q_D(const QNetworkSettingsUserAgent);
- return d->m_passphrase;
+ return d->passphrase();
}
+
+QT_END_NAMESPACE
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