diff options
Diffstat (limited to 'src/networksettings')
19 files changed, 155 insertions, 8 deletions
diff --git a/src/networksettings/connman/connmancommon.h b/src/networksettings/connman/connmancommon.h index b50a11d..212e12d 100644 --- a/src/networksettings/connman/connmancommon.h +++ b/src/networksettings/connman/connmancommon.h @@ -31,7 +31,7 @@ #include <QtCore/QMetaType> #include <QtDBus> -#include <qnetworksettings.h> +#include <QtNetworkSettings/qnetworksettings.h> #define AgentPath "/ConnmanAgent" #define PropertyState QStringLiteral("State") @@ -50,6 +50,8 @@ #define AttributeDisconnect QStringLiteral("disconnect") #define AttributeOneline QStringLiteral("online") +QT_BEGIN_NAMESPACE + struct ConnmanMapStruct { QDBusObjectPath objectPath; QVariantMap propertyMap; @@ -66,5 +68,6 @@ typedef QList<ConnmanMapStruct> ConnmanMapStructList; Q_DECLARE_METATYPE( ConnmanMapStruct ) Q_DECLARE_METATYPE( ConnmanMapStructList ) +QT_END_NAMESPACE #endif // CONNMANCOMMON_H diff --git a/src/networksettings/connman/qnetworksettingsinterface_p.h b/src/networksettings/connman/qnetworksettingsinterface_p.h index eabe610..37aceaf 100644 --- a/src/networksettings/connman/qnetworksettingsinterface_p.h +++ b/src/networksettings/connman/qnetworksettingsinterface_p.h @@ -29,6 +29,17 @@ #ifndef QNETWORKSETTINGSINTERFACEPRIVATE_H #define QNETWORKSETTINGSINTERFACEPRIVATE_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QObject> #include <QtDBus> #include "qnetworksettings.h" diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.h b/src/networksettings/connman/qnetworksettingsmanager_p.h index b6e23ab..933f69c 100644 --- a/src/networksettings/connman/qnetworksettingsmanager_p.h +++ b/src/networksettings/connman/qnetworksettingsmanager_p.h @@ -29,6 +29,17 @@ #ifndef QNETWORKSETTINGSMANAGERPRIVATE_H #define QNETWORKSETTINGSMANAGERPRIVATE_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QObject> #include <QtDBus> #include "connmancommon.h" diff --git a/src/networksettings/connman/qnetworksettingsservice_p.h b/src/networksettings/connman/qnetworksettingsservice_p.h index 58adbb9..7f3930d 100644 --- a/src/networksettings/connman/qnetworksettingsservice_p.h +++ b/src/networksettings/connman/qnetworksettingsservice_p.h @@ -29,6 +29,17 @@ #ifndef QNETWORKSETTINGSSERVICEPRIVATE_H #define QNETWORKSETTINGSSERVICEPRIVATE_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qnetworksettingsservice.h" #include "qnetworksettings.h" diff --git a/src/networksettings/connman/qnetworksettingsuseragent_p.h b/src/networksettings/connman/qnetworksettingsuseragent_p.h index ff8c1d0..8df9b26 100644 --- a/src/networksettings/connman/qnetworksettingsuseragent_p.h +++ b/src/networksettings/connman/qnetworksettingsuseragent_p.h @@ -29,6 +29,17 @@ #ifndef QNETWORKSETTINGSUSERAGENTPRIVATE_H #define QNETWORKSETTINGSUSERAGENTPRIVATE_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QObject> #include <QtDBus/QtDBus> #include "qnetworksettingsuseragent.h" diff --git a/src/networksettings/qnetworksettings.h b/src/networksettings/qnetworksettings.h index 5323f98..84f5899 100644 --- a/src/networksettings/qnetworksettings.h +++ b/src/networksettings/qnetworksettings.h @@ -32,7 +32,9 @@ #include <QObject> #include <QUrl> #include <QVariantMap> -#include "qnetworksettingsaddressmodel.h" +#include <QtNetworkSettings/qnetworksettingsaddressmodel.h> + +QT_BEGIN_NAMESPACE class Q_DECL_EXPORT QNetworkSettingsState : public QObject { @@ -230,4 +232,7 @@ private: int m_signalStrength; bool m_isOutOfRange; }; + +QT_END_NAMESPACE + #endif //QNETWORKSETTINGS_H diff --git a/src/networksettings/qnetworksettingsaddressmodel.h b/src/networksettings/qnetworksettingsaddressmodel.h index 16d601d..3b0ed8d 100644 --- a/src/networksettings/qnetworksettingsaddressmodel.h +++ b/src/networksettings/qnetworksettingsaddressmodel.h @@ -31,6 +31,8 @@ #include <QStringListModel> +QT_BEGIN_NAMESPACE + class Q_DECL_EXPORT QNetworkSettingsAddressModel : public QStringListModel { Q_OBJECT @@ -50,4 +52,6 @@ private: QStringList m_addresses; }; +QT_END_NAMESPACE + #endif // QNETWORKSETTINGSADDRESSMODEL_H diff --git a/src/networksettings/qnetworksettingsinterface.h b/src/networksettings/qnetworksettingsinterface.h index a87626d..3961d22 100644 --- a/src/networksettings/qnetworksettingsinterface.h +++ b/src/networksettings/qnetworksettingsinterface.h @@ -30,7 +30,9 @@ #define QNETWORKSETTINGSINTERFACE_H #include <QObject> -#include "qnetworksettings.h" +#include <QtNetworkSettings/qnetworksettings.h> + +QT_BEGIN_NAMESPACE QT_FORWARD_DECLARE_CLASS(QNetworkSettingsInterfacePrivate) @@ -64,4 +66,6 @@ protected: Q_DECLARE_PRIVATE(QNetworkSettingsInterface) }; +QT_END_NAMESPACE + #endif // QNETWORKSETTINGSINTERFACE_H diff --git a/src/networksettings/qnetworksettingsinterfacemodel.h b/src/networksettings/qnetworksettingsinterfacemodel.h index 2fc74bc..7e9b870 100644 --- a/src/networksettings/qnetworksettingsinterfacemodel.h +++ b/src/networksettings/qnetworksettingsinterfacemodel.h @@ -30,7 +30,9 @@ #define QNETWORKSETTINGSINTERFACEMODEL_H #include <QAbstractListModel> -#include "qnetworksettings.h" +#include <QtNetworkSettings/qnetworksettings.h> + +QT_BEGIN_NAMESPACE class QNetworkSettingsInterface; @@ -61,4 +63,6 @@ private: QHash<int, QByteArray> m_roleNames; }; +QT_END_NAMESPACE + #endif // QNETWORKSETTINGSINTERFACEMODEL_H diff --git a/src/networksettings/qnetworksettingsmanager.h b/src/networksettings/qnetworksettingsmanager.h index 86a60c4..7e7cfad 100644 --- a/src/networksettings/qnetworksettingsmanager.h +++ b/src/networksettings/qnetworksettingsmanager.h @@ -29,7 +29,7 @@ #ifndef QNETWORKSETTINGSMANAGER_H #define QNETWORKSETTINGSMANAGER_H -#include "qnetworksettings.h" +#include <QtNetworkSettings/qnetworksettings.h> #include <QObject> #include <QStringListModel> @@ -40,6 +40,8 @@ QT_FORWARD_DECLARE_CLASS(QNetworkSettingsUserAgent) QT_FORWARD_DECLARE_CLASS(QNetworkSettingsServiceFilter) QT_FORWARD_DECLARE_CLASS(QNetworkSettingsInterfaceModel) +QT_BEGIN_NAMESPACE + class Q_DECL_EXPORT QNetworkSettingsManager : public QObject { Q_OBJECT @@ -69,4 +71,6 @@ private: Q_DECLARE_PRIVATE(QNetworkSettingsManager) }; +QT_END_NAMESPACE + #endif // QNETWORKSETTINGSMANAGER_H diff --git a/src/networksettings/qnetworksettingsservice.h b/src/networksettings/qnetworksettingsservice.h index 89973a8..ba6bf07 100644 --- a/src/networksettings/qnetworksettingsservice.h +++ b/src/networksettings/qnetworksettingsservice.h @@ -30,10 +30,12 @@ #define QNETWORKSETTINGSSERVICE_H #include <QObject> -#include "qnetworksettings.h" +#include <QtNetworkSettings/qnetworksettings.h> QT_FORWARD_DECLARE_CLASS(QNetworkSettingsServicePrivate) +QT_BEGIN_NAMESPACE + class Q_DECL_EXPORT QNetworkSettingsService : public QObject { Q_OBJECT @@ -89,4 +91,6 @@ protected: Q_DECLARE_PRIVATE(QNetworkSettingsService) }; +QT_END_NAMESPACE + #endif // QNETWORKSETTINGSSERVICE_H diff --git a/src/networksettings/qnetworksettingsservicemodel.h b/src/networksettings/qnetworksettingsservicemodel.h index c158ec4..0b0e674 100644 --- a/src/networksettings/qnetworksettingsservicemodel.h +++ b/src/networksettings/qnetworksettingsservicemodel.h @@ -30,8 +30,10 @@ #define QNETWORKSETTINGSSERVICEMODEL_H #include <QSortFilterProxyModel> -#include "qnetworksettings.h" -#include "qnetworksettingsservice.h" +#include <QtNetworkSettings/qnetworksettings.h> +#include <QtNetworkSettings/qnetworksettingsservice.h> + +QT_BEGIN_NAMESPACE class Q_DECL_EXPORT QNetworkSettingsServiceModel : public QAbstractListModel { @@ -88,4 +90,6 @@ private: QNetworkSettingsType::Types m_type; }; +QT_END_NAMESPACE + #endif // QNETWORKSETTINGSSERVICEMODEL_H diff --git a/src/networksettings/qnetworksettingsuseragent.h b/src/networksettings/qnetworksettingsuseragent.h index 89b4d18..0949661 100644 --- a/src/networksettings/qnetworksettingsuseragent.h +++ b/src/networksettings/qnetworksettingsuseragent.h @@ -33,6 +33,8 @@ QT_FORWARD_DECLARE_CLASS(QNetworkSettingsUserAgentPrivate) +QT_BEGIN_NAMESPACE + class Q_DECL_EXPORT QNetworkSettingsUserAgent : public QObject { Q_OBJECT @@ -53,4 +55,7 @@ private: Q_DISABLE_COPY(QNetworkSettingsUserAgent) Q_DECLARE_PRIVATE(QNetworkSettingsUserAgent) }; + +QT_END_NAMESPACE + #endif // QNETWORKSETTINGSUSERAGENT_H diff --git a/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.h b/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.h index 74ef765..7016bf4 100644 --- a/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.h +++ b/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.h @@ -29,6 +29,17 @@ #ifndef QNETWORKSETTINGSINTERFACEPRIVATE_H #define QNETWORKSETTINGSINTERFACEPRIVATE_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QObject> #include "qnetworksettings.h" #include "qnetworksettingsinterface.h" diff --git a/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.h b/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.h index ebb4667..4881166 100644 --- a/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.h +++ b/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.h @@ -29,6 +29,17 @@ #ifndef QNETWORKSETTINGSMANAGERPRIVATE_H #define QNETWORKSETTINGSMANAGERPRIVATE_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QObject> #include "qnetworksettings.h" #include "qnetworksettingsmanager.h" diff --git a/src/networksettings/wpasupplicant/qnetworksettingsservice_p.h b/src/networksettings/wpasupplicant/qnetworksettingsservice_p.h index 6ed6d5a..98652a9 100644 --- a/src/networksettings/wpasupplicant/qnetworksettingsservice_p.h +++ b/src/networksettings/wpasupplicant/qnetworksettingsservice_p.h @@ -29,6 +29,17 @@ #ifndef QNETWORKSETTINGSSERVICEPRIVATE_H #define QNETWORKSETTINGSSERVICEPRIVATE_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QObject> #include "qnetworksettings.h" #include "qnetworksettingsservice.h" diff --git a/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h b/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h index 0b1a149..6b9fade 100644 --- a/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h +++ b/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h @@ -29,6 +29,17 @@ #ifndef QNETWORKSETTINGSUSERAGENTPRIVATE_H #define QNETWORKSETTINGSUSERAGENTPRIVATE_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QObject> #include "qnetworksettingsuseragent.h" diff --git a/src/networksettings/wpasupplicant/qwificontroller_p.h b/src/networksettings/wpasupplicant/qwificontroller_p.h index a228fb5..15a55f1 100644 --- a/src/networksettings/wpasupplicant/qwificontroller_p.h +++ b/src/networksettings/wpasupplicant/qwificontroller_p.h @@ -29,6 +29,17 @@ #ifndef QWIFICONTROLLER_H #define QWIFICONTROLLER_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QEvent> #include <QtCore/QVector> #include <QtCore/QThread> diff --git a/src/networksettings/wpasupplicant/qwifisupplicant_p.h b/src/networksettings/wpasupplicant/qwifisupplicant_p.h index 5f6b31c..80334ae 100644 --- a/src/networksettings/wpasupplicant/qwifisupplicant_p.h +++ b/src/networksettings/wpasupplicant/qwifisupplicant_p.h @@ -29,6 +29,17 @@ #ifndef QWIFISUPPLICANT_H #define QWIFISUPPLICANT_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QObject> #include <QByteArray> #include <QLoggingCategory> |