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>

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

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