diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-02-13 14:36:18 +0100 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-02-13 19:22:45 +0000 |
| commit | 3243b07c34328f520293155a7ea0369c1e1bec6c (patch) | |
| tree | 9690a4f860b5f6b35a2e0a8d2f9dae19ccd3c1ef | |
| parent | 8cd6f0bd9d9e9f164df4f380bdb2d2ed41854af0 (diff) | |
Add begin/end namespace to qmapobjectview_p/_p_p.h
Also fix the include guards
Change-Id: I5ae5125d64fd059b9ab62e7671972c1e00758bba
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| -rw-r--r-- | src/locationlabs/qmapobjectview_p.h | 10 | ||||
| -rw-r--r-- | src/locationlabs/qmapobjectview_p_p.h | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/src/locationlabs/qmapobjectview_p.h b/src/locationlabs/qmapobjectview_p.h index 5477ca72..80f923fd 100644 --- a/src/locationlabs/qmapobjectview_p.h +++ b/src/locationlabs/qmapobjectview_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QGEOMAPLAYER_P_H -#define QGEOMAPLAYER_P_H +#ifndef QMAPOBJECTVIEW_P_H +#define QMAPOBJECTVIEW_P_H // // W A R N I N G @@ -52,6 +52,8 @@ #include <QQmlComponent> #include <QVector> +QT_BEGIN_NAMESPACE + class QQmlDelegateModel; class QMapObjectViewPrivate; class QQmlChangeSet; @@ -108,4 +110,6 @@ protected: QVector<QPointer<QGeoMapObject>> m_userAddedMapObjects; // A third list containing the objects dynamically added through addMapObject }; -#endif // QGEOMAPLAYER_P_H +QT_END_NAMESPACE + +#endif // QMAPOBJECTVIEW_P_H diff --git a/src/locationlabs/qmapobjectview_p_p.h b/src/locationlabs/qmapobjectview_p_p.h index af6bdf8f..bbee557e 100644 --- a/src/locationlabs/qmapobjectview_p_p.h +++ b/src/locationlabs/qmapobjectview_p_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QGEOMAPLAYER_P_P_H -#define QGEOMAPLAYER_P_P_H +#ifndef QMAPOBJECTVIEW_P_P_H +#define QMAPOBJECTVIEW_P_P_H // @@ -54,6 +54,8 @@ #include <QVector> #include <QQmlComponent> +QT_BEGIN_NAMESPACE + class QQmlDelegateModel; class QGeoMap; class Q_LOCATION_PRIVATE_EXPORT QMapObjectViewPrivate : public QGeoMapObjectPrivate @@ -78,4 +80,6 @@ public: QGeoMapObjectPrivate *clone() override; }; -#endif // QGEOMAPLAYER_P_P_H +QT_END_NAMESPACE + +#endif // QMAPOBJECTVIEW_P_P_H |