From 724309463d63480ca755d5f309825a9dd078d012 Mon Sep 17 00:00:00 2001 From: Sami Nurmenniemi 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 Reviewed-by: Teemu Holappa --- src/bluetoothsettings/bluetoothdevice.cpp | 6 +++++- src/bluetoothsettings/bluetoothdevice.h | 4 ++-- src/bluetoothsettings/bluez/bluetoothdevice_p.cpp | 4 ++++ src/bluetoothsettings/bluez/bluetoothdevice_p.h | 5 ++++- src/bluetoothsettings/discoverymodel.cpp | 4 ++++ src/displaysettings/displaysettings.cpp | 4 ++++ src/displaysettings/displaysettings_p.cpp | 4 ++++ src/displaysettings/displaysettings_p.h | 4 ++++ src/imports/bluetoothsettings/plugin.cpp | 5 +++++ src/imports/displaysettings/plugin.cpp | 4 ++++ src/imports/localdevice/plugin.cpp | 4 ++++ src/imports/localesettings/plugin.cpp | 4 ++++ src/imports/networksettings/plugin.cpp | 4 ++++ src/imports/networksettings/plugin.h | 4 ++++ src/imports/timedatesettings/plugin.cpp | 5 +++++ src/localdevice/qlocaldevice.cpp | 3 +++ src/localdevice/qlocaldevice.h | 4 ++++ src/localesettings/localefiltermodel.cpp | 3 +++ src/localesettings/localemodel.cpp | 3 +++ src/localesettings/systemlocale.cpp | 4 ++++ src/localesettings/systemlocale_p.h | 4 ++++ src/networksettings/connman/connmancommon.cpp | 4 ++++ src/networksettings/connman/connmancommon.h | 4 ++-- .../connman/qnetworksettingsinterface_p.cpp | 4 ++++ .../connman/qnetworksettingsinterface_p.h | 9 +++++++++ .../connman/qnetworksettingsmanager_p.cpp | 4 ++++ src/networksettings/connman/qnetworksettingsmanager_p.h | 17 +++++++++++++---- .../connman/qnetworksettingsservice_p.cpp | 3 +++ src/networksettings/connman/qnetworksettingsservice_p.h | 10 ++++++++-- .../connman/qnetworksettingsuseragent_p.cpp | 4 ++++ .../connman/qnetworksettingsuseragent_p.h | 4 +++- src/networksettings/qnetworksettings.cpp | 3 +++ src/networksettings/qnetworksettingsaddressmodel.cpp | 4 ++++ src/networksettings/qnetworksettingsinterface.cpp | 12 ++++++++---- src/networksettings/qnetworksettingsinterface.h | 4 ++-- src/networksettings/qnetworksettingsinterfacemodel.cpp | 4 ++++ src/networksettings/qnetworksettingsmanager.cpp | 10 +++++++--- src/networksettings/qnetworksettingsservice.cpp | 4 ++++ src/networksettings/qnetworksettingsservicemodel.cpp | 4 ++++ src/networksettings/qnetworksettingsuseragent.cpp | 6 +++++- .../wpasupplicant/qnetworksettingsinterface_p.cpp | 4 ++++ .../wpasupplicant/qnetworksettingsinterface_p.h | 4 ++++ .../wpasupplicant/qnetworksettingsmanager_p.cpp | 4 ++++ .../wpasupplicant/qnetworksettingsmanager_p.h | 5 ++++- .../wpasupplicant/qnetworksettingsservice_p.cpp | 4 ++++ .../wpasupplicant/qnetworksettingsservice_p.h | 6 +++++- .../wpasupplicant/qnetworksettingsuseragent_p.cpp | 4 ++++ .../wpasupplicant/qnetworksettingsuseragent_p.h | 4 ++++ .../settingsuiplugin/settingsuiplugin_plugin.cpp | 4 ++++ .../settingsuiplugin/settingsuiplugin_plugin.h | 4 ++++ src/timedatesettings/systemtime.cpp | 4 ++++ src/timedatesettings/systemtime_p.h | 3 +++ src/timedatesettings/timezonefiltermodel.cpp | 3 +++ src/timedatesettings/timezonemodel.cpp | 4 ++++ 54 files changed, 232 insertions(+), 25 deletions(-) diff --git a/src/bluetoothsettings/bluetoothdevice.cpp b/src/bluetoothsettings/bluetoothdevice.cpp index 0facf27..442a31c 100644 --- a/src/bluetoothsettings/bluetoothdevice.cpp +++ b/src/bluetoothsettings/bluetoothdevice.cpp @@ -30,6 +30,8 @@ #include "bluetoothdevice.h" #include "bluetoothdevice_p.h" +QT_BEGIN_NAMESPACE + BluetoothDevice::BluetoothDevice(QObject *parent) : QObject(parent) ,d_ptr(new BluetoothDevicePrivate(this)) { @@ -51,7 +53,7 @@ void BluetoothDevice::setPowered(const bool& aPowered) DiscoveryModel* BluetoothDevice::deviceModel() const { Q_D(const BluetoothDevice); - return d->m_deviceModel; + return d->deviceModel(); } bool BluetoothDevice::scanning() const @@ -89,3 +91,5 @@ bool BluetoothDevice::available() const Q_D(const BluetoothDevice); return d->available(); } + +QT_END_NAMESPACE diff --git a/src/bluetoothsettings/bluetoothdevice.h b/src/bluetoothsettings/bluetoothdevice.h index 03ea961..1c51b87 100644 --- a/src/bluetoothsettings/bluetoothdevice.h +++ b/src/bluetoothsettings/bluetoothdevice.h @@ -32,11 +32,11 @@ #include #include "discoverymodel.h" -QT_BEGIN_NAMESPACE - QT_FORWARD_DECLARE_CLASS(DiscoveryModel) QT_FORWARD_DECLARE_CLASS(BluetoothDevicePrivate) +QT_BEGIN_NAMESPACE + class Q_DECL_EXPORT BluetoothDevice : public QObject { Q_OBJECT diff --git a/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp b/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp index 28ed605..e473f59 100644 --- a/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp +++ b/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp @@ -33,6 +33,8 @@ #include "moc_objectmanager_interface.cpp" #include "device1_interface.h" +QT_BEGIN_NAMESPACE + BluetoothDevicePrivate::BluetoothDevicePrivate(BluetoothDevice *parent) : QObject(parent) ,q_ptr(parent) ,m_localDevice(Q_NULLPTR) @@ -253,3 +255,5 @@ OrgBluezDevice1Interface* BluetoothDevicePrivate::findPeerDevice(const QString & } return NULL; } + +QT_END_NAMESPACE diff --git a/src/bluetoothsettings/bluez/bluetoothdevice_p.h b/src/bluetoothsettings/bluez/bluetoothdevice_p.h index 432a7e7..e037ca3 100644 --- a/src/bluetoothsettings/bluez/bluetoothdevice_p.h +++ b/src/bluetoothsettings/bluez/bluetoothdevice_p.h @@ -45,9 +45,12 @@ #include #include "bluetoothdevice.h" +// Automatically generated classes in global namespace class OrgBluezDevice1Interface; class OrgFreedesktopDBusObjectManagerInterface; +QT_BEGIN_NAMESPACE + class BluetoothDevicePrivate : public QObject { Q_OBJECT @@ -90,6 +93,6 @@ private: OrgFreedesktopDBusObjectManagerInterface *m_manager; }; - +QT_END_NAMESPACE #endif // BLUETOOTHDEVICE__P_H diff --git a/src/bluetoothsettings/discoverymodel.cpp b/src/bluetoothsettings/discoverymodel.cpp index 3cae1df..2f70800 100644 --- a/src/bluetoothsettings/discoverymodel.cpp +++ b/src/bluetoothsettings/discoverymodel.cpp @@ -29,6 +29,8 @@ #include #include "discoverymodel.h" +QT_BEGIN_NAMESPACE + BtDeviceItem::BtDeviceItem(const QBluetoothDeviceInfo& bt, QObject *parent) : QObject(parent) ,m_name(bt.name()) @@ -245,3 +247,5 @@ void DiscoveryModel::setConnected(const QString &aAddress, bool connected) if (found) emit dataChanged(index(i, 0), index(i, 0), role); } + +QT_END_NAMESPACE diff --git a/src/displaysettings/displaysettings.cpp b/src/displaysettings/displaysettings.cpp index 0ab5177..6cadfc2 100644 --- a/src/displaysettings/displaysettings.cpp +++ b/src/displaysettings/displaysettings.cpp @@ -29,6 +29,8 @@ #include "displaysettings.h" #include "displaysettings_p.h" +QT_BEGIN_NAMESPACE + DisplaySettings::DisplaySettings(QObject *parent) : QObject(parent) ,d_ptr(new DisplaySettingsPrivate(this)) @@ -88,3 +90,5 @@ void DisplaySettings::setPhysicalScreenSizeOverride(bool enable) Q_D(DisplaySettings); d->setPhysicalScreenSizeOverride(enable); } + +QT_END_NAMESPACE diff --git a/src/displaysettings/displaysettings_p.cpp b/src/displaysettings/displaysettings_p.cpp index c7bbc9a..890d868 100644 --- a/src/displaysettings/displaysettings_p.cpp +++ b/src/displaysettings/displaysettings_p.cpp @@ -30,6 +30,8 @@ #include #include "displaysettings_p.h" +QT_BEGIN_NAMESPACE + DisplaySettingsPrivate::DisplaySettingsPrivate(DisplaySettings *qq) :q_ptr(qq) ,m_brightness(255) @@ -238,3 +240,5 @@ void PhysicalScreenSize::setEnabled(bool enable) // Rewrite appcontroller.conf with or without the physical width/height lines. write(enable); } + +QT_END_NAMESPACE diff --git a/src/displaysettings/displaysettings_p.h b/src/displaysettings/displaysettings_p.h index 329ed81..7e1d9cd 100644 --- a/src/displaysettings/displaysettings_p.h +++ b/src/displaysettings/displaysettings_p.h @@ -43,6 +43,8 @@ #include #include "displaysettings.h" +QT_BEGIN_NAMESPACE + class PhysicalScreenSize : public QObject { Q_OBJECT @@ -101,4 +103,6 @@ private: PhysicalScreenSize *m_physScreenSize; }; +QT_END_NAMESPACE + #endif // DISPLAYSETTINGSPRIVATE_H diff --git a/src/imports/bluetoothsettings/plugin.cpp b/src/imports/bluetoothsettings/plugin.cpp index cd2cfcf..6c5fcf1 100644 --- a/src/imports/bluetoothsettings/plugin.cpp +++ b/src/imports/bluetoothsettings/plugin.cpp @@ -107,6 +107,9 @@ \sa requestConnect() */ + +QT_BEGIN_NAMESPACE + template QObject *instance(QQmlEngine *engine, QJSEngine *) { T *t = new T(engine); @@ -128,4 +131,6 @@ public: } }; +QT_END_NAMESPACE + #include "plugin.moc" diff --git a/src/imports/displaysettings/plugin.cpp b/src/imports/displaysettings/plugin.cpp index 366ab0b..fd88a1a 100644 --- a/src/imports/displaysettings/plugin.cpp +++ b/src/imports/displaysettings/plugin.cpp @@ -84,6 +84,8 @@ used or not. */ +QT_BEGIN_NAMESPACE + template QObject *instance(QQmlEngine *engine, QJSEngine *) { T *t = new T(engine); @@ -104,4 +106,6 @@ public: } }; +QT_END_NAMESPACE + #include "plugin.moc" diff --git a/src/imports/localdevice/plugin.cpp b/src/imports/localdevice/plugin.cpp index ca9fe68..785b364 100644 --- a/src/imports/localdevice/plugin.cpp +++ b/src/imports/localdevice/plugin.cpp @@ -85,6 +85,8 @@ \sa reboot() */ +QT_BEGIN_NAMESPACE + static QObject *module_api_factory(QQmlEngine *engine, QJSEngine *scriptEngine) { Q_UNUSED(engine) @@ -111,4 +113,6 @@ public: } }; +QT_END_NAMESPACE + #include "plugin.moc" diff --git a/src/imports/localesettings/plugin.cpp b/src/imports/localesettings/plugin.cpp index 60c19c1..db90003 100644 --- a/src/imports/localesettings/plugin.cpp +++ b/src/imports/localesettings/plugin.cpp @@ -148,6 +148,8 @@ from a list. */ +QT_BEGIN_NAMESPACE + template QObject *instance(QQmlEngine *engine, QJSEngine *) { T *t = new T(engine); @@ -168,4 +170,6 @@ public: } }; +QT_END_NAMESPACE + #include "plugin.moc" diff --git a/src/imports/networksettings/plugin.cpp b/src/imports/networksettings/plugin.cpp index 665cb6a..ebebf98 100644 --- a/src/imports/networksettings/plugin.cpp +++ b/src/imports/networksettings/plugin.cpp @@ -151,6 +151,8 @@ This signal is emitted when the connection failed due to invalid user credentials. */ +QT_BEGIN_NAMESPACE + template QObject *instance(QQmlEngine *engine, QJSEngine *) { T *t = new T(engine); @@ -174,3 +176,5 @@ void NetworksettingspluginPlugin::registerTypes(const char *uri) qmlRegisterSingletonType(uri, 1, 0, "NetworkSettingsManager", &instance); } + +QT_END_NAMESPACE diff --git a/src/imports/networksettings/plugin.h b/src/imports/networksettings/plugin.h index 61f148c..e5c7bc7 100644 --- a/src/imports/networksettings/plugin.h +++ b/src/imports/networksettings/plugin.h @@ -31,6 +31,8 @@ #include +QT_BEGIN_NAMESPACE + class NetworksettingspluginPlugin : public QQmlExtensionPlugin { Q_OBJECT @@ -40,5 +42,7 @@ public: void registerTypes(const char *uri); }; +QT_END_NAMESPACE + #endif // NETWORKSETTINGSPLUGIN_PLUGIN_H diff --git a/src/imports/timedatesettings/plugin.cpp b/src/imports/timedatesettings/plugin.cpp index 9ebe945..0ddfed4 100644 --- a/src/imports/timedatesettings/plugin.cpp +++ b/src/imports/timedatesettings/plugin.cpp @@ -138,6 +138,9 @@ {TimeManager.timeZone}, when the user selects a time zone from a list. */ + +QT_BEGIN_NAMESPACE + template QObject *instance(QQmlEngine *engine, QJSEngine *) { T *t = new T(engine); @@ -158,4 +161,6 @@ public: } }; +QT_END_NAMESPACE + #include "plugin.moc" diff --git a/src/localdevice/qlocaldevice.cpp b/src/localdevice/qlocaldevice.cpp index d778f20..f6b2c2b 100644 --- a/src/localdevice/qlocaldevice.cpp +++ b/src/localdevice/qlocaldevice.cpp @@ -30,6 +30,8 @@ #include #include +QT_BEGIN_NAMESPACE + QLocalDevice::QLocalDevice(QObject *parent) : QObject(parent) { @@ -64,3 +66,4 @@ void QLocalDevice::powerOff() qWarning("powerOff returned"); } +QT_END_NAMESPACE diff --git a/src/localdevice/qlocaldevice.h b/src/localdevice/qlocaldevice.h index c9918f0..4a0071a 100644 --- a/src/localdevice/qlocaldevice.h +++ b/src/localdevice/qlocaldevice.h @@ -31,6 +31,8 @@ #include +QT_BEGIN_NAMESPACE + class Q_DECL_EXPORT QLocalDevice : public QObject { Q_OBJECT @@ -44,4 +46,6 @@ public Q_SLOTS: void powerOff(); }; +QT_END_NAMESPACE + #endif // QLOCALDEVICE_H diff --git a/src/localesettings/localefiltermodel.cpp b/src/localesettings/localefiltermodel.cpp index d45fac6..186a9c8 100644 --- a/src/localesettings/localefiltermodel.cpp +++ b/src/localesettings/localefiltermodel.cpp @@ -29,6 +29,8 @@ #include "localemodel.h" #include "localefiltermodel.h" +QT_BEGIN_NAMESPACE + LocaleFilterModel::LocaleFilterModel(QObject* parent) :QSortFilterProxyModel(parent) { @@ -89,3 +91,4 @@ QVariant LocaleFilterModel::itemFromRow(const int row) const return QVariant(); } +QT_END_NAMESPACE diff --git a/src/localesettings/localemodel.cpp b/src/localesettings/localemodel.cpp index b5a934b..a5112ed 100644 --- a/src/localesettings/localemodel.cpp +++ b/src/localesettings/localemodel.cpp @@ -33,6 +33,7 @@ #include #include "localemodel.h" +QT_BEGIN_NAMESPACE LocaleItem::LocaleItem(const QLocale& locale, QObject *parent) :QObject(parent) @@ -158,3 +159,5 @@ void LocaleModel::sort(int column, Qt::SortOrder order) Q_UNUSED(order); std::sort(m_items.begin(), m_items.end(), LocaleModel::variantLessThan); } + +QT_END_NAMESPACE diff --git a/src/localesettings/systemlocale.cpp b/src/localesettings/systemlocale.cpp index 37f157b..e6de431 100644 --- a/src/localesettings/systemlocale.cpp +++ b/src/localesettings/systemlocale.cpp @@ -30,6 +30,8 @@ #include "systemlocale.h" #include "systemlocale_p.h" +QT_BEGIN_NAMESPACE + SystemLocale::SystemLocale(QObject *parent) :QObject(parent) ,d_ptr(new SystemLocalePrivate(this)) @@ -48,3 +50,5 @@ void SystemLocale::setLocale(const QString& aLocale) d->setLocale(aLocale); emit localeChanged(); } + +QT_END_NAMESPACE diff --git a/src/localesettings/systemlocale_p.h b/src/localesettings/systemlocale_p.h index 96af3c1..a3d1a5f 100644 --- a/src/localesettings/systemlocale_p.h +++ b/src/localesettings/systemlocale_p.h @@ -43,6 +43,8 @@ #include "systemlocale.h" #include "locale_interface.h" +QT_BEGIN_NAMESPACE + class SystemLocalePrivate { Q_DECLARE_PUBLIC(SystemLocale) @@ -88,4 +90,6 @@ private: SystemLocale *q_ptr; }; +QT_END_NAMESPACE + #endif // LOCALE_P_H diff --git a/src/networksettings/connman/connmancommon.cpp b/src/networksettings/connman/connmancommon.cpp index f609f22..ae57da8 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) { @@ -88,3 +90,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 212e12d..9c6e53a 100644 --- a/src/networksettings/connman/connmancommon.h +++ b/src/networksettings/connman/connmancommon.h @@ -65,9 +65,9 @@ const QString &operator>>(const QString &argument, QNetworkSettingsState &obj); typedef QList 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 83ab73a..041dcca 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) @@ -97,3 +99,5 @@ void QNetworkSettingsInterfacePrivate::scan() { m_technology->Scan(); } + +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 e3f6d0b..a136237 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) @@ -198,3 +200,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 +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 4d6e10b..595092b 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) @@ -89,3 +91,5 @@ void QNetworkSettingsUserAgentPrivate::setPassphrase(const QString& passphrase) m_pendingReply = false; QDBusConnection::systemBus().send(m_reply); } + +QT_END_NAMESPACE diff --git a/src/networksettings/connman/qnetworksettingsuseragent_p.h b/src/networksettings/connman/qnetworksettingsuseragent_p.h index fb96645..6433918 100644 --- a/src/networksettings/connman/qnetworksettingsuseragent_p.h +++ b/src/networksettings/connman/qnetworksettingsuseragent_p.h @@ -51,7 +51,6 @@ template 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 #include -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 QNetworkSettingsInterfaceModel::getModel() { return m_items; } + +QT_END_NAMESPACE diff --git a/src/networksettings/qnetworksettingsmanager.cpp b/src/networksettings/qnetworksettingsmanager.cpp index caf6057..dafc0b1 100644 --- a/src/networksettings/qnetworksettingsmanager.cpp +++ b/src/networksettings/qnetworksettingsmanager.cpp @@ -33,6 +33,8 @@ #include "qnetworksettingsmanager_p.h" #include +QT_BEGIN_NAMESPACE + QNetworkSettingsManager::QNetworkSettingsManager(QObject *parent) : QObject(parent) ,d_ptr(new QNetworkSettingsManagerPrivate(this)) @@ -42,20 +44,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, const 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; } @@ -74,3 +76,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 f7a8a26..9c0b93d 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 #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 diff --git a/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp b/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp index f428916..b985e31 100644 --- a/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp +++ b/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp @@ -72,9 +72,13 @@ to declare a custom settings UI, unless specifically required. */ +QT_BEGIN_NAMESPACE + void SettingsuipluginPlugin::registerTypes(const char *uri) { // @uri QtDeviceUtilities.SettingsUI Q_ASSERT(uri == QLatin1String("QtDeviceUtilities.SettingsUI")); qmlRegisterType(QUrl("qrc:/pluginMain.qml"), uri, 1, 0, "SettingsUI"); } + +QT_END_NAMESPACE diff --git a/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.h b/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.h index 4ab42ad..32a92b5 100644 --- a/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.h +++ b/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.h @@ -31,6 +31,8 @@ #include +QT_BEGIN_NAMESPACE + class SettingsuipluginPlugin : public QQmlExtensionPlugin { Q_OBJECT @@ -40,4 +42,6 @@ public: void registerTypes(const char *uri); }; +QT_END_NAMESPACE + #endif // SETTINGSUIPLUGIN_PLUGIN_H diff --git a/src/timedatesettings/systemtime.cpp b/src/timedatesettings/systemtime.cpp index 32e6e51..ce97899 100644 --- a/src/timedatesettings/systemtime.cpp +++ b/src/timedatesettings/systemtime.cpp @@ -29,6 +29,8 @@ #include "systemtime.h" #include "systemtime_p.h" +QT_BEGIN_NAMESPACE + SystemTime::SystemTime(QObject *parent) : QObject(parent) ,d_ptr(new SystemTimePrivate(this)) @@ -76,3 +78,5 @@ QDateTime SystemTime::time() const { return QDateTime::currentDateTime(); } + +QT_END_NAMESPACE diff --git a/src/timedatesettings/systemtime_p.h b/src/timedatesettings/systemtime_p.h index 7cdb135..a6ab646 100644 --- a/src/timedatesettings/systemtime_p.h +++ b/src/timedatesettings/systemtime_p.h @@ -43,6 +43,8 @@ #include "systemtime.h" #include "timedated_interface.h" +QT_BEGIN_NAMESPACE + class SystemTimePrivate { Q_DECLARE_PUBLIC(SystemTime) @@ -88,5 +90,6 @@ private: SystemTime *q_ptr; }; +QT_END_NAMESPACE #endif // SYSTEMTIME_P_H diff --git a/src/timedatesettings/timezonefiltermodel.cpp b/src/timedatesettings/timezonefiltermodel.cpp index c1614ef..9c2dfb7 100644 --- a/src/timedatesettings/timezonefiltermodel.cpp +++ b/src/timedatesettings/timezonefiltermodel.cpp @@ -29,6 +29,8 @@ #include "timezonemodel.h" #include "timezonefiltermodel.h" +QT_BEGIN_NAMESPACE + TimezoneFilterModel::TimezoneFilterModel(QObject* parent) :QSortFilterProxyModel(parent) { @@ -97,3 +99,4 @@ QVariant TimezoneFilterModel::itemFromRow(const int row) const return QVariant(); } +QT_END_NAMESPACE diff --git a/src/timedatesettings/timezonemodel.cpp b/src/timedatesettings/timezonemodel.cpp index 4273df9..bd56814 100644 --- a/src/timedatesettings/timezonemodel.cpp +++ b/src/timedatesettings/timezonemodel.cpp @@ -32,6 +32,8 @@ #include #include "timezonemodel.h" +QT_BEGIN_NAMESPACE + TimezoneItem::TimezoneItem(const QByteArray& id, QObject *parent) :QObject(parent) { @@ -129,3 +131,5 @@ QVariant TimezoneModel::data(const QModelIndex & index, int role) const return QVariant(); } } + +QT_END_NAMESPACE -- cgit v1.2.3