Reintroduced namespace macros

Task-number: QTRD-2594

Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b
Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

40 files changed, 96 insertions, 171 deletions

diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp
index 9ec6f087..7e938387 100644
--- a/src/datavisualization/engine/abstract3dcontroller.cpp
+++ b/src/datavisualization/engine/abstract3dcontroller.cpp
@@ -33,17 +33,7 @@
 
 #include <QThread>
 
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::Abstract3DController
- * \internal
- */
-
-/*!
- * \class QtDataVisualization::Abstract3DChangeBitField
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 Abstract3DController::Abstract3DController(QRect initialViewport, Q3DScene *scene, QObject *parent) :
     QObject(parent),
@@ -1026,4 +1016,4 @@ void Abstract3DController::emitNeedRender()
     }
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h
index c38135ed..944c00b1 100644
--- a/src/datavisualization/engine/abstract3drenderer_p.h
+++ b/src/datavisualization/engine/abstract3drenderer_p.h
@@ -41,7 +41,7 @@
 
 //#define DISPLAY_RENDER_SPEED
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class TextureHelper;
 class Theme;
@@ -146,6 +146,6 @@ protected:
 #endif
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif // ABSTRACT3DRENDERER_P_H
diff --git a/src/datavisualization/engine/axisrendercache.cpp b/src/datavisualization/engine/axisrendercache.cpp
index 5598563a..acc59906 100644
--- a/src/datavisualization/engine/axisrendercache.cpp
+++ b/src/datavisualization/engine/axisrendercache.cpp
@@ -20,12 +20,7 @@
 #include "qmath.h"
 #include <QFontMetrics>
 
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::AxisRenderCache
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 AxisRenderCache::AxisRenderCache()
     : m_type(QAbstract3DAxis::AxisTypeNone),
@@ -188,4 +183,4 @@ int AxisRenderCache::maxLabelWidth(const QStringList &labels) const
     return labelWidth;
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/engine/axisrendercache_p.h b/src/datavisualization/engine/axisrendercache_p.h
index 595ba83b..c4576be5 100644
--- a/src/datavisualization/engine/axisrendercache_p.h
+++ b/src/datavisualization/engine/axisrendercache_p.h
@@ -34,7 +34,7 @@
 #include "qabstract3daxis_p.h"
 #include "drawer_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class AxisRenderCache : public QObject
 {
@@ -96,6 +96,6 @@ private:
     Q_DISABLE_COPY(AxisRenderCache)
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp
index 97e21fc6..81499ac7 100644
--- a/src/datavisualization/engine/bars3drenderer.cpp
+++ b/src/datavisualization/engine/bars3drenderer.cpp
@@ -38,12 +38,7 @@
 // You should see the scene from  where the light is
 //#define SHOW_DEPTH_TEXTURE_SCENE
 
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::Bars3DRenderer
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 const GLfloat labelMargin = 0.05f;
 const GLfloat gridLineWidth = 0.005f;
@@ -2205,4 +2200,4 @@ void Bars3DRenderer::initLabelShaders(const QString &vertexShader, const QString
     m_labelShader->initialize();
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/engine/bars3drenderer_p.h b/src/datavisualization/engine/bars3drenderer_p.h
index 03e490b8..0eb3e60a 100644
--- a/src/datavisualization/engine/bars3drenderer_p.h
+++ b/src/datavisualization/engine/bars3drenderer_p.h
@@ -26,8 +26,8 @@
 //
 // We mean it.
 
-#ifndef Q3DBARSRENDERER_p_H
-#define Q3DBARSRENDERER_p_H
+#ifndef Q3DBARSRENDERER_P_H
+#define Q3DBARSRENDERER_P_H
 
 #include "datavisualizationglobal_p.h"
 #include "bars3dcontroller_p.h"
@@ -39,7 +39,7 @@ class QPoint;
 class QSizeF;
 class QOpenGLShaderProgram;
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class ShaderHelper;
 class ObjectHelper;
@@ -162,7 +162,6 @@ private:
     friend class BarRenderItem;
 };
 
-
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/engine/drawer.cpp b/src/datavisualization/engine/drawer.cpp
index a2905e32..72b64212 100644
--- a/src/datavisualization/engine/drawer.cpp
+++ b/src/datavisualization/engine/drawer.cpp
@@ -38,12 +38,7 @@ public:
 };
 StaticLibInitializer staticLibInitializer;
 
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::Drawer
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 // Vertex array buffer for point
 const GLfloat point_data[] = {0.0f, 0.0f, 0.0f};
@@ -405,4 +400,4 @@ void Drawer::generateLabelItem(LabelItem &item, const QString &text, int widestL
     }
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/engine/drawer_p.h b/src/datavisualization/engine/drawer_p.h
index 82163c08..ba9aadf7 100644
--- a/src/datavisualization/engine/drawer_p.h
+++ b/src/datavisualization/engine/drawer_p.h
@@ -36,7 +36,7 @@
 #include "abstractrenderitem_p.h"
 #include <QFont>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class ShaderHelper;
 class ObjectHelper;
@@ -100,6 +100,6 @@ private:
     GLuint m_pointbuffer;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp
index 9a6ff6d5..a5b1dc3e 100644
--- a/src/datavisualization/engine/q3dbars.cpp
+++ b/src/datavisualization/engine/q3dbars.cpp
@@ -24,10 +24,10 @@
 #include "q3dcamera.h"
 #include "qbar3dseries_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 /*!
- * \class QtDataVisualization::Q3DBars
+ * \class Q3DBars
  * \inmodule QtDataVisualization
  * \brief The Q3DBars class provides methods for rendering 3D bar graphs.
  * \since Qt Data Visualization 1.0
@@ -167,7 +167,7 @@ void Q3DBars::removeSeries(QBar3DSeries *series)
  * the new position in list is calculated as if the series was still in its old
  * index, so the final index is actually the \a index decremented by one.
  *
- * \sa addSeries(), seriesList(), seriesIndex()
+ * \sa addSeries(), seriesList()
  */
 void Q3DBars::insertSeries(int index, QBar3DSeries *series)
 {
@@ -351,10 +351,6 @@ const Q3DBarsPrivate *Q3DBars::dptrc() const
     return static_cast<const Q3DBarsPrivate *>(d_ptr.data());
 }
 
-/*!
- * \class QtDataVisualization::Q3DBarsPrivate
- * \internal
- */
 Q3DBarsPrivate::Q3DBarsPrivate(Q3DBars *q)
     : QAbstract3DGraphPrivate(q)
 {
@@ -384,4 +380,4 @@ Q3DBars *Q3DBarsPrivate::qptr()
     return static_cast<Q3DBars *>(q_ptr);
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/engine/q3dbars.h b/src/datavisualization/engine/q3dbars.h
index 251e410f..bf973c11 100644
--- a/src/datavisualization/engine/q3dbars.h
+++ b/src/datavisualization/engine/q3dbars.h
@@ -23,7 +23,7 @@
 #include <QFont>
 #include <QLinearGradient>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Q3DBarsPrivate;
 class QAbstract3DAxis;
@@ -87,6 +87,6 @@ private:
     Q_DISABLE_COPY(Q3DBars)
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/engine/q3dbars_p.h b/src/datavisualization/engine/q3dbars_p.h
index 3e7c97ac..dbe4ce2d 100644
--- a/src/datavisualization/engine/q3dbars_p.h
+++ b/src/datavisualization/engine/q3dbars_p.h
@@ -32,7 +32,7 @@
 #include "bars3dcontroller_p.h"
 #include "qabstract3dgraph_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Q3DBars;
 
@@ -52,6 +52,6 @@ public:
     Bars3DController *m_shared;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/engine/q3dbox.cpp b/src/datavisualization/engine/q3dbox.cpp
index bbfa4ddc..e9fd3fd8 100644
--- a/src/datavisualization/engine/q3dbox.cpp
+++ b/src/datavisualization/engine/q3dbox.cpp
@@ -20,10 +20,10 @@
 #include "q3dbox.h"
 #include <QtCore/QList>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 /*!
-    \class QtDataVisualization::Q3DBox
+    \class Q3DBox
     \inmodule QtDataVisualization
     \brief The Q3DBox class represents an axis-aligned box in 3D space.
     \since Qt Data Visualization 1.0
@@ -404,7 +404,7 @@ Q3DBox Q3DBox::transformed(const QMatrix4x4& matrix) const
 
 /*!
     \fn bool qFuzzyCompare(const Q3DBox& box1, const Q3DBox& box2)
-    \relates QtDataVisualization::Q3DBox
+    \relates Q3DBox
 
     Returns true if \a box1 and \a box2 are almost equal; false otherwise.
 */
@@ -482,4 +482,4 @@ QDataStream &operator>>(QDataStream &stream, Q3DBox &box)
 
 #endif // QT_NO_DATASTREAM
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/engine/q3dbox.h b/src/datavisualization/engine/q3dbox.h
index fcf46bdf..e18466f3 100644
--- a/src/datavisualization/engine/q3dbox.h
+++ b/src/datavisualization/engine/q3dbox.h
@@ -22,7 +22,7 @@
 #include <QtGui/QMatrix4x4>
 #include <QtGui/QVector3D>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Q3DBox; // Needed to circumvent an issue with qdoc. If this line is removed, make docs will not work for this.
 
@@ -152,6 +152,6 @@ QT_DATAVISUALIZATION_EXPORT QDataStream &operator<<(QDataStream &stream, const Q
 QT_DATAVISUALIZATION_EXPORT QDataStream &operator>>(QDataStream &stream, Q3DBox &box);
 #endif
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/engine/q3dcamera.cpp b/src/datavisualization/engine/q3dcamera.cpp
index a045d7bb..8a02d3ae 100644
--- a/src/datavisualization/engine/q3dcamera.cpp
+++ b/src/datavisualization/engine/q3dcamera.cpp
@@ -26,10 +26,10 @@
 #include <qmath.h>
 #include <QVector3D>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 /*!
- * \class QtDataVisualization::Q3DCamera
+ * \class Q3DCamera
  * \inmodule QtDataVisualization
  * \brief Representation of a camera in 3D space.
  * \since Qt Data Visualization 1.0
@@ -81,7 +81,7 @@ namespace QtDataVisualization {
  * \inqmlmodule QtDataVisualization
  * \since QtDataVisualization 1.0
  * \ingroup datavisualization_qml
- * \instantiates QtDataVisualization::Q3DCamera
+ * \instantiates Q3DCamera
  * \brief Representation of a camera in 3D space.
  *
  * Camera3D represents a basic orbit around centerpoint 3D camera that is used when rendering the
@@ -760,10 +760,6 @@ void Q3DCamera::setCameraPosition(float horizontal, float vertical, float zoom)
     setYRotation(vertical);
 }
 
-/*!
- * \class QtDataVisualization::Q3DCameraPrivate
- * \internal
- */
 Q3DCameraPrivate::Q3DCameraPrivate(Q3DCamera *q) :
     q_ptr(q),
     m_isViewMatrixUpdateActive(true),
@@ -871,5 +867,4 @@ void Q3DCameraPrivate::updateViewMatrix(float zoomAdjustment)
     q_ptr->setViewMatrix(viewMatrix);
 }
 
-
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/engine/q3dcamera.h b/src/datavisualization/engine/q3dcamera.h
index b4341bb7..4c4d2851 100644
--- a/src/datavisualization/engine/q3dcamera.h
+++ b/src/datavisualization/engine/q3dcamera.h
@@ -25,7 +25,7 @@
 class QVector3D;
 class QPoint;
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Q3DCameraPrivate;
 
@@ -157,6 +157,6 @@ private:
     friend class QMac3DInputHandler;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif // Q3DCAMERA_H
diff --git a/src/datavisualization/engine/q3dcamera_p.h b/src/datavisualization/engine/q3dcamera_p.h
index cfaaeb4d..555d5cd9 100644
--- a/src/datavisualization/engine/q3dcamera_p.h
+++ b/src/datavisualization/engine/q3dcamera_p.h
@@ -32,7 +32,7 @@
 #include "datavisualizationglobal_p.h"
 #include "q3dcamera.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Q3DCamera;
 
@@ -82,6 +82,6 @@ public:
     friend class QMac3DInputHandler;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif // Q3DCAMERA_P_H
diff --git a/src/datavisualization/engine/q3dlight.cpp b/src/datavisualization/engine/q3dlight.cpp
index 6b5c456f..25dbc79e 100644
--- a/src/datavisualization/engine/q3dlight.cpp
+++ b/src/datavisualization/engine/q3dlight.cpp
@@ -20,10 +20,10 @@
 #include "q3dscene.h"
 #include "q3dlight_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 /*!
- * \class QtDataVisualization::Q3DLight
+ * \class Q3DLight
  * \inmodule QtDataVisualization
  * \brief Representation of a light source in 3D space.
  * \since Qt Data Visualization 1.0
@@ -36,7 +36,7 @@ namespace QtDataVisualization {
  * \inqmlmodule QtDataVisualization
  * \since QtDataVisualization 1.0
  * \ingroup datavisualization_qml
- * \instantiates QtDataVisualization::Q3DLight
+ * \instantiates Q3DLight
  * \brief Representation of a light source in 3D space.
  *
  * Light3D represents a monochrome non variable light source in 3D space.
@@ -59,10 +59,6 @@ Q3DLight::~Q3DLight()
 {
 }
 
-/*!
- * \class QtDataVisualization::Q3DLightPrivate
- * \internal
- */
 Q3DLightPrivate::Q3DLightPrivate(Q3DLight *q) :
     q_ptr(q)
 {
@@ -83,4 +79,4 @@ void Q3DLightPrivate::sync(Q3DLight &other)
     }
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/engine/q3dlight.h b/src/datavisualization/engine/q3dlight.h
index 6515b1ae..f37c0983 100644
--- a/src/datavisualization/engine/q3dlight.h
+++ b/src/datavisualization/engine/q3dlight.h
@@ -21,7 +21,7 @@
 
 #include <QtDataVisualization/q3dobject.h>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Q3DLightPrivate;
 class Q3DScene;
@@ -43,6 +43,6 @@ private:
     friend class Q3DScenePrivate;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif // Q3DLIGHT_H
diff --git a/src/datavisualization/engine/q3dlight_p.h b/src/datavisualization/engine/q3dlight_p.h
index bd871427..c68956ad 100644
--- a/src/datavisualization/engine/q3dlight_p.h
+++ b/src/datavisualization/engine/q3dlight_p.h
@@ -32,7 +32,7 @@
 #include "datavisualizationglobal_p.h"
 #include "q3dlight.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Q3DScene;
 class Q3DLight;
@@ -49,7 +49,7 @@ public:
     Q3DLight *q_ptr;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif // Q3DLIGHT_P_H
 
diff --git a/src/datavisualization/engine/q3dobject.cpp b/src/datavisualization/engine/q3dobject.cpp
index 946a41cc..f81b7f91 100644
--- a/src/datavisualization/engine/q3dobject.cpp
+++ b/src/datavisualization/engine/q3dobject.cpp
@@ -20,10 +20,10 @@
 #include "q3dobject_p.h"
 #include "q3dscene_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 /*!
-   \class QtDataVisualization::Q3DObject
+   \class Q3DObject
    \inmodule QtDataVisualization
    \brief Simple baseclass for all the objects in the 3D scene.
    \since Qt Data Visualization 1.0
@@ -109,10 +109,6 @@ bool Q3DObject::isDirty() const
     return d_ptr->m_isDirty;
 }
 
-/*!
- * \class QtDataVisualization::Q3DObjectPrivate
- * \internal
- */
 Q3DObjectPrivate::Q3DObjectPrivate(Q3DObject *q) :
     q_ptr(q),
     m_isDirty(true)
@@ -124,4 +120,4 @@ Q3DObjectPrivate::~Q3DObjectPrivate()
 
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/engine/q3dobject.h b/src/datavisualization/engine/q3dobject.h
index c32203cc..da83709a 100644
--- a/src/datavisualization/engine/q3dobject.h
+++ b/src/datavisualization/engine/q3dobject.h
@@ -24,7 +24,7 @@
 #include <QObject>
 #include <QVector3D>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Q3DObjectPrivate;
 
@@ -60,6 +60,6 @@ private:
     friend class Q3DScenePrivate;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif // Q3DOBJECT_H
diff --git a/src/datavisualization/engine/q3dobject_p.h b/src/datavisualization/engine/q3dobject_p.h
index 51bf1b08..90de8604 100644
--- a/src/datavisualization/engine/q3dobject_p.h
+++ b/src/datavisualization/engine/q3dobject_p.h
@@ -31,7 +31,7 @@
 
 #include "datavisualizationglobal_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Q3DObject;
 class Q3DScene;
@@ -48,6 +48,6 @@ public:
     bool m_isDirty;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif // Q3DOBJECT_P_H
diff --git a/src/datavisualization/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp
index 99e6c096..9af916cb 100644
--- a/src/datavisualization/engine/q3dscatter.cpp
+++ b/src/datavisualization/engine/q3dscatter.cpp
@@ -23,10 +23,10 @@
 #include "q3dcamera.h"
 #include "qscatter3dseries_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 /*!
- * \class QtDataVisualization::Q3DScatter
+ * \class Q3DScatter
  * \inmodule QtDataVisualization
  * \brief The Q3DScatter class provides methods for rendering 3D scatter graphs.
  * \since Qt Data Visualization 1.0
@@ -241,10 +241,6 @@ QList<QValue3DAxis *> Q3DScatter::axes() const
     return retList;
 }
 
-/*!
- * \class QtDataVisualization::Q3DScatterPrivate
- * \internal
- */
 Q3DScatterPrivate::Q3DScatterPrivate(Q3DScatter *q)
     : QAbstract3DGraphPrivate(q)
 {
@@ -274,5 +270,5 @@ Q3DScatter *Q3DScatterPrivate::qptr()
     return static_cast<Q3DScatter *>(q_ptr);
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/engine/q3dscatter.h b/src/datavisualization/engine/q3dscatter.h
index a03e51f7..f9a67d76 100644
--- a/src/datavisualization/engine/q3dscatter.h
+++ b/src/datavisualization/engine/q3dscatter.h
@@ -24,7 +24,7 @@
 #include <QFont>
 #include <QLinearGradient>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Q3DScatterPrivate;
 class QValue3DAxis;
@@ -67,6 +67,6 @@ private:
     Q_DISABLE_COPY(Q3DScatter)
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/engine/q3dscatter_p.h b/src/datavisualization/engine/q3dscatter_p.h
index 9c6c4480..66f6fd7b 100644
--- a/src/datavisualization/engine/q3dscatter_p.h
+++ b/src/datavisualization/engine/q3dscatter_p.h
@@ -32,7 +32,7 @@
 #include "scatter3dcontroller_p.h"
 #include "qabstract3dgraph_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Q3DScatter;
 
@@ -52,6 +52,6 @@ public:
     Scatter3DController *m_shared;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/engine/q3dscene.cpp b/src/datavisualization/engine/q3dscene.cpp
index 4712cf18..de19e84c 100644
--- a/src/datavisualization/engine/q3dscene.cpp
+++ b/src/datavisualization/engine/q3dscene.cpp
@@ -25,10 +25,10 @@
 #include "q3dcamera_p.h"
 #include "q3dlight_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 /*!
- * \class QtDataVisualization::Q3DScene
+ * \class Q3DScene
  * \inmodule QtDataVisualization
  * \brief Q3DScene class provides description of the 3D scene being visualized.
  * \since Qt Data Visualization 1.0
@@ -47,7 +47,7 @@ namespace QtDataVisualization {
  */
 
 /*!
- * \class QtDataVisualization::Q3DSceneChangeBitField
+ * \class Q3DSceneChangeBitField
  * \internal
  */
 
@@ -56,7 +56,7 @@ namespace QtDataVisualization {
  * \inqmlmodule QtDataVisualization
  * \since QtDataVisualization 1.0
  * \ingroup datavisualization_qml
- * \instantiates QtDataVisualization::Q3DScene
+ * \instantiates Q3DScene
  * \brief Scene3D type provides description of the 3D scene being visualized.
  *
  * The 3D scene contains a single active camera and a single active light source.
@@ -461,10 +461,6 @@ void Q3DScene::setLightPositionRelativeToCamera(const QVector3D &relativePositio
                                                                    distanceModifier));
 }
 
-/*!
- * \class QtDataVisualization::Q3DScenePrivate
- * \internal
- */
 Q3DScenePrivate::Q3DScenePrivate(Q3DScene *q) :
     QObject(0),
     q_ptr(q),
@@ -653,4 +649,4 @@ QRect Q3DScenePrivate::glSecondarySubViewport()
     return m_glSecondarySubViewport;
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/engine/q3dscene.h b/src/datavisualization/engine/q3dscene.h
index d43d06ec..8f9ee7b3 100644
--- a/src/datavisualization/engine/q3dscene.h
+++ b/src/datavisualization/engine/q3dscene.h
@@ -24,7 +24,7 @@
 #include <QObject>
 #include <QRect>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Q3DCamera;
 class Q3DBox;
@@ -108,6 +108,6 @@ private:
     friend class Q3DObject;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif // Q3DSCENE_H
diff --git a/src/datavisualization/engine/q3dscene_p.h b/src/datavisualization/engine/q3dscene_p.h
index 65d5e4c8..3ba1c2df 100644
--- a/src/datavisualization/engine/q3dscene_p.h
+++ b/src/datavisualization/engine/q3dscene_p.h
@@ -32,7 +32,7 @@
 #include "datavisualizationglobal_p.h"
 #include <QRect>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Q3DCamera;
 class Q3DLight;
@@ -110,6 +110,6 @@ public:
     bool m_sceneDirty;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif // Q3DSCENE_P_H
diff --git a/src/datavisualization/engine/q3dsurface.cpp b/src/datavisualization/engine/q3dsurface.cpp
index dd5cfab6..a9b9e3d3 100644
--- a/src/datavisualization/engine/q3dsurface.cpp
+++ b/src/datavisualization/engine/q3dsurface.cpp
@@ -23,10 +23,10 @@
 #include "q3dcamera.h"
 #include "qsurface3dseries_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 /*!
- * \class QtDataVisualization::Q3DSurface
+ * \class Q3DSurface
  * \inmodule QtDataVisualization
  * \brief The Q3DSurface class provides methods for rendering 3D surface plots.
  * \since Qt Data Visualization 1.0
@@ -264,10 +264,6 @@ QList<QValue3DAxis *> Q3DSurface::axes() const
 
 /////////////////// PRIVATE ///////////////////////////////////
 
-/*!
- * \class QtDataVisualization::Q3DSurfacePrivate
- * \internal
- */
 Q3DSurfacePrivate::Q3DSurfacePrivate(Q3DSurface *q)
     : QAbstract3DGraphPrivate(q)
 {
@@ -297,4 +293,4 @@ Q3DSurface *Q3DSurfacePrivate::qptr()
     return static_cast<Q3DSurface *>(q_ptr);
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/engine/q3dsurface.h b/src/datavisualization/engine/q3dsurface.h
index 833e983a..e8158f65 100644
--- a/src/datavisualization/engine/q3dsurface.h
+++ b/src/datavisualization/engine/q3dsurface.h
@@ -23,7 +23,7 @@
 #include <QtDataVisualization/q3dscene.h>
 #include <QFont>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Q3DSurfacePrivate;
 class QValue3DAxis;
@@ -66,6 +66,6 @@ private:
     Q_DISABLE_COPY(Q3DSurface)
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif // Q3DSURFACE_H
diff --git a/src/datavisualization/engine/q3dsurface_p.h b/src/datavisualization/engine/q3dsurface_p.h
index d604fc51..acaf76d3 100644
--- a/src/datavisualization/engine/q3dsurface_p.h
+++ b/src/datavisualization/engine/q3dsurface_p.h
@@ -34,7 +34,7 @@
 
 #include <QList>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Q3DSurface;
 
@@ -54,6 +54,6 @@ public:
     Surface3DController *m_shared;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif // Q3DSURFACE_P_H
diff --git a/src/datavisualization/engine/qabstract3dgraph_p.h b/src/datavisualization/engine/qabstract3dgraph_p.h
index 43f96e4a..a7e49ecd 100644
--- a/src/datavisualization/engine/qabstract3dgraph_p.h
+++ b/src/datavisualization/engine/qabstract3dgraph_p.h
@@ -36,7 +36,7 @@
 class QOpenGLContext;
 class QOpenGLPaintDevice;
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QAbstract3DGraph;
 class Abstract3DController;
@@ -71,6 +71,6 @@ public:
     float m_devicePixelRatio;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp
index d2c3eee5..e0348f39 100644
--- a/src/datavisualization/engine/scatter3drenderer.cpp
+++ b/src/datavisualization/engine/scatter3drenderer.cpp
@@ -41,12 +41,7 @@
 // You should see the scene from  where the light is
 //#define SHOW_DEPTH_TEXTURE_SCENE
 
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::Scatter3DRenderer
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 //#define USE_UNIFORM_SCALING // Scale x and z uniformly, or based on autoscaled values
 
@@ -1805,4 +1800,4 @@ void Scatter3DRenderer::selectionColorToSeriesAndIndex(const QVector3D &color, i
     series = 0;
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/engine/scatter3drenderer_p.h b/src/datavisualization/engine/scatter3drenderer_p.h
index fb1e2698..350aa934 100644
--- a/src/datavisualization/engine/scatter3drenderer_p.h
+++ b/src/datavisualization/engine/scatter3drenderer_p.h
@@ -39,7 +39,7 @@ class QPoint;
 class QSizeF;
 class QOpenGLShaderProgram;
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class ShaderHelper;
 class ObjectHelper;
@@ -150,6 +150,6 @@ private:
     void selectionColorToSeriesAndIndex(const QVector3D &color, int &index, QScatter3DSeries *&series);
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/engine/selectionpointer.cpp b/src/datavisualization/engine/selectionpointer.cpp
index fc2081b1..7a47c43f 100644
--- a/src/datavisualization/engine/selectionpointer.cpp
+++ b/src/datavisualization/engine/selectionpointer.cpp
@@ -32,12 +32,7 @@
 
 #include <QDebug>
 
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::SelectionPointer
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 const GLfloat sliceUnits = 2.5;
 
@@ -264,4 +259,4 @@ void SelectionPointer::loadLabelMesh()
     m_labelObj->load();
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/engine/selectionpointer_p.h b/src/datavisualization/engine/selectionpointer_p.h
index b1cb4b63..c6295fa5 100644
--- a/src/datavisualization/engine/selectionpointer_p.h
+++ b/src/datavisualization/engine/selectionpointer_p.h
@@ -41,7 +41,7 @@
 
 class QOpenGLShaderProgram;
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class ShaderHelper;
 class ObjectHelper;
@@ -93,6 +93,6 @@ private:
     QVector3D m_highlightColor;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif // NOTIFICATIONLABEL_P_H
diff --git a/src/datavisualization/engine/seriesrendercache.cpp b/src/datavisualization/engine/seriesrendercache.cpp
index 98f1d19e..2f055d46 100644
--- a/src/datavisualization/engine/seriesrendercache.cpp
+++ b/src/datavisualization/engine/seriesrendercache.cpp
@@ -22,12 +22,7 @@
 #include "texturehelper_p.h"
 #include "utils_p.h"
 
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::SeriesRenderCache
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 const QString smoothString(QStringLiteral("Smooth"));
 
@@ -184,4 +179,4 @@ void SeriesRenderCache::cleanup(TextureHelper *texHelper)
     texHelper->deleteTexture(&m_multiHighlightGradientTexture);
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/engine/seriesrendercache_p.h b/src/datavisualization/engine/seriesrendercache_p.h
index d543da71..81eaacbc 100644
--- a/src/datavisualization/engine/seriesrendercache_p.h
+++ b/src/datavisualization/engine/seriesrendercache_p.h
@@ -32,7 +32,7 @@
 #include "datavisualizationglobal_p.h"
 #include "qabstract3dseries_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Abstract3DRenderer;
 class ObjectHelper;
@@ -80,7 +80,7 @@ protected:
     QString m_name;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
 
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index da7656f3..b0bb4834 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -38,12 +38,7 @@
 
 static const int ID_TO_RGBA_MASK = 0xff;
 
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::Surface3DRenderer
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 //#define SHOW_DEPTH_TEXTURE_SCENE
 
@@ -2193,4 +2188,4 @@ void Surface3DRenderer::generateUniformGradient(const QVector3D newColor)
     }
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/engine/surface3drenderer_p.h b/src/datavisualization/engine/surface3drenderer_p.h
index 10c2c723..13fd11d8 100644
--- a/src/datavisualization/engine/surface3drenderer_p.h
+++ b/src/datavisualization/engine/surface3drenderer_p.h
@@ -43,7 +43,7 @@
 
 class QOpenGLShaderProgram;
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class ShaderHelper;
 class ObjectHelper;
@@ -184,6 +184,6 @@ private:
     Q_DISABLE_COPY(Surface3DRenderer)
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif // SURFACE3DRENDERER_P_H