diff options
Diffstat (limited to 'src/networksettings/connman')
10 files changed, 54 insertions, 9 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 |