18 files changed, 37 insertions, 81 deletions
diff --git a/src/datavisualization/utils/abstractobjecthelper.cpp b/src/datavisualization/utils/abstractobjecthelper.cpp
index fd2921a0..21ebc826 100644
--- a/src/datavisualization/utils/abstractobjecthelper.cpp
+++ b/src/datavisualization/utils/abstractobjecthelper.cpp
@@ -20,12 +20,7 @@
 
 #include <QDebug>
 
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::AbstractObjectHelper
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 AbstractObjectHelper::AbstractObjectHelper()
     : m_vertexbuffer(0),
@@ -85,4 +80,4 @@ GLuint AbstractObjectHelper::indicesType()
     return m_indicesType;
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/utils/abstractobjecthelper_p.h b/src/datavisualization/utils/abstractobjecthelper_p.h
index 6f48238d..c3bf39a9 100644
--- a/src/datavisualization/utils/abstractobjecthelper_p.h
+++ b/src/datavisualization/utils/abstractobjecthelper_p.h
@@ -32,7 +32,7 @@
 #include "datavisualizationglobal_p.h"
 #include <QOpenGLFunctions>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class AbstractObjectHelper: protected QOpenGLFunctions
 {
@@ -60,6 +60,6 @@ public:
     GLuint m_indicesType;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif // ABSTRACTOBJECTHELPER_H
diff --git a/src/datavisualization/utils/camerahelper.cpp b/src/datavisualization/utils/camerahelper.cpp
index 1e9ce648..7800dfd1 100644
--- a/src/datavisualization/utils/camerahelper.cpp
+++ b/src/datavisualization/utils/camerahelper.cpp
@@ -22,12 +22,7 @@
 #include <QMatrix4x4>
 #include <QVector3D>
 
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::CameraHelper
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 CameraHelper::CameraHelper(QObject *parent) :
     QObject(parent),
@@ -288,4 +283,4 @@ void CameraHelper::setCameraPreset(Q3DCamera::CameraPreset preset)
     }
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/utils/camerahelper_p.h b/src/datavisualization/utils/camerahelper_p.h
index 9d411b74..f85164f7 100644
--- a/src/datavisualization/utils/camerahelper_p.h
+++ b/src/datavisualization/utils/camerahelper_p.h
@@ -39,7 +39,7 @@ class QVector3D;
 class QPoint;
 class QPointF;
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class CameraHelper : public QObject
 {
@@ -86,6 +86,6 @@ public:
     void setCameraPreset(Q3DCamera::CameraPreset preset);
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/utils/meshloader.cpp b/src/datavisualization/utils/meshloader.cpp
index d8d74ec9..a5fb7880 100644
--- a/src/datavisualization/utils/meshloader.cpp
+++ b/src/datavisualization/utils/meshloader.cpp
@@ -26,12 +26,7 @@
 
 #include <QDebug>
 
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::MeshLoader
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 QString slashTag = QStringLiteral("/");
 
@@ -127,4 +122,4 @@ bool MeshLoader::loadOBJ(const QString &path,
     return true;
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/utils/meshloader_p.h b/src/datavisualization/utils/meshloader_p.h
index 3add8c2d..e609c45e 100644
--- a/src/datavisualization/utils/meshloader_p.h
+++ b/src/datavisualization/utils/meshloader_p.h
@@ -34,7 +34,7 @@
 class QVector2D;
 class QVector3D;
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class MeshLoader
 {
@@ -46,6 +46,6 @@ class MeshLoader
     // TODO: add loaders for other formats?
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/utils/objecthelper.cpp b/src/datavisualization/utils/objecthelper.cpp
index f6a7ef40..5c1bc43e 100644
--- a/src/datavisualization/utils/objecthelper.cpp
+++ b/src/datavisualization/utils/objecthelper.cpp
@@ -23,12 +23,7 @@
 
 #include <QDebug>
 
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::ObjectHelper
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 ObjectHelper::ObjectHelper(const QString &objectFile)
     : m_objectFile(objectFile)
@@ -100,4 +95,4 @@ void ObjectHelper::load()
     m_meshDataLoaded = true;
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/utils/objecthelper_p.h b/src/datavisualization/utils/objecthelper_p.h
index 6e325639..d448c8c8 100644
--- a/src/datavisualization/utils/objecthelper_p.h
+++ b/src/datavisualization/utils/objecthelper_p.h
@@ -33,7 +33,7 @@
 #include "abstractobjecthelper_p.h"
 #include <QOpenGLFunctions>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class ObjectHelper : public AbstractObjectHelper
 {
@@ -49,6 +49,6 @@ private:
     QString m_objectFile;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/utils/shaderhelper.cpp b/src/datavisualization/utils/shaderhelper.cpp
index 895d2bd9..adc24e8d 100644
--- a/src/datavisualization/utils/shaderhelper.cpp
+++ b/src/datavisualization/utils/shaderhelper.cpp
@@ -20,12 +20,7 @@
 
 #include <QOpenGLShader>
 
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::ShaderHelper
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 void discardDebugMsgs(QtMsgType type, const QMessageLogContext &context, const QString &msg)
 {
@@ -273,4 +268,4 @@ GLuint ShaderHelper::normalAtt()
     return m_normalAttr;
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/utils/shaderhelper_p.h b/src/datavisualization/utils/shaderhelper_p.h
index 996ad7fc..b4c71ca2 100644
--- a/src/datavisualization/utils/shaderhelper_p.h
+++ b/src/datavisualization/utils/shaderhelper_p.h
@@ -34,7 +34,7 @@
 
 class QOpenGLShaderProgram;
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class ShaderHelper
 {
@@ -110,6 +110,6 @@ class ShaderHelper
     GLboolean m_initialized;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/utils/surfaceobject.cpp b/src/datavisualization/utils/surfaceobject.cpp
index 0fbec6dc..790ca3f8 100644
--- a/src/datavisualization/utils/surfaceobject.cpp
+++ b/src/datavisualization/utils/surfaceobject.cpp
@@ -24,12 +24,7 @@
 
 #include <QDebug>
 
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::SurfaceObject
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 SurfaceObject::SurfaceObject()
 {
@@ -686,4 +681,4 @@ QVector3D SurfaceObject::normal(const QVector3D &a, const QVector3D &b, const QV
     return QVector3D::crossProduct(v1, v2);
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/utils/surfaceobject_p.h b/src/datavisualization/utils/surfaceobject_p.h
index 91b42c76..6abbb8d4 100644
--- a/src/datavisualization/utils/surfaceobject_p.h
+++ b/src/datavisualization/utils/surfaceobject_p.h
@@ -36,7 +36,7 @@
 #include <QOpenGLFunctions>
 #include <QRect>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class SurfaceObject : public AbstractObjectHelper
 {
@@ -85,5 +85,6 @@ private:
     QVector<QVector3D> m_normals;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
+
 #endif // SURFACEOBJECT_P_H
diff --git a/src/datavisualization/utils/texturehelper.cpp b/src/datavisualization/utils/texturehelper.cpp
index ecfb6aec..6498fce4 100644
--- a/src/datavisualization/utils/texturehelper.cpp
+++ b/src/datavisualization/utils/texturehelper.cpp
@@ -24,12 +24,7 @@
 
 #include <QDebug>
 
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::TextureHelper
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 TextureHelper::TextureHelper()
 {
@@ -372,4 +367,4 @@ QRgb TextureHelper::qt_gl_convertToGLFormatHelper(QRgb src_pixel, GLenum texture
     }
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/utils/texturehelper_p.h b/src/datavisualization/utils/texturehelper_p.h
index e67904d8..bc69786a 100644
--- a/src/datavisualization/utils/texturehelper_p.h
+++ b/src/datavisualization/utils/texturehelper_p.h
@@ -34,7 +34,7 @@
 #include <QRgb>
 #include <QLinearGradient>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class TextureHelper : protected QOpenGLFunctions
 {
@@ -67,6 +67,6 @@ class TextureHelper : protected QOpenGLFunctions
     friend class Scatter3DRenderer;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp
index 2a38c8f2..30291963 100644
--- a/src/datavisualization/utils/utils.cpp
+++ b/src/datavisualization/utils/utils.cpp
@@ -26,12 +26,7 @@
 #include <QRegExp>
 #include <qmath.h>
 
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::Utils
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 #define NUM_IN_POWER(y, x) for (;y<x;y<<=1)
 #define MIN_POWER 2
@@ -244,4 +239,4 @@ float Utils::wrapValue(float value, float min, float max)
     return value;
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/utils/utils_p.h b/src/datavisualization/utils/utils_p.h
index 434a366f..18337e0b 100644
--- a/src/datavisualization/utils/utils_p.h
+++ b/src/datavisualization/utils/utils_p.h
@@ -39,7 +39,7 @@ class QString;
 class QPoint;
 class QImage;
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Utils
 {
@@ -75,6 +75,6 @@ private:
     static ParamType mapFormatCharToParamType(const QChar &formatChar);
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/utils/vertexindexer.cpp b/src/datavisualization/utils/vertexindexer.cpp
index fd90e447..cb5d3ffc 100644
--- a/src/datavisualization/utils/vertexindexer.cpp
+++ b/src/datavisualization/utils/vertexindexer.cpp
@@ -23,12 +23,7 @@
 
 #include <QDebug>
 
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::VertexIndexer
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 int unique_vertices = 0;
 
@@ -155,4 +150,4 @@ void VertexIndexer::indexVBO_TBN(const QVector<QVector3D> &in_vertices,
     //qDebug() << "unique vertices" << unique_vertices;
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/utils/vertexindexer_p.h b/src/datavisualization/utils/vertexindexer_p.h
index de8f7690..250c7a1b 100644
--- a/src/datavisualization/utils/vertexindexer_p.h
+++ b/src/datavisualization/utils/vertexindexer_p.h
@@ -35,7 +35,7 @@
 #include <QVector2D>
 #include <QVector3D>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class VertexIndexer
 {
@@ -83,6 +83,6 @@ class VertexIndexer
                                            unsigned short &result);
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif