diff options
| author | Jesus Fernandez <jesus.fernandez@qt.io> | 2017-01-31 13:17:21 +0100 |
|---|---|---|
| committer | Jesús Fernández <jesus.fernandez@qt.io> | 2017-01-31 12:56:32 +0000 |
| commit | 7288759f544991bd8ea3571dd6132c008b1f45e9 (patch) | |
| tree | b01b4f9044994337195f1b063441431a713f8b51 /src/networksettings/connman | |
| parent | cb97681ac8c88ebfc1543d4b1d5788f4db6b633b (diff) | |
Fix qmake warnings
Removes some "We mean it" and "QT_BEGIN_NAMESPACE" warnings.
Change-Id: Ia00b00e4e064814a1cb0dd2ca85a4bd888d58d26
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'src/networksettings/connman')
5 files changed, 48 insertions, 1 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" |