Removed QDataVis and namespace macros

- docs will be fixed in QTRD-2594 Task-number: QTRD-2699 Task-number: QTRD-2700 Change-Id: Ia89d365c2de5d9254b165feb4f0a54ec099084be Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
author: Tomi Korpipää <tomi.korpipaa@digia.com> 2014-01-15 11:34:59 +0200
committer: Tomi Korpipää <tomi.korpipaa@digia.com> 2014-01-15 11:36:17 +0200
commit: 64d6b482bfb9dbacd548b72cb9c073513f6aa56f (patch)
tree: 6adea7f584f31d2b650379a4dba9ff6d7de527e3 /src/datavisualization/engine
parent: ca8eb71e320d08071f0f43393da3bb3fabf56da7 (diff)
50 files changed, 356 insertions, 283 deletions
diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp
index 919db22c..454ff7a4 100644
--- a/src/datavisualization/engine/abstract3dcontroller.cpp
+++ b/src/datavisualization/engine/abstract3dcontroller.cpp
@@ -33,13 +33,13 @@
 
 #include <QThread>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 Abstract3DController::Abstract3DController(QRect initialViewport, Q3DScene *scene, QObject *parent) :
     QObject(parent),
     m_themeManager(new ThemeManager(this)),
-    m_selectionMode(QDataVis::SelectionItem),
-    m_shadowQuality(QDataVis::ShadowQualityMedium),
+    m_selectionMode(QAbstract3DGraph::SelectionItem),
+    m_shadowQuality(QAbstract3DGraph::ShadowQualityMedium),
     m_scene(scene),
     m_activeInputHandler(0),
     m_axisX(0),
@@ -668,7 +668,7 @@ Q3DTheme *Abstract3DController::activeTheme() const
     return m_themeManager->activeTheme();
 }
 
-void Abstract3DController::setSelectionMode(QDataVis::SelectionFlags mode)
+void Abstract3DController::setSelectionMode(QAbstract3DGraph::SelectionFlags mode)
 {
     if (mode != m_selectionMode) {
         m_selectionMode = mode;
@@ -678,12 +678,12 @@ void Abstract3DController::setSelectionMode(QDataVis::SelectionFlags mode)
     }
 }
 
-QDataVis::SelectionFlags Abstract3DController::selectionMode() const
+QAbstract3DGraph::SelectionFlags Abstract3DController::selectionMode() const
 {
     return m_selectionMode;
 }
 
-void Abstract3DController::setShadowQuality(QDataVis::ShadowQuality quality)
+void Abstract3DController::setShadowQuality(QAbstract3DGraph::ShadowQuality quality)
 {
     if (quality != m_shadowQuality) {
         m_shadowQuality = quality;
@@ -693,7 +693,7 @@ void Abstract3DController::setShadowQuality(QDataVis::ShadowQuality quality)
     }
 }
 
-QDataVis::ShadowQuality Abstract3DController::shadowQuality() const
+QAbstract3DGraph::ShadowQuality Abstract3DController::shadowQuality() const
 {
     return m_shadowQuality;
 }
@@ -844,7 +844,7 @@ void Abstract3DController::handleAxisLabelFormatChanged(const QString &format)
 void Abstract3DController::handleInputStateChanged(QAbstract3DInputHandler::InputState state)
 {
     // When in automatic slicing mode, input state change to overview disables slice mode
-    if (m_selectionMode.testFlag(QDataVis::SelectionSlice)
+    if (m_selectionMode.testFlag(QAbstract3DGraph::SelectionSlice)
             && state == QAbstract3DInputHandler::InputStateOnPrimaryView) {
         setSlicingActive(false);
     }
@@ -868,7 +868,7 @@ void Abstract3DController::handleSeriesVisibilityChanged(bool visible)
     handleSeriesVisibilityChangedBySender(sender());
 }
 
-void Abstract3DController::handleRequestShadowQuality(QDataVis::ShadowQuality quality)
+void Abstract3DController::handleRequestShadowQuality(QAbstract3DGraph::ShadowQuality quality)
 {
     setShadowQuality(quality);
 }
@@ -1001,4 +1001,4 @@ void Abstract3DController::emitNeedRender()
     }
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h
index 0f951e5a..a68272d6 100644
--- a/src/datavisualization/engine/abstract3dcontroller_p.h
+++ b/src/datavisualization/engine/abstract3dcontroller_p.h
@@ -42,7 +42,7 @@
 
 class QFont;
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class CameraHelper;
 class Abstract3DRenderer;
@@ -136,8 +136,8 @@ private:
     GLfloat m_horizontalRotation;
     GLfloat m_verticalRotation;
     ThemeManager *m_themeManager;
-    QDataVis::SelectionFlags m_selectionMode;
-    QDataVis::ShadowQuality m_shadowQuality;
+    QAbstract3DGraph::SelectionFlags m_selectionMode;
+    QAbstract3DGraph::ShadowQuality m_shadowQuality;
     Q3DScene *m_scene;
 
 protected:
@@ -198,11 +198,11 @@ public:
     virtual Q3DTheme *activeTheme() const;
     virtual QList<Q3DTheme *> themes() const;
 
-    virtual void setSelectionMode(QDataVis::SelectionFlags mode);
-    virtual QDataVis::SelectionFlags selectionMode() const;
+    virtual void setSelectionMode(QAbstract3DGraph::SelectionFlags mode);
+    virtual QAbstract3DGraph::SelectionFlags selectionMode() const;
 
-    virtual void setShadowQuality(QDataVis::ShadowQuality quality);
-    virtual QDataVis::ShadowQuality shadowQuality() const;
+    virtual void setShadowQuality(QAbstract3DGraph::ShadowQuality quality);
+    virtual QAbstract3DGraph::ShadowQuality shadowQuality() const;
 
     bool isSlicingActive() const;
     void setSlicingActive(bool isSlicing);
@@ -253,13 +253,13 @@ public slots:
     void handleThemeTypeChanged(Q3DTheme::Theme theme);
 
     // Renderer callback handlers
-    void handleRequestShadowQuality(QDataVis::ShadowQuality quality);
+    void handleRequestShadowQuality(QAbstract3DGraph::ShadowQuality quality);
 
 signals:
-    void shadowQualityChanged(QDataVis::ShadowQuality quality);
+    void shadowQualityChanged(QAbstract3DGraph::ShadowQuality quality);
     void activeInputHandlerChanged(QAbstract3DInputHandler *inputHandler);
     void activeThemeChanged(Q3DTheme *activeTheme);
-    void selectionModeChanged(QDataVis::SelectionFlags mode);
+    void selectionModeChanged(QAbstract3DGraph::SelectionFlags mode);
     void needRender();
     void axisXChanged(QAbstract3DAxis *axis);
     void axisYChanged(QAbstract3DAxis *axis);
@@ -277,6 +277,6 @@ private:
     friend class Bars3DController;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp
index e812496c..9c7cfb39 100644
--- a/src/datavisualization/engine/abstract3drenderer.cpp
+++ b/src/datavisualization/engine/abstract3drenderer.cpp
@@ -27,18 +27,16 @@
 #include "q3dtheme_p.h"
 #include "objecthelper_p.h"
 
-Q_DECLARE_METATYPE(QtDataVisualization::QDataVis::ShadowQuality)
-
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 Abstract3DRenderer::Abstract3DRenderer(Abstract3DController *controller)
     : QObject(0),
       m_hasNegativeValues(false),
       m_cachedTheme(new Q3DTheme()),
       m_drawer(new Drawer(m_cachedTheme)),
-      m_cachedShadowQuality(QDataVis::ShadowQualityMedium),
+      m_cachedShadowQuality(QAbstract3DGraph::ShadowQualityMedium),
       m_autoScaleAdjustment(1.0f),
-      m_cachedSelectionMode(QDataVis::SelectionNone),
+      m_cachedSelectionMode(QAbstract3DGraph::SelectionNone),
       m_textureHelper(0),
       m_cachedScene(new Q3DScene()),
       m_selectionDirty(true),
@@ -220,7 +218,7 @@ void Abstract3DRenderer::updateScene(Q3DScene *scene)
 void Abstract3DRenderer::reInitShaders()
 {
 #if !defined(QT_OPENGL_ES_2)
-    if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+    if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
         initGradientShaders(QStringLiteral(":/shaders/vertexShadow"),
                             QStringLiteral(":/shaders/fragmentShadowNoTexColorOnY"));
         initShaders(QStringLiteral(":/shaders/vertexShadow"),
@@ -250,15 +248,15 @@ void Abstract3DRenderer::handleShadowQualityChange()
     reInitShaders();
 
 #if defined(QT_OPENGL_ES_2)
-    if (m_cachedShadowQuality != QDataVis::ShadowQualityNone) {
-        emit requestShadowQuality(QDataVis::ShadowQualityNone);
+    if (m_cachedShadowQuality != QAbstract3DGraph::ShadowQualityNone) {
+        emit requestShadowQuality(QAbstract3DGraph::ShadowQualityNone);
         qWarning("Shadows are not yet supported for OpenGL ES2");
-        m_cachedShadowQuality = QDataVis::ShadowQualityNone;
+        m_cachedShadowQuality = QAbstract3DGraph::ShadowQualityNone;
     }
 #endif
 }
 
-void Abstract3DRenderer::updateSelectionMode(QDataVis::SelectionFlags mode)
+void Abstract3DRenderer::updateSelectionMode(QAbstract3DGraph::SelectionFlags mode)
 {
     m_cachedSelectionMode = mode;
     m_selectionDirty = true;
@@ -382,32 +380,32 @@ AxisRenderCache &Abstract3DRenderer::axisCacheForOrientation(QAbstract3DAxis::Ax
 
 void Abstract3DRenderer::lowerShadowQuality()
 {
-    QDataVis::ShadowQuality newQuality = QDataVis::ShadowQualityNone;
+    QAbstract3DGraph::ShadowQuality newQuality = QAbstract3DGraph::ShadowQualityNone;
 
     switch (m_cachedShadowQuality) {
-    case QDataVis::ShadowQualityHigh:
+    case QAbstract3DGraph::ShadowQualityHigh:
         qWarning("Creating high quality shadows failed. Changing to medium quality.");
-        newQuality = QDataVis::ShadowQualityMedium;
+        newQuality = QAbstract3DGraph::ShadowQualityMedium;
         break;
-    case QDataVis::ShadowQualityMedium:
+    case QAbstract3DGraph::ShadowQualityMedium:
         qWarning("Creating medium quality shadows failed. Changing to low quality.");
-        newQuality = QDataVis::ShadowQualityLow;
+        newQuality = QAbstract3DGraph::ShadowQualityLow;
         break;
-    case QDataVis::ShadowQualityLow:
+    case QAbstract3DGraph::ShadowQualityLow:
         qWarning("Creating low quality shadows failed. Switching shadows off.");
-        newQuality = QDataVis::ShadowQualityNone;
+        newQuality = QAbstract3DGraph::ShadowQualityNone;
         break;
-    case QDataVis::ShadowQualitySoftHigh:
+    case QAbstract3DGraph::ShadowQualitySoftHigh:
         qWarning("Creating soft high quality shadows failed. Changing to soft medium quality.");
-        newQuality = QDataVis::ShadowQualitySoftMedium;
+        newQuality = QAbstract3DGraph::ShadowQualitySoftMedium;
         break;
-    case QDataVis::ShadowQualitySoftMedium:
+    case QAbstract3DGraph::ShadowQualitySoftMedium:
         qWarning("Creating soft medium quality shadows failed. Changing to soft low quality.");
-        newQuality = QDataVis::ShadowQualitySoftLow;
+        newQuality = QAbstract3DGraph::ShadowQualitySoftLow;
         break;
-    case QDataVis::ShadowQualitySoftLow:
+    case QAbstract3DGraph::ShadowQualitySoftLow:
         qWarning("Creating soft low quality shadows failed. Switching shadows off.");
-        newQuality = QDataVis::ShadowQualityNone;
+        newQuality = QAbstract3DGraph::ShadowQualityNone;
         break;
     default:
         // You'll never get here
@@ -432,4 +430,4 @@ void Abstract3DRenderer::fixGradientAndGenerateTexture(QLinearGradient *gradient
     *gradientTexture = m_textureHelper->createGradientTexture(*gradient);
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h
index c375b0b8..c38135ed 100644
--- a/src/datavisualization/engine/abstract3drenderer_p.h
+++ b/src/datavisualization/engine/abstract3drenderer_p.h
@@ -41,7 +41,7 @@
 
 //#define DISPLAY_RENDER_SPEED
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class TextureHelper;
 class Theme;
@@ -70,7 +70,7 @@ public:
     virtual void render(GLuint defaultFboHandle);
 
     virtual void updateTheme(Q3DTheme *theme);
-    virtual void updateSelectionMode(QDataVis::SelectionFlags newMode);
+    virtual void updateSelectionMode(QAbstract3DGraph::SelectionFlags newMode);
     virtual void updateScene(Q3DScene *scene);
     virtual void updateTextures() = 0;
     virtual void initSelectionBuffer() = 0;
@@ -80,7 +80,7 @@ public:
 #if !defined(QT_OPENGL_ES_2)
     virtual void updateDepthBuffer() = 0;
 #endif
-    virtual void updateShadowQuality(QDataVis::ShadowQuality quality) = 0;
+    virtual void updateShadowQuality(QAbstract3DGraph::ShadowQuality quality) = 0;
     virtual void initShaders(const QString &vertexShader, const QString &fragmentShader) = 0;
     virtual void initGradientShaders(const QString &vertexShader, const QString &fragmentShader);
     virtual void initBackgroundShaders(const QString &vertexShader, const QString &fragmentShader) = 0;
@@ -97,7 +97,7 @@ public:
 
 signals:
     void needRender(); // Emit this if something in renderer causes need for another render pass.
-    void requestShadowQuality(QDataVis::ShadowQuality quality); // For automatic quality adjustments
+    void requestShadowQuality(QAbstract3DGraph::ShadowQuality quality); // For automatic quality adjustments
 
 protected:
     Abstract3DRenderer(Abstract3DController *controller);
@@ -118,10 +118,10 @@ protected:
     Q3DTheme *m_cachedTheme;
     Drawer *m_drawer;
     QRect m_viewport;
-    QDataVis::ShadowQuality m_cachedShadowQuality;
+    QAbstract3DGraph::ShadowQuality m_cachedShadowQuality;
     GLfloat m_autoScaleAdjustment;
 
-    QDataVis::SelectionFlags m_cachedSelectionMode;
+    QAbstract3DGraph::SelectionFlags m_cachedSelectionMode;
 
     AxisRenderCache m_axisCacheX;
     AxisRenderCache m_axisCacheY;
@@ -146,6 +146,6 @@ protected:
 #endif
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif // ABSTRACT3DRENDERER_P_H
diff --git a/src/datavisualization/engine/axisrendercache.cpp b/src/datavisualization/engine/axisrendercache.cpp
index 5ada62ca..9fcd8b5d 100644
--- a/src/datavisualization/engine/axisrendercache.cpp
+++ b/src/datavisualization/engine/axisrendercache.cpp
@@ -20,7 +20,7 @@
 #include "qmath.h"
 #include <QFontMetrics>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 AxisRenderCache::AxisRenderCache()
     : m_type(QAbstract3DAxis::AxisTypeNone),
@@ -183,4 +183,4 @@ int AxisRenderCache::maxLabelWidth(const QStringList &labels) const
     return labelWidth;
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/axisrendercache_p.h b/src/datavisualization/engine/axisrendercache_p.h
index 991cff76..595ba83b 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"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class AxisRenderCache : public QObject
 {
@@ -96,6 +96,6 @@ private:
     Q_DISABLE_COPY(AxisRenderCache)
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp
index 8bf0cb8c..c9a9706c 100644
--- a/src/datavisualization/engine/bars3dcontroller.cpp
+++ b/src/datavisualization/engine/bars3dcontroller.cpp
@@ -30,7 +30,7 @@
 #include <QMatrix4x4>
 #include <qmath.h>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 Bars3DController::Bars3DController(QRect boundRect, Q3DScene *scene)
     : Abstract3DController(boundRect, scene),
@@ -341,13 +341,13 @@ bool Bars3DController::isBarSpecRelative()
     return m_isBarSpecRelative;
 }
 
-void Bars3DController::setSelectionMode(QDataVis::SelectionFlags mode)
+void Bars3DController::setSelectionMode(QAbstract3DGraph::SelectionFlags mode)
 {
-    if (mode.testFlag(QDataVis::SelectionSlice)
-            && (mode.testFlag(QDataVis::SelectionRow) == mode.testFlag(QDataVis::SelectionColumn))) {
+    if (mode.testFlag(QAbstract3DGraph::SelectionSlice)
+            && (mode.testFlag(QAbstract3DGraph::SelectionRow) == mode.testFlag(QAbstract3DGraph::SelectionColumn))) {
         qWarning("Must specify one of either row or column selection mode in conjunction with slicing mode.");
     } else {
-        QDataVis::SelectionFlags oldMode = selectionMode();
+        QAbstract3DGraph::SelectionFlags oldMode = selectionMode();
 
         Abstract3DController::setSelectionMode(mode);
 
@@ -358,8 +358,8 @@ void Bars3DController::setSelectionMode(QDataVis::SelectionFlags mode)
 
             // Special case: Always deactivate slicing when changing away from slice
             // automanagement, as this can't be handled in setSelectedBar.
-            if (!mode.testFlag(QDataVis::SelectionSlice)
-                    && oldMode.testFlag(QDataVis::SelectionSlice)) {
+            if (!mode.testFlag(QAbstract3DGraph::SelectionSlice)
+                    && oldMode.testFlag(QAbstract3DGraph::SelectionSlice)) {
                 scene()->setSlicingActive(false);
             }
         }
@@ -377,7 +377,7 @@ void Bars3DController::setSelectedBar(const QPoint &position, QBar3DSeries *seri
 
     adjustSelectionPosition(pos, series);
 
-    if (selectionMode().testFlag(QDataVis::SelectionSlice)) {
+    if (selectionMode().testFlag(QAbstract3DGraph::SelectionSlice)) {
         // If the selected bar is outside data window, or there is no visible selected bar, disable slicing
         if (pos.x() < m_axisZ->min() || pos.x() > m_axisZ->max()
                 || pos.y() < m_axisX->min() || pos.y() > m_axisX->max()
@@ -529,4 +529,4 @@ QAbstract3DAxis *Bars3DController::createDefaultAxis(QAbstract3DAxis::AxisOrient
     return defaultAxis;
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/bars3dcontroller_p.h b/src/datavisualization/engine/bars3dcontroller_p.h
index 3fcae959..0c9bf71c 100644
--- a/src/datavisualization/engine/bars3dcontroller_p.h
+++ b/src/datavisualization/engine/bars3dcontroller_p.h
@@ -34,7 +34,7 @@
 
 //#define DISPLAY_RENDER_SPEED
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class Bars3DRenderer;
 class QBar3DSeries;
@@ -89,7 +89,7 @@ public:
     QSizeF barSpacing();
     bool isBarSpecRelative();
 
-    void setSelectionMode(QDataVis::SelectionFlags mode);
+    void setSelectionMode(QAbstract3DGraph::SelectionFlags mode);
     void setSelectedBar(const QPoint &position, QBar3DSeries *series);
 
     virtual void handleAxisAutoAdjustRangeChangedInOrientation(QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust);
@@ -131,6 +131,6 @@ private:
 };
 
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp
index 38e85499..02b26821 100644
--- a/src/datavisualization/engine/bars3drenderer.cpp
+++ b/src/datavisualization/engine/bars3drenderer.cpp
@@ -38,7 +38,7 @@
 // You should see the scene from  where the light is
 //#define SHOW_DEPTH_TEXTURE_SCENE
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 const GLfloat labelMargin = 0.05f;
 const GLfloat gridLineWidth = 0.005f;
@@ -301,8 +301,8 @@ void Bars3DRenderer::drawSlicedScene()
 
     // Draw the selected row / column
     QMatrix4x4 projectionViewMatrix = projectionMatrix * viewMatrix;
-    bool rowMode = m_cachedSelectionMode.testFlag(QDataVis::SelectionRow);
-    bool itemMode = m_cachedSelectionMode.testFlag(QDataVis::SelectionItem);
+    bool rowMode = m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionRow);
+    bool itemMode = m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionItem);
 
     GLfloat barPosYAdjustment = -0.8f; // Translate to -1.0 + 0.2 for row/column labels
     GLfloat scaleFactor = 0.0f;
@@ -778,10 +778,10 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
 
     QMatrix4x4 projectionViewMatrix = projectionMatrix * viewMatrix;
 
-    bool rowMode = m_cachedSelectionMode.testFlag(QDataVis::SelectionRow);
+    bool rowMode = m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionRow);
 
 #if !defined(QT_OPENGL_ES_2)
-    if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+    if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
         // Render scene into a depth texture for using with shadow mapping
         // Enable drawing to depth framebuffer
         glBindFramebuffer(GL_FRAMEBUFFER, m_depthFrameBuffer);
@@ -904,7 +904,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
 
     // TODO: Selection must be enabled currently to support clicked signal. (QTRD-2517)
     // Skip selection mode drawing if we're slicing or have no selection mode
-    if (!m_cachedIsSlicingActivated && m_cachedSelectionMode > QDataVis::SelectionNone
+    if (!m_cachedIsSlicingActivated && m_cachedSelectionMode > QAbstract3DGraph::SelectionNone
             && m_selectionState == SelectOnScene && seriesCount > 0) {
         // Bind selection shader
         m_selectionShader->bind();
@@ -1044,7 +1044,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
             reserveAmount = m_cachedColumnCount;
         else
             reserveAmount = m_cachedRowCount;
-        if (m_cachedSelectionMode.testFlag(QDataVis::SelectionMultiSeries))
+        if (m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionMultiSeries))
             reserveAmount *= m_visibleSeriesList.size();
         m_sliceSelection.resize(reserveAmount);
 
@@ -1092,7 +1092,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
         }
 
         // Always use base color when no selection mode
-        if (m_cachedSelectionMode == QDataVis::SelectionNone) {
+        if (m_cachedSelectionMode == QAbstract3DGraph::SelectionNone) {
             if (colorStyleIsUniform)
                 barColor = baseColor;
             else
@@ -1103,7 +1103,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
         int sliceSeriesAdjust = 0;
         if (m_selectionDirty && m_cachedIsSlicingActivated) {
             int seriesMultiplier = 0;
-            if (m_cachedSelectionMode.testFlag(QDataVis::SelectionMultiSeries))
+            if (m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionMultiSeries))
                 seriesMultiplier = series;
             if (rowMode)
                 sliceSeriesAdjust = seriesMultiplier * m_cachedColumnCount;
@@ -1141,7 +1141,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
                 GLfloat lightStrength = m_cachedTheme->lightStrength();
                 GLfloat shadowLightStrength = adjustedLightStrength;
 
-                if (m_cachedSelectionMode > QDataVis::SelectionNone) {
+                if (m_cachedSelectionMode > QAbstract3DGraph::SelectionNone) {
                     Bars3DController::SelectionType selectionType = Bars3DController::SelectionNone;
                     if (somethingSelected)
                         selectionType = isSelected(row, bar, series);
@@ -1164,7 +1164,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
                         }
                         if (m_selectionDirty && m_cachedIsSlicingActivated) {
                             QVector3D translation = modelMatrix.column(3).toVector3D();
-                            if (m_cachedSelectionMode & QDataVis::SelectionColumn
+                            if (m_cachedSelectionMode & QAbstract3DGraph::SelectionColumn
                                     && seriesCount > 1) {
                                 translation.setZ((m_columnDepth - ((row + 0.5f + seriesPos)
                                                                    * (m_cachedBarSpacing.height())))
@@ -1254,7 +1254,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
                     }
 
 #if !defined(QT_OPENGL_ES_2)
-                    if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+                    if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
                         // Set shadow shader bindings
                         QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
                         barShader->setUniformValue(barShader->shadowQ(), m_shadowQualityToShader);
@@ -1324,7 +1324,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
                                             m_cachedTheme->ambientLightStrength() * 2.0f);
 
 #if !defined(QT_OPENGL_ES_2)
-        if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+        if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
             // Set shadow shader bindings
             QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
             m_backgroundShader->setUniformValue(m_backgroundShader->shadowQ(),
@@ -1372,7 +1372,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
             m_backgroundShader->setUniformValue(m_backgroundShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-            if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+            if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
                 // Set shadow shader bindings
                 QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
                 m_backgroundShader->setUniformValue(m_backgroundShader->depth(), depthMVPMatrix);
@@ -1405,7 +1405,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
         lineShader->setUniformValue(lineShader->color(), barColor);
         lineShader->setUniformValue(lineShader->ambientS(), m_cachedTheme->ambientLightStrength());
 #if !defined(QT_OPENGL_ES_2)
-        if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+        if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
             // Set shadowed shader bindings
             lineShader->setUniformValue(lineShader->shadowQ(), m_shadowQualityToShader);
             lineShader->setUniformValue(lineShader->lightS(),
@@ -1453,7 +1453,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
             lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-            if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+            if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
                 // Set shadow shader bindings
                 QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
                 lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1491,7 +1491,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
             lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-            if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+            if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
                 // Set shadow shader bindings
                 QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
                 lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1548,7 +1548,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
                 lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-                if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+                if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
                     // Set shadow shader bindings
                     QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
                     lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1597,7 +1597,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
                 lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-                if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+                if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
                     // Set shadow shader bindings
                     QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
                     lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1926,31 +1926,31 @@ void Bars3DRenderer::updateSelectedBar(const QPoint &position, const QBar3DSerie
     }
 }
 
-void Bars3DRenderer::updateShadowQuality(QDataVis::ShadowQuality quality)
+void Bars3DRenderer::updateShadowQuality(QAbstract3DGraph::ShadowQuality quality)
 {
     m_cachedShadowQuality = quality;
     switch (quality) {
-    case QDataVis::ShadowQualityLow:
+    case QAbstract3DGraph::ShadowQualityLow:
         m_shadowQualityToShader = 33.3f;
         m_shadowQualityMultiplier = 1;
         break;
-    case QDataVis::ShadowQualityMedium:
+    case QAbstract3DGraph::ShadowQualityMedium:
         m_shadowQualityToShader = 100.0f;
         m_shadowQualityMultiplier = 3;
         break;
-    case QDataVis::ShadowQualityHigh:
+    case QAbstract3DGraph::ShadowQualityHigh:
         m_shadowQualityToShader = 200.0f;
         m_shadowQualityMultiplier = 5;
         break;
-    case QDataVis::ShadowQualitySoftLow:
+    case QAbstract3DGraph::ShadowQualitySoftLow:
         m_shadowQualityToShader = 7.5f;
         m_shadowQualityMultiplier = 1;
         break;
-    case QDataVis::ShadowQualitySoftMedium:
+    case QAbstract3DGraph::ShadowQualitySoftMedium:
         m_shadowQualityToShader = 10.0f;
         m_shadowQualityMultiplier = 3;
         break;
-    case QDataVis::ShadowQualitySoftHigh:
+    case QAbstract3DGraph::ShadowQualitySoftHigh:
         m_shadowQualityToShader = 15.0f;
         m_shadowQualityMultiplier = 4;
         break;
@@ -2058,17 +2058,17 @@ Bars3DController::SelectionType Bars3DRenderer::isSelected(int row, int bar, int
 {
     Bars3DController::SelectionType isSelectedType = Bars3DController::SelectionNone;
 
-    if ((m_cachedSelectionMode.testFlag(QDataVis::SelectionMultiSeries)
+    if ((m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionMultiSeries)
          && m_visualSelectedBarSeriesIndex >= 0)
             || seriesIndex == m_visualSelectedBarSeriesIndex) {
         if (row == m_visualSelectedBarPos.x() && bar == m_visualSelectedBarPos.y()
-                && (m_cachedSelectionMode.testFlag(QDataVis::SelectionItem))) {
+                && (m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionItem))) {
             isSelectedType = Bars3DController::SelectionItem;
         } else if (row == m_visualSelectedBarPos.x()
-                   && (m_cachedSelectionMode.testFlag(QDataVis::SelectionRow))) {
+                   && (m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionRow))) {
             isSelectedType = Bars3DController::SelectionRow;
         } else if (bar == m_visualSelectedBarPos.y()
-                   && (m_cachedSelectionMode.testFlag(QDataVis::SelectionColumn))) {
+                   && (m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionColumn))) {
             isSelectedType = Bars3DController::SelectionColumn;
         }
     }
@@ -2173,7 +2173,7 @@ void Bars3DRenderer::updateDepthBuffer()
     if (m_primarySubViewport.size().isEmpty())
         return;
 
-    if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+    if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
         m_depthTexture = m_textureHelper->createDepthTextureFrameBuffer(m_primarySubViewport.size(),
                                                                         m_depthFrameBuffer,
                                                                         m_shadowQualityMultiplier);
@@ -2200,4 +2200,4 @@ void Bars3DRenderer::initLabelShaders(const QString &vertexShader, const QString
     m_labelShader->initialize();
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/bars3drenderer_p.h b/src/datavisualization/engine/bars3drenderer_p.h
index 2cdb28e4..03e490b8 100644
--- a/src/datavisualization/engine/bars3drenderer_p.h
+++ b/src/datavisualization/engine/bars3drenderer_p.h
@@ -39,7 +39,7 @@ class QPoint;
 class QSizeF;
 class QOpenGLShaderProgram;
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class ShaderHelper;
 class ObjectHelper;
@@ -133,7 +133,7 @@ signals:
 private:
     virtual void initShaders(const QString &vertexShader, const QString &fragmentShader);
     virtual void initGradientShaders(const QString &vertexShader, const QString &fragmentShader);
-    virtual void updateShadowQuality(QDataVis::ShadowQuality quality);
+    virtual void updateShadowQuality(QAbstract3DGraph::ShadowQuality quality);
     virtual void updateTextures();
     virtual void fixMeshFileName(QString &fileName, QAbstract3DSeries::Mesh mesh);
 
@@ -163,6 +163,6 @@ private:
 };
 
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/engine/drawer.cpp b/src/datavisualization/engine/drawer.cpp
index c9db4563..ec36befd 100644
--- a/src/datavisualization/engine/drawer.cpp
+++ b/src/datavisualization/engine/drawer.cpp
@@ -16,7 +16,6 @@
 **
 ****************************************************************************/
 
-#include "qdatavisualizationenums.h"
 #include "drawer_p.h"
 #include "shaderhelper_p.h"
 #include "objecthelper_p.h"
@@ -39,7 +38,7 @@ public:
 };
 StaticLibInitializer staticLibInitializer;
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 // Vertex array buffer for point
 const GLfloat point_data[] = {0.0f, 0.0f, 0.0f};
@@ -205,7 +204,7 @@ void Drawer::drawPoint(ShaderHelper *shader)
 void Drawer::drawLabel(const AbstractRenderItem &item, const LabelItem &labelItem,
                        const QMatrix4x4 &viewmatrix, const QMatrix4x4 &projectionmatrix,
                        const QVector3D &positionComp, const QVector3D &rotation,
-                       GLfloat itemHeight, QDataVis::SelectionFlags mode,
+                       GLfloat itemHeight, QAbstract3DGraph::SelectionFlags mode,
                        ShaderHelper *shader, ObjectHelper *object,
                        const Q3DCamera *camera, bool useDepth, bool rotateAlong,
                        LabelPosition position, Qt::AlignmentFlag alignment, bool isSlicing)
@@ -334,7 +333,7 @@ void Drawer::drawLabel(const AbstractRenderItem &item, const LabelItem &labelIte
         xPosition = item.translation().x();
         if (useDepth)
             zPosition = item.translation().z();
-        else if (mode.testFlag(QDataVis::SelectionColumn) && isSlicing)
+        else if (mode.testFlag(QAbstract3DGraph::SelectionColumn) && isSlicing)
             xPosition = -(item.translation().z()) + positionComp.z(); // flip first to left
     }
 
@@ -401,4 +400,4 @@ void Drawer::generateLabelItem(LabelItem &item, const QString &text, int widestL
     }
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/drawer_p.h b/src/datavisualization/engine/drawer_p.h
index 8bc62209..82163c08 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>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class ShaderHelper;
 class ObjectHelper;
@@ -81,7 +81,7 @@ public:
     void drawLabel(const AbstractRenderItem &item, const LabelItem &labelItem,
                    const QMatrix4x4 &viewmatrix, const QMatrix4x4 &projectionmatrix,
                    const QVector3D &positionComp, const QVector3D &rotation, GLfloat itemHeight,
-                   QDataVis::SelectionFlags mode, ShaderHelper *shader, ObjectHelper *object,
+                   QAbstract3DGraph::SelectionFlags mode, ShaderHelper *shader, ObjectHelper *object,
                    const Q3DCamera *camera, bool useDepth = false, bool rotateAlong = false,
                    LabelPosition position = LabelOver,
                    Qt::AlignmentFlag alignment = Qt::AlignCenter, bool isSlicing = false);
@@ -100,6 +100,6 @@ private:
     GLuint m_pointbuffer;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp
index fe121e0d..00530f7f 100644
--- a/src/datavisualization/engine/q3dbars.cpp
+++ b/src/datavisualization/engine/q3dbars.cpp
@@ -24,7 +24,7 @@
 #include "q3dcamera.h"
 #include "qbar3dseries_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
  * \class Q3DBars
@@ -338,4 +338,4 @@ Q3DBars *Q3DBarsPrivate::qptr()
     return static_cast<Q3DBars *>(q_ptr);
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/q3dbars.h b/src/datavisualization/engine/q3dbars.h
index 2ed27c50..10535eab 100644
--- a/src/datavisualization/engine/q3dbars.h
+++ b/src/datavisualization/engine/q3dbars.h
@@ -19,12 +19,11 @@
 #ifndef Q3DBARS_H
 #define Q3DBARS_H
 
-#include <QtDataVisualization/qdatavisualizationenums.h>
 #include <QtDataVisualization/qabstract3dgraph.h>
 #include <QFont>
 #include <QLinearGradient>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class Q3DBarsPrivate;
 class QAbstract3DAxis;
@@ -83,6 +82,6 @@ private:
     Q_DISABLE_COPY(Q3DBars)
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/engine/q3dbars_p.h b/src/datavisualization/engine/q3dbars_p.h
index 37ae3d70..3e7c97ac 100644
--- a/src/datavisualization/engine/q3dbars_p.h
+++ b/src/datavisualization/engine/q3dbars_p.h
@@ -30,10 +30,9 @@
 #define Q3DBARS_P_H
 
 #include "bars3dcontroller_p.h"
-#include "qdatavisualizationenums.h"
 #include "qabstract3dgraph_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class Q3DBars;
 
@@ -53,6 +52,6 @@ public:
     Bars3DController *m_shared;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/engine/q3dbox.cpp b/src/datavisualization/engine/q3dbox.cpp
index cc1e0265..ce5f76b1 100644
--- a/src/datavisualization/engine/q3dbox.cpp
+++ b/src/datavisualization/engine/q3dbox.cpp
@@ -20,7 +20,7 @@
 #include "q3dbox.h"
 #include <QtCore/QList>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
     \class Q3DBox
@@ -478,4 +478,4 @@ QDataStream &operator>>(QDataStream &stream, Q3DBox &box)
 
 #endif // QT_NO_DATASTREAM
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/q3dbox.h b/src/datavisualization/engine/q3dbox.h
index aa63ec39..e89f1cca 100644
--- a/src/datavisualization/engine/q3dbox.h
+++ b/src/datavisualization/engine/q3dbox.h
@@ -19,11 +19,10 @@
 #ifndef Q3DBOX_H
 #define Q3DBOX_H
 
-#include <QtDataVisualization/qdatavisualizationenums.h>
 #include <QtGui/QMatrix4x4>
 #include <QtGui/QVector3D>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class Q3DBox; // Needed to circumvent an issue with qdoc. If this line is removed, make docs will not work for this.
 
@@ -179,6 +178,6 @@ QT_DATAVISUALIZATION_EXPORT QDataStream &operator<<(QDataStream &stream, const Q
 QT_DATAVISUALIZATION_EXPORT QDataStream &operator>>(QDataStream &stream, Q3DBox &box);
 #endif
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/engine/q3dcamera.cpp b/src/datavisualization/engine/q3dcamera.cpp
index 6378051c..c9460c44 100644
--- a/src/datavisualization/engine/q3dcamera.cpp
+++ b/src/datavisualization/engine/q3dcamera.cpp
@@ -26,7 +26,7 @@
 #include <qmath.h>
 #include <QVector3D>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
  * \class Q3DCamera
@@ -868,4 +868,4 @@ void Q3DCameraPrivate::updateViewMatrix(float zoomAdjustment)
 }
 
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/q3dcamera.h b/src/datavisualization/engine/q3dcamera.h
index 9287e15a..b4341bb7 100644
--- a/src/datavisualization/engine/q3dcamera.h
+++ b/src/datavisualization/engine/q3dcamera.h
@@ -25,7 +25,7 @@
 class QVector3D;
 class QPoint;
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class Q3DCameraPrivate;
 
@@ -157,6 +157,6 @@ private:
     friend class QMac3DInputHandler;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif // Q3DCAMERA_H
diff --git a/src/datavisualization/engine/q3dcamera_p.h b/src/datavisualization/engine/q3dcamera_p.h
index ac32248e..cfaaeb4d 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"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class Q3DCamera;
 
@@ -82,6 +82,6 @@ public:
     friend class QMac3DInputHandler;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif // Q3DCAMERA_P_H
diff --git a/src/datavisualization/engine/q3dlight.cpp b/src/datavisualization/engine/q3dlight.cpp
index bc43c3d7..73ddc0fe 100644
--- a/src/datavisualization/engine/q3dlight.cpp
+++ b/src/datavisualization/engine/q3dlight.cpp
@@ -20,7 +20,7 @@
 #include "q3dscene.h"
 #include "q3dlight_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
  * \class Q3DLight
@@ -79,4 +79,4 @@ void Q3DLightPrivate::sync(Q3DLight &other)
     }
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/q3dlight.h b/src/datavisualization/engine/q3dlight.h
index f9109183..6515b1ae 100644
--- a/src/datavisualization/engine/q3dlight.h
+++ b/src/datavisualization/engine/q3dlight.h
@@ -21,7 +21,7 @@
 
 #include <QtDataVisualization/q3dobject.h>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class Q3DLightPrivate;
 class Q3DScene;
@@ -43,6 +43,6 @@ private:
     friend class Q3DScenePrivate;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif // Q3DLIGHT_H
diff --git a/src/datavisualization/engine/q3dlight_p.h b/src/datavisualization/engine/q3dlight_p.h
index dad6d670..bd871427 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"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class Q3DScene;
 class Q3DLight;
@@ -49,7 +49,7 @@ public:
     Q3DLight *q_ptr;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif // Q3DLIGHT_P_H
 
diff --git a/src/datavisualization/engine/q3dobject.cpp b/src/datavisualization/engine/q3dobject.cpp
index 89a682e1..1ef78add 100644
--- a/src/datavisualization/engine/q3dobject.cpp
+++ b/src/datavisualization/engine/q3dobject.cpp
@@ -20,7 +20,7 @@
 #include "q3dobject_p.h"
 #include "q3dscene_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
    \class Q3DObject
@@ -120,4 +120,4 @@ Q3DObjectPrivate::~Q3DObjectPrivate()
 
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/q3dobject.h b/src/datavisualization/engine/q3dobject.h
index b5ce7804..c32203cc 100644
--- a/src/datavisualization/engine/q3dobject.h
+++ b/src/datavisualization/engine/q3dobject.h
@@ -19,13 +19,12 @@
 #ifndef Q3DOBJECT_H
 #define Q3DOBJECT_H
 
-#include <QtDataVisualization/qdatavisualizationenums.h>
 #include <QtDataVisualization/q3dscene.h>
 
 #include <QObject>
 #include <QVector3D>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class Q3DObjectPrivate;
 
@@ -61,6 +60,6 @@ private:
     friend class Q3DScenePrivate;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif // Q3DOBJECT_H
diff --git a/src/datavisualization/engine/q3dobject_p.h b/src/datavisualization/engine/q3dobject_p.h
index bac18cfe..51bf1b08 100644
--- a/src/datavisualization/engine/q3dobject_p.h
+++ b/src/datavisualization/engine/q3dobject_p.h
@@ -31,7 +31,7 @@
 
 #include "datavisualizationglobal_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class Q3DObject;
 class Q3DScene;
@@ -48,6 +48,6 @@ public:
     bool m_isDirty;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif // Q3DOBJECT_P_H
diff --git a/src/datavisualization/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp
index f83ca17e..d6805232 100644
--- a/src/datavisualization/engine/q3dscatter.cpp
+++ b/src/datavisualization/engine/q3dscatter.cpp
@@ -23,7 +23,7 @@
 #include "q3dcamera.h"
 #include "qscatter3dseries_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
  * \class Q3DScatter
@@ -270,5 +270,5 @@ Q3DScatter *Q3DScatterPrivate::qptr()
     return static_cast<Q3DScatter *>(q_ptr);
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
diff --git a/src/datavisualization/engine/q3dscatter.h b/src/datavisualization/engine/q3dscatter.h
index d9ad596c..a03e51f7 100644
--- a/src/datavisualization/engine/q3dscatter.h
+++ b/src/datavisualization/engine/q3dscatter.h
@@ -19,13 +19,12 @@
 #ifndef Q3DSCATTER_H
 #define Q3DSCATTER_H
 
-#include <QtDataVisualization/qdatavisualizationenums.h>
 #include <QtDataVisualization/qabstract3dgraph.h>
 #include <QtDataVisualization/q3dscene.h>
 #include <QFont>
 #include <QLinearGradient>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class Q3DScatterPrivate;
 class QValue3DAxis;
@@ -68,6 +67,6 @@ private:
     Q_DISABLE_COPY(Q3DScatter)
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/engine/q3dscatter_p.h b/src/datavisualization/engine/q3dscatter_p.h
index ab547e52..9c6c4480 100644
--- a/src/datavisualization/engine/q3dscatter_p.h
+++ b/src/datavisualization/engine/q3dscatter_p.h
@@ -30,10 +30,9 @@
 #define Q3DSCATTER_P_H
 
 #include "scatter3dcontroller_p.h"
-#include "qdatavisualizationenums.h"
 #include "qabstract3dgraph_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class Q3DScatter;
 
@@ -53,6 +52,6 @@ public:
     Scatter3DController *m_shared;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/engine/q3dscene.cpp b/src/datavisualization/engine/q3dscene.cpp
index 6fbfac51..cb70876b 100644
--- a/src/datavisualization/engine/q3dscene.cpp
+++ b/src/datavisualization/engine/q3dscene.cpp
@@ -25,7 +25,7 @@
 #include "q3dcamera_p.h"
 #include "q3dlight_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
  * \class Q3DScene
@@ -644,4 +644,4 @@ QRect Q3DScenePrivate::glSecondarySubViewport()
     return m_glSecondarySubViewport;
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/q3dscene.h b/src/datavisualization/engine/q3dscene.h
index fb543cdb..d43d06ec 100644
--- a/src/datavisualization/engine/q3dscene.h
+++ b/src/datavisualization/engine/q3dscene.h
@@ -19,11 +19,12 @@
 #ifndef Q3DSCENE_H
 #define Q3DSCENE_H
 
-#include <QtDataVisualization/qdatavisualizationenums.h>
+#include <QtDataVisualization/qdatavisualizationglobal.h>
+
 #include <QObject>
 #include <QRect>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class Q3DCamera;
 class Q3DBox;
@@ -107,6 +108,6 @@ private:
     friend class Q3DObject;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif // Q3DSCENE_H
diff --git a/src/datavisualization/engine/q3dscene_p.h b/src/datavisualization/engine/q3dscene_p.h
index 94265568..65d5e4c8 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>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class Q3DCamera;
 class Q3DLight;
@@ -110,6 +110,6 @@ public:
     bool m_sceneDirty;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif // Q3DSCENE_P_H
diff --git a/src/datavisualization/engine/q3dsurface.cpp b/src/datavisualization/engine/q3dsurface.cpp
index 15c48dbf..84e2c455 100644
--- a/src/datavisualization/engine/q3dsurface.cpp
+++ b/src/datavisualization/engine/q3dsurface.cpp
@@ -23,7 +23,7 @@
 #include "q3dcamera.h"
 #include "qsurface3dseries_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
  * \class Q3DSurface
@@ -293,4 +293,4 @@ Q3DSurface *Q3DSurfacePrivate::qptr()
     return static_cast<Q3DSurface *>(q_ptr);
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/q3dsurface.h b/src/datavisualization/engine/q3dsurface.h
index a5107ef1..833e983a 100644
--- a/src/datavisualization/engine/q3dsurface.h
+++ b/src/datavisualization/engine/q3dsurface.h
@@ -19,12 +19,11 @@
 #ifndef Q3DSURFACE_H
 #define Q3DSURFACE_H
 
-#include <QtDataVisualization/qdatavisualizationenums.h>
 #include <QtDataVisualization/qabstract3dgraph.h>
 #include <QtDataVisualization/q3dscene.h>
 #include <QFont>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class Q3DSurfacePrivate;
 class QValue3DAxis;
@@ -67,6 +66,6 @@ private:
     Q_DISABLE_COPY(Q3DSurface)
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif // Q3DSURFACE_H
diff --git a/src/datavisualization/engine/q3dsurface_p.h b/src/datavisualization/engine/q3dsurface_p.h
index 0cbb6997..d604fc51 100644
--- a/src/datavisualization/engine/q3dsurface_p.h
+++ b/src/datavisualization/engine/q3dsurface_p.h
@@ -30,12 +30,11 @@
 #define Q3DSURFACE_P_H
 
 #include "surface3dcontroller_p.h"
-#include "qdatavisualizationenums.h"
 #include "qabstract3dgraph_p.h"
 
 #include <QList>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class Q3DSurface;
 
@@ -55,6 +54,6 @@ public:
     Surface3DController *m_shared;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif // Q3DSURFACE_P_H
diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp
index c7063438..2d62a4ee 100644
--- a/src/datavisualization/engine/qabstract3dgraph.cpp
+++ b/src/datavisualization/engine/qabstract3dgraph.cpp
@@ -29,7 +29,7 @@
 #include <QPainter>
 
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
  * \class QAbstract3DGraph
@@ -60,6 +60,59 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
  */
 
 /*!
+    \enum QAbstract3DGraph::SelectionFlag
+
+    Item selection modes. Values of this enumeration can be combined with OR operator.
+
+    \value SelectionNone
+           Selection mode disabled.
+    \value SelectionItem
+           Selection highlights a single item.
+    \value SelectionRow
+           Selection highlights a single row.
+    \value SelectionItemAndRow
+           Combination flag for highlighting both item and row with different colors.
+    \value SelectionColumn
+           Selection highlights a single column.
+    \value SelectionItemAndColumn
+           Combination flag for highlighting both item and column with different colors.
+    \value SelectionRowAndColumn
+           Combination flag for highlighting both row and column.
+    \value SelectionItemRowAndColumn
+           Combination flag for highlighting item, row, and column.
+    \value SelectionSlice
+           Setting this mode flag indicates that the graph should take care of the slice view handling
+           automatically. If you wish to control the slice view yourself via Q3DScene, do not set this
+           flag. When setting this mode flag, either \c SelectionRow or \c SelectionColumn must also
+           be set, but not both. Slicing is supported by Q3DBars and Q3DSurface only.
+    \value SelectionMultiSeries
+           Setting this mode means that items for all series at same position are highlighted, instead
+           of just the selected item. The actual selection in the other series doesn't change.
+           Multi-series selection is only supported for Q3DBars.
+*/
+
+/*!
+    \enum QAbstract3DGraph::ShadowQuality
+
+    Quality of shadows.
+
+    \value ShadowQualityNone
+           Shadows are disabled.
+    \value ShadowQualityLow
+           Shadows are rendered in low quality.
+    \value ShadowQualityMedium
+           Shadows are rendered in medium quality.
+    \value ShadowQualityHigh
+           Shadows are rendered in high quality.
+    \value ShadowQualitySoftLow
+           Shadows are rendered in low quality with softened edges.
+    \value ShadowQualitySoftMedium
+           Shadows are rendered in medium quality with softened edges.
+    \value ShadowQualitySoftHigh
+           Shadows are rendered in high quality with softened edges.
+*/
+
+/*!
  * \internal
  */
 QAbstract3DGraph::QAbstract3DGraph(QAbstract3DGraphPrivate *d, const QSurfaceFormat *format, QWindow *parent)
@@ -232,17 +285,17 @@ QList<Q3DTheme *> QAbstract3DGraph::themes() const
 /*!
  * \property QAbstract3DGraph::selectionMode
  *
- * Sets selection \a mode to a combination of \c QDataVis::SelectionFlags. It is preset to
- * \c QDataVis::SelectionItem by default.
- * Different graph types support different selection modes. See \c QDataVis::SelectionFlags
+ * Sets selection \a mode to a combination of SelectionFlags. It is preset to
+ * \c SelectionItem by default.
+ * Different graph types support different selection modes. See \c SelectionFlags
  * documentation for details.
  */
-void QAbstract3DGraph::setSelectionMode(QDataVis::SelectionFlags mode)
+void QAbstract3DGraph::setSelectionMode(SelectionFlags mode)
 {
     d_ptr->m_visualController->setSelectionMode(mode);
 }
 
-QDataVis::SelectionFlags QAbstract3DGraph::selectionMode() const
+QAbstract3DGraph::SelectionFlags QAbstract3DGraph::selectionMode() const
 {
     return d_ptr->m_visualController->selectionMode();
 }
@@ -250,19 +303,19 @@ QDataVis::SelectionFlags QAbstract3DGraph::selectionMode() const
 /*!
  * \property QAbstract3DGraph::shadowQuality
  *
- * Sets shadow \a quality to one of \c QDataVis::ShadowQuality. It is preset to
- * \c QDataVis::ShadowQualityMedium by default.
+ * Sets shadow \a quality to one of ShadowQuality. It is preset to
+ * \c ShadowQualityMedium by default.
  *
- * \note If setting QDataVis::ShadowQuality of a certain level fails, a level is lowered
+ * \note If setting ShadowQuality of a certain level fails, a level is lowered
  * until it is successful and shadowQualityChanged signal is emitted for each time the change is
  * done.
  */
-void QAbstract3DGraph::setShadowQuality(QDataVis::ShadowQuality quality)
+void QAbstract3DGraph::setShadowQuality(ShadowQuality quality)
 {
     d_ptr->m_visualController->setShadowQuality(quality);
 }
 
-QDataVis::ShadowQuality QAbstract3DGraph::shadowQuality() const
+QAbstract3DGraph::ShadowQuality QAbstract3DGraph::shadowQuality() const
 {
     return d_ptr->m_visualController->shadowQuality();
 }
@@ -443,4 +496,4 @@ void QAbstract3DGraphPrivate::renderNow()
     m_context->swapBuffers(q_ptr);
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/qabstract3dgraph.h b/src/datavisualization/engine/qabstract3dgraph.h
index 5e39221c..9441544b 100644
--- a/src/datavisualization/engine/qabstract3dgraph.h
+++ b/src/datavisualization/engine/qabstract3dgraph.h
@@ -19,15 +19,13 @@
 #ifndef QABSTRACT3DGRAPH_H
 #define QABSTRACT3DGRAPH_H
 
-#include <QtDataVisualization/qdatavisualizationenums.h>
+#include <QtDataVisualization/qdatavisualizationglobal.h>
 
 #include <QWindow>
 #include <QOpenGLFunctions>
 #include <QScreen>
 
-class QPainter;
-
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QAbstract3DGraphPrivate;
 class Abstract3DController;
@@ -38,14 +36,42 @@ class Q3DScene;
 class QT_DATAVISUALIZATION_EXPORT QAbstract3DGraph : public QWindow, protected QOpenGLFunctions
 {
     Q_OBJECT
+    Q_ENUMS(ShadowQuality)
+    Q_FLAGS(SelectionFlag SelectionFlags)
     Q_PROPERTY(QAbstract3DInputHandler* activeInputHandler READ activeInputHandler WRITE setActiveInputHandler NOTIFY activeInputHandlerChanged)
     Q_PROPERTY(Q3DTheme* activeTheme READ activeTheme WRITE setActiveTheme NOTIFY activeThemeChanged)
-    Q_PROPERTY(QtDataVisualization::QDataVis::SelectionFlags selectionMode READ selectionMode WRITE setSelectionMode NOTIFY selectionModeChanged)
-    Q_PROPERTY(QtDataVisualization::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality NOTIFY shadowQualityChanged)
+    Q_PROPERTY(SelectionFlags selectionMode READ selectionMode WRITE setSelectionMode NOTIFY selectionModeChanged)
+    Q_PROPERTY(ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality NOTIFY shadowQualityChanged)
     Q_PROPERTY(Q3DScene* scene READ scene)
 
 protected:
     explicit QAbstract3DGraph(QAbstract3DGraphPrivate *d, const QSurfaceFormat *format, QWindow *parent = 0);
+
+public:
+    enum SelectionFlag {
+        SelectionNone              = 0,
+        SelectionItem              = 1,
+        SelectionRow               = 2,
+        SelectionItemAndRow        = SelectionItem | SelectionRow,
+        SelectionColumn            = 4,
+        SelectionItemAndColumn     = SelectionItem | SelectionColumn,
+        SelectionRowAndColumn      = SelectionRow | SelectionColumn,
+        SelectionItemRowAndColumn  = SelectionItem | SelectionRow | SelectionColumn,
+        SelectionSlice             = 8,
+        SelectionMultiSeries       = 16
+    };
+    Q_DECLARE_FLAGS(SelectionFlags, SelectionFlag)
+
+    enum ShadowQuality {
+        ShadowQualityNone = 0,
+        ShadowQualityLow,
+        ShadowQualityMedium,
+        ShadowQualityHigh,
+        ShadowQualitySoftLow,
+        ShadowQualitySoftMedium,
+        ShadowQualitySoftHigh
+    };
+
 public:
     virtual ~QAbstract3DGraph();
 
@@ -61,11 +87,11 @@ public:
     Q3DTheme *activeTheme() const;
     QList<Q3DTheme *> themes() const;
 
-    void setSelectionMode(QDataVis::SelectionFlags mode);
-    QDataVis::SelectionFlags selectionMode() const;
+    void setSelectionMode(SelectionFlags mode);
+    SelectionFlags selectionMode() const;
 
-    void setShadowQuality(QDataVis::ShadowQuality quality);
-    QDataVis::ShadowQuality shadowQuality() const;
+    void setShadowQuality(ShadowQuality quality);
+    ShadowQuality shadowQuality() const;
 
     Q3DScene *scene() const;
 
@@ -85,8 +111,8 @@ protected:
 signals:
     void activeInputHandlerChanged(QAbstract3DInputHandler *inputHandler);
     void activeThemeChanged(Q3DTheme *theme);
-    void selectionModeChanged(QDataVis::SelectionFlags mode);
-    void shadowQualityChanged(QDataVis::ShadowQuality quality);
+    void selectionModeChanged(SelectionFlags mode);
+    void shadowQualityChanged(ShadowQuality quality);
 
 private:
     QScopedPointer<QAbstract3DGraphPrivate> d_ptr;
@@ -95,7 +121,8 @@ private:
     friend class Q3DScatter;
     friend class Q3DSurface;
 };
+Q_DECLARE_OPERATORS_FOR_FLAGS(QAbstract3DGraph::SelectionFlags)
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/engine/qabstract3dgraph_p.h b/src/datavisualization/engine/qabstract3dgraph_p.h
index e1ccab92..43f96e4a 100644
--- a/src/datavisualization/engine/qabstract3dgraph_p.h
+++ b/src/datavisualization/engine/qabstract3dgraph_p.h
@@ -36,7 +36,7 @@
 class QOpenGLContext;
 class QOpenGLPaintDevice;
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QAbstract3DGraph;
 class Abstract3DController;
@@ -71,6 +71,6 @@ public:
     float m_devicePixelRatio;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/engine/scatter3dcontroller.cpp b/src/datavisualization/engine/scatter3dcontroller.cpp
index 0c991839..e6e47cb5 100644
--- a/src/datavisualization/engine/scatter3dcontroller.cpp
+++ b/src/datavisualization/engine/scatter3dcontroller.cpp
@@ -27,7 +27,7 @@
 #include <QMatrix4x4>
 #include <qmath.h>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 Scatter3DController::Scatter3DController(QRect boundRect, Q3DScene *scene)
     : Abstract3DController(boundRect, scene),
@@ -214,10 +214,10 @@ void Scatter3DController::handleSeriesVisibilityChangedBySender(QObject *sender)
     adjustValueAxisRange();
 }
 
-void Scatter3DController::setSelectionMode(QDataVis::SelectionFlags mode)
+void Scatter3DController::setSelectionMode(QAbstract3DGraph::SelectionFlags mode)
 {
     // We only support single item selection mode and no selection mode
-    if (mode != QDataVis::SelectionItem && mode != QDataVis::SelectionNone) {
+    if (mode != QAbstract3DGraph::SelectionItem && mode != QAbstract3DGraph::SelectionNone) {
         qWarning("Unsupported selection mode - only none and item selection modes are supported.");
         return;
     }
@@ -367,4 +367,4 @@ void Scatter3DController::adjustValueAxisRange()
     }
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/scatter3dcontroller_p.h b/src/datavisualization/engine/scatter3dcontroller_p.h
index 2d0c9a9a..8bc43636 100644
--- a/src/datavisualization/engine/scatter3dcontroller_p.h
+++ b/src/datavisualization/engine/scatter3dcontroller_p.h
@@ -34,7 +34,7 @@
 
 //#define DISPLAY_RENDER_SPEED
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class Scatter3DRenderer;
 class QScatterDataProxy;
@@ -69,7 +69,7 @@ public:
     virtual void initializeOpenGL();
 
     // Change selection mode
-    void setSelectionMode(QDataVis::SelectionFlags mode);
+    void setSelectionMode(QAbstract3DGraph::SelectionFlags mode);
 
     void setSelectedItem(int index, QScatter3DSeries *series);
     static inline int invalidSelectionIndex() { return -1; }
@@ -101,6 +101,6 @@ private:
 };
 
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp
index 3eee8ff0..606f1379 100644
--- a/src/datavisualization/engine/scatter3drenderer.cpp
+++ b/src/datavisualization/engine/scatter3drenderer.cpp
@@ -41,7 +41,7 @@
 // You should see the scene from  where the light is
 //#define SHOW_DEPTH_TEXTURE_SCENE
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 //#define USE_UNIFORM_SCALING // Scale x and z uniformly, or based on autoscaled values
 
@@ -324,7 +324,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
         glEnable(GL_PROGRAM_POINT_SIZE);
     }
 
-    if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+    if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
         // Render scene into a depth texture for using with shadow mapping
         // Bind depth shader
         m_depthShader->bind();
@@ -455,7 +455,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
     ShaderHelper *selectionShader = m_selectionShader;
 
     // Skip selection mode drawing if we have no selection mode
-    if (m_cachedSelectionMode > QDataVis::SelectionNone
+    if (m_cachedSelectionMode > QAbstract3DGraph::SelectionNone
             && SelectOnScene == m_selectionState && seriesCount > 0) {
         // Draw dots to selection buffer
         glBindFramebuffer(GL_FRAMEBUFFER, m_selectionFrameBuffer);
@@ -704,7 +704,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
                 gradientTexture = currentSeries.baseGradientTexture();
 
             GLfloat lightStrength = m_cachedTheme->lightStrength();
-            if (m_cachedSelectionMode > QDataVis::SelectionNone && (m_selectedItemTotalIndex == dotNo)) {
+            if (m_cachedSelectionMode > QAbstract3DGraph::SelectionNone && (m_selectedItemTotalIndex == dotNo)) {
                 if (useColor)
                     dotColor = currentSeries.singleHighlightColor();
                 else
@@ -730,7 +730,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
                                            (item.position().y() + 1.0f) / 2.0f);
             }
 #if !defined(QT_OPENGL_ES_2)
-            if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+            if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
                 if (!drawingPoints) {
                     // Set shadow shader bindings
                     QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
@@ -821,7 +821,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
                                             m_cachedTheme->ambientLightStrength() * 2.0f);
 
 #if !defined(QT_OPENGL_ES_2)
-        if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+        if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
             // Set shadow shader bindings
             QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
             m_backgroundShader->setUniformValue(m_backgroundShader->shadowQ(),
@@ -869,7 +869,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
         lineShader->setUniformValue(lineShader->color(), lineColor);
         lineShader->setUniformValue(lineShader->ambientS(), m_cachedTheme->ambientLightStrength());
 #if !defined(QT_OPENGL_ES_2)
-        if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+        if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
             // Set shadowed shader bindings
             lineShader->setUniformValue(lineShader->shadowQ(), m_shadowQualityToShader);
             lineShader->setUniformValue(lineShader->lightS(),
@@ -943,7 +943,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
                 lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-                if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+                if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
                     QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
                     // Set shadow shader bindings
                     lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -995,7 +995,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
                 lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-                if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+                if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
                     // Set shadow shader bindings
                     QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
                     lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1052,7 +1052,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
                 lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-                if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+                if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
                     // Set shadow shader bindings
                     QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
                     lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1107,7 +1107,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
                 lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-                if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+                if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
                     // Set shadow shader bindings
                     QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
                     lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1171,7 +1171,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
                 lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-                if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+                if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
                     // Set shadow shader bindings
                     QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
                     lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1229,7 +1229,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
                 lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-                if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+                if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
                     // Set shadow shader bindings
                     QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
                     lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1561,31 +1561,31 @@ void Scatter3DRenderer::updateSelectedItem(int index, const QScatter3DSeries *se
     }
 }
 
-void Scatter3DRenderer::updateShadowQuality(QDataVis::ShadowQuality quality)
+void Scatter3DRenderer::updateShadowQuality(QAbstract3DGraph::ShadowQuality quality)
 {
     m_cachedShadowQuality = quality;
     switch (quality) {
-    case QDataVis::ShadowQualityLow:
+    case QAbstract3DGraph::ShadowQualityLow:
         m_shadowQualityToShader = 33.3f;
         m_shadowQualityMultiplier = 1;
         break;
-    case QDataVis::ShadowQualityMedium:
+    case QAbstract3DGraph::ShadowQualityMedium:
         m_shadowQualityToShader = 100.0f;
         m_shadowQualityMultiplier = 3;
         break;
-    case QDataVis::ShadowQualityHigh:
+    case QAbstract3DGraph::ShadowQualityHigh:
         m_shadowQualityToShader = 200.0f;
         m_shadowQualityMultiplier = 5;
         break;
-    case QDataVis::ShadowQualitySoftLow:
+    case QAbstract3DGraph::ShadowQualitySoftLow:
         m_shadowQualityToShader = 5.0f;
         m_shadowQualityMultiplier = 1;
         break;
-    case QDataVis::ShadowQualitySoftMedium:
+    case QAbstract3DGraph::ShadowQualitySoftMedium:
         m_shadowQualityToShader = 10.0f;
         m_shadowQualityMultiplier = 3;
         break;
-    case QDataVis::ShadowQualitySoftHigh:
+    case QAbstract3DGraph::ShadowQualitySoftHigh:
         m_shadowQualityToShader = 15.0f;
         m_shadowQualityMultiplier = 4;
         break;
@@ -1733,7 +1733,7 @@ void Scatter3DRenderer::updateDepthBuffer()
     if (m_primarySubViewport.size().isEmpty())
         return;
 
-    if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+    if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
         m_depthTexture = m_textureHelper->createDepthTextureFrameBuffer(m_primarySubViewport.size(),
                                                                         m_depthFrameBuffer,
                                                                         m_shadowQualityMultiplier);
@@ -1800,4 +1800,4 @@ void Scatter3DRenderer::selectionColorToSeriesAndIndex(const QVector3D &color, i
     series = 0;
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/scatter3drenderer_p.h b/src/datavisualization/engine/scatter3drenderer_p.h
index 7eb75de9..fb1e2698 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;
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class ShaderHelper;
 class ObjectHelper;
@@ -110,7 +110,7 @@ protected:
 private:
     virtual void initShaders(const QString &vertexShader, const QString &fragmentShader);
     virtual void initGradientShaders(const QString &vertexShader, const QString &fragmentShader);
-    virtual void updateShadowQuality(QDataVis::ShadowQuality quality);
+    virtual void updateShadowQuality(QAbstract3DGraph::ShadowQuality quality);
     virtual void updateTextures();
     virtual void fixMeshFileName(QString &fileName, QAbstract3DSeries::Mesh mesh);
 
@@ -150,6 +150,6 @@ private:
     void selectionColorToSeriesAndIndex(const QVector3D &color, int &index, QScatter3DSeries *&series);
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/engine/selectionpointer.cpp b/src/datavisualization/engine/selectionpointer.cpp
index c4eced30..0ce9ce22 100644
--- a/src/datavisualization/engine/selectionpointer.cpp
+++ b/src/datavisualization/engine/selectionpointer.cpp
@@ -32,7 +32,7 @@
 
 #include <QDebug>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 const GLfloat sliceUnits = 2.5;
 
@@ -259,4 +259,4 @@ void SelectionPointer::loadLabelMesh()
     m_labelObj->load();
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/selectionpointer_p.h b/src/datavisualization/engine/selectionpointer_p.h
index 8faeb9ac..b1cb4b63 100644
--- a/src/datavisualization/engine/selectionpointer_p.h
+++ b/src/datavisualization/engine/selectionpointer_p.h
@@ -41,7 +41,7 @@
 
 class QOpenGLShaderProgram;
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class ShaderHelper;
 class ObjectHelper;
@@ -93,6 +93,6 @@ private:
     QVector3D m_highlightColor;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif // NOTIFICATIONLABEL_P_H
diff --git a/src/datavisualization/engine/seriesrendercache.cpp b/src/datavisualization/engine/seriesrendercache.cpp
index cea0f7b1..5ea9a117 100644
--- a/src/datavisualization/engine/seriesrendercache.cpp
+++ b/src/datavisualization/engine/seriesrendercache.cpp
@@ -22,7 +22,7 @@
 #include "texturehelper_p.h"
 #include "utils_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 const QString smoothString(QStringLiteral("Smooth"));
 
@@ -179,4 +179,4 @@ void SeriesRenderCache::cleanup(TextureHelper *texHelper)
     texHelper->deleteTexture(&m_multiHighlightGradientTexture);
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/seriesrendercache_p.h b/src/datavisualization/engine/seriesrendercache_p.h
index 2bf7a1cc..d543da71 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"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class Abstract3DRenderer;
 class ObjectHelper;
@@ -80,7 +80,7 @@ protected:
     QString m_name;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
 
diff --git a/src/datavisualization/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp
index cf844c0f..53535b9d 100644
--- a/src/datavisualization/engine/surface3dcontroller.cpp
+++ b/src/datavisualization/engine/surface3dcontroller.cpp
@@ -30,7 +30,7 @@
 
 #include <QDebug>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 Surface3DController::Surface3DController(QRect rect, Q3DScene *scene)
     : Abstract3DController(rect, scene),
@@ -173,18 +173,20 @@ QList<QSurface3DSeries *> Surface3DController::surfaceSeriesList()
     return surfaceSeriesList;
 }
 
-void Surface3DController::setSelectionMode(QDataVis::SelectionFlags mode)
+void Surface3DController::setSelectionMode(QAbstract3DGraph::SelectionFlags mode)
 {
     // Currently surface only supports row and column modes when also slicing
-    if ((mode.testFlag(QDataVis::SelectionRow) || mode.testFlag(QDataVis::SelectionColumn))
-            && !mode.testFlag(QDataVis::SelectionSlice)) {
+    if ((mode.testFlag(QAbstract3DGraph::SelectionRow)
+         || mode.testFlag(QAbstract3DGraph::SelectionColumn))
+            && !mode.testFlag(QAbstract3DGraph::SelectionSlice)) {
         qWarning("Unsupported selection mode.");
         return;
-    } else if (mode.testFlag(QDataVis::SelectionSlice)
-               && (mode.testFlag(QDataVis::SelectionRow) == mode.testFlag(QDataVis::SelectionColumn))) {
+    } else if (mode.testFlag(QAbstract3DGraph::SelectionSlice)
+               && (mode.testFlag(QAbstract3DGraph::SelectionRow)
+                   == mode.testFlag(QAbstract3DGraph::SelectionColumn))) {
         qWarning("Must specify one of either row or column selection mode in conjunction with slicing mode.");
     } else {
-        QDataVis::SelectionFlags oldMode = selectionMode();
+        QAbstract3DGraph::SelectionFlags oldMode = selectionMode();
 
         Abstract3DController::setSelectionMode(mode);
 
@@ -195,8 +197,8 @@ void Surface3DController::setSelectionMode(QDataVis::SelectionFlags mode)
 
             // Special case: Always deactivate slicing when changing away from slice
             // automanagement, as this can't be handled in setSelectedBar.
-            if (!mode.testFlag(QDataVis::SelectionSlice)
-                    && oldMode.testFlag(QDataVis::SelectionSlice)) {
+            if (!mode.testFlag(QAbstract3DGraph::SelectionSlice)
+                    && oldMode.testFlag(QAbstract3DGraph::SelectionSlice)) {
                 scene()->setSlicingActive(false);
             }
         }
@@ -227,7 +229,7 @@ void Surface3DController::setSelectedPoint(const QPoint &position, QSurface3DSer
             pos = invalidSelectionPosition();
     }
 
-    if (selectionMode().testFlag(QDataVis::SelectionSlice)) {
+    if (selectionMode().testFlag(QAbstract3DGraph::SelectionSlice)) {
         if (pos == invalidSelectionPosition() || !series->isVisible()) {
             scene()->setSlicingActive(false);
         } else {
@@ -509,4 +511,4 @@ void Surface3DController::adjustValueAxisRange()
     }
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/surface3dcontroller_p.h b/src/datavisualization/engine/surface3dcontroller_p.h
index 915a3122..dcd55982 100644
--- a/src/datavisualization/engine/surface3dcontroller_p.h
+++ b/src/datavisualization/engine/surface3dcontroller_p.h
@@ -33,7 +33,7 @@
 #include "datavisualizationglobal_p.h"
 
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class Surface3DRenderer;
 class QSurface3DSeries;
@@ -76,10 +76,11 @@ public:
     virtual void initializeOpenGL();
     virtual void synchDataToRenderer();
 
-    void setSelectionMode(QDataVis::SelectionFlags mode);
+    void setSelectionMode(QAbstract3DGraph::SelectionFlags mode);
     void setSelectedPoint(const QPoint &position, QSurface3DSeries *series);
 
-    virtual void handleAxisAutoAdjustRangeChangedInOrientation(QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust);
+    virtual void handleAxisAutoAdjustRangeChangedInOrientation(
+            QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust);
     virtual void handleAxisRangeChangedBySender(QObject *sender);
     virtual void handleSeriesVisibilityChangedBySender(QObject *sender);
 
@@ -109,6 +110,6 @@ private:
     Q_DISABLE_COPY(Surface3DController)
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif // SURFACE3DCONTROLLER_P_H
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index aac74d0f..5f54ed79 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -38,7 +38,7 @@
 
 static const int ID_TO_RGBA_MASK = 0xff;
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 //#define SHOW_DEPTH_TEXTURE_SCENE
 
@@ -399,7 +399,7 @@ void Surface3DRenderer::updateSliceDataModel(const QPoint &point)
 
     float adjust = (0.025f * m_heightNormalizer) / 2.0f;
     float stepDown = 2.0f * adjust;
-    if (m_cachedSelectionMode.testFlag(QDataVis::SelectionRow)) {
+    if (m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionRow)) {
         QSurfaceDataRow *src = m_dataArray.at(row);
         sliceRow = new QSurfaceDataRow(src->size());
         for (int i = 0; i < sliceRow->size(); i++)
@@ -539,7 +539,7 @@ void Surface3DRenderer::updateScene(Q3DScene *scene)
     Abstract3DRenderer::updateScene(scene);
 
     if (m_selectionPointer && m_selectionActive
-            && m_cachedSelectionMode.testFlag(QDataVis::SelectionItem)) {
+            && m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionItem)) {
         m_selectionDirty = true; // Ball may need repositioning if scene changes
     }
 
@@ -557,7 +557,7 @@ void Surface3DRenderer::render(GLuint defaultFboHandle)
 
     // Render selection ball
     if (m_selectionPointer && m_selectionActive
-            && m_cachedSelectionMode.testFlag(QDataVis::SelectionItem)) {
+            && m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionItem)) {
         m_selectionPointer->render(defaultFboHandle);
     }
 }
@@ -588,7 +588,7 @@ void Surface3DRenderer::drawSlicedScene()
 
     QMatrix4x4 projectionViewMatrix = projectionMatrix * viewMatrix;
 
-    bool rowMode = m_cachedSelectionMode.testFlag(QDataVis::SelectionRow);
+    bool rowMode = m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionRow);
 
     GLfloat scaleX = 0.0f;
     GLfloat scaleXBackground = 0.0f;
@@ -812,7 +812,7 @@ void Surface3DRenderer::drawSlicedScene()
                 axisLabelItem = m_axisCacheZ.labelItems().at(labelNbr);
 
             m_drawer->drawLabel(m_dummyRenderItem, *axisLabelItem, viewMatrix, projectionMatrix,
-                                positionComp, rotation, 0, QDataVis::SelectionRow,
+                                positionComp, rotation, 0, QAbstract3DGraph::SelectionRow,
                                 m_labelShader, m_labelObj, m_cachedScene->activeCamera(),
                                 false, false, Drawer::LabelBelow, Qt::AlignBottom, true);
         }
@@ -880,7 +880,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
     // Draw depth buffer
 #if !defined(QT_OPENGL_ES_2)
     GLfloat adjustedLightStrength =  m_cachedTheme->lightStrength() / 10.0f;
-    if (m_cachedShadowQuality > QDataVis::ShadowQualityNone && m_surfaceObj && m_cachedSurfaceVisible) {
+    if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone && m_surfaceObj && m_cachedSurfaceVisible) {
         // Render scene into a depth texture for using with shadow mapping
         // Enable drawing to depth framebuffer
         glBindFramebuffer(GL_FRAMEBUFFER, m_depthFrameBuffer);
@@ -994,7 +994,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
 
     // Draw selection buffer
     if (!m_cachedIsSlicingActivated && m_surfaceObj && m_selectionState == SelectOnScene
-            && m_cachedSelectionMode > QDataVis::SelectionNone
+            && m_cachedSelectionMode > QAbstract3DGraph::SelectionNone
             && (m_cachedSurfaceVisible || m_cachedSurfaceGridOn)
             && m_visibleSeriesList.size() > 0) {
         m_selectionShader->bind();
@@ -1091,7 +1091,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
                 gradientTexture = m_visibleSeriesList.at(0).baseGradientTexture();
 
 #if !defined(QT_OPENGL_ES_2)
-            if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+            if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
                 // Set shadow shader bindings
                 QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
                 m_surfaceShader->setUniformValue(m_surfaceShader->shadowQ(), m_shadowQualityToShader);
@@ -1168,7 +1168,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
                                             m_cachedTheme->ambientLightStrength() * 2.0f);
 
 #if !defined(QT_OPENGL_ES_2)
-        if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+        if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
             // Set shadow shader bindings
             QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
             m_backgroundShader->setUniformValue(m_backgroundShader->shadowQ(),
@@ -1209,7 +1209,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
         lineShader->setUniformValue(lineShader->color(), lineColor);
         lineShader->setUniformValue(lineShader->ambientS(), m_cachedTheme->ambientLightStrength());
 #if !defined(QT_OPENGL_ES_2)
-        if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+        if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
             // Set shadowed shader bindings
             lineShader->setUniformValue(lineShader->shadowQ(), m_shadowQualityToShader);
             lineShader->setUniformValue(lineShader->lightS(),
@@ -1267,7 +1267,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
                 lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-                if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+                if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
                     // Set shadow shader bindings
                     QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
                     lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1311,7 +1311,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
                 lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-                if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+                if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
                     // Set shadow shader bindings
                     QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
                     lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1356,7 +1356,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
                 lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-                if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+                if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
                     // Set shadow shader bindings
                     QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
                     lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1402,7 +1402,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
                 lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-                if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+                if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
                     // Set shadow shader bindings
                     QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
                     lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1454,7 +1454,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
                 lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-                if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+                if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
                     // Set shadow shader bindings
                     QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
                     lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1499,7 +1499,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
                 lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-                if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+                if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
                     // Set shadow shader bindings
                     QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
                     lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1703,14 +1703,14 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
             }
         }
 
-        if (m_cachedSelectionMode == QDataVis::SelectionNone
+        if (m_cachedSelectionMode == QAbstract3DGraph::SelectionNone
                 || visiblePoint == Surface3DController::invalidSelectionPosition()) {
             m_selectionActive = false;
         } else {
             // TODO: Need separate selection ball for slice and main surface view QTRD-2515
             if (m_cachedIsSlicingActivated)
                 updateSliceDataModel(visiblePoint);
-            if (m_cachedSelectionMode.testFlag(QDataVis::SelectionItem))
+            if (m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionItem))
                 surfacePointSelected(visiblePoint);
             m_selectionActive = true;
         }
@@ -1909,13 +1909,13 @@ void Surface3DRenderer::surfacePointSelected(const QPoint &point)
 
     QVector3D pos;
     if (m_cachedIsSlicingActivated) {
-        if (m_cachedSelectionMode.testFlag(QDataVis::SelectionRow)) {
+        if (m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionRow)) {
             pos = m_sliceSurfaceObj->vertexAt(column, 0);
             pos *= QVector3D(m_surfaceScaleX, 1.0f, 0.0f);
             pos += QVector3D(m_surfaceOffsetX, 0.0f, 0.0f);
             m_selectionPointer->updateBoundingRect(m_secondarySubViewport);
             m_selectionPointer->updateSliceData(true, m_autoScaleAdjustment);
-        } else if (m_cachedSelectionMode.testFlag(QDataVis::SelectionColumn)) {
+        } else if (m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionColumn)) {
             pos = m_sliceSurfaceObj->vertexAt(row, 0);
             pos *= QVector3D(m_surfaceScaleZ, 1.0f, 0.0f);
             pos += QVector3D(-m_surfaceOffsetZ, 0.0f, 0.0f);
@@ -1994,32 +1994,32 @@ QString Surface3DRenderer::createSelectionLabel(float value, int column, int row
     return labelText;
 }
 
-void Surface3DRenderer::updateShadowQuality(QDataVis::ShadowQuality quality)
+void Surface3DRenderer::updateShadowQuality(QAbstract3DGraph::ShadowQuality quality)
 {
     m_cachedShadowQuality = quality;
 
     switch (quality) {
-    case QDataVis::ShadowQualityLow:
+    case QAbstract3DGraph::ShadowQualityLow:
         m_shadowQualityToShader = 33.3f;
         m_shadowQualityMultiplier = 1;
         break;
-    case QDataVis::ShadowQualityMedium:
+    case QAbstract3DGraph::ShadowQualityMedium:
         m_shadowQualityToShader = 100.0f;
         m_shadowQualityMultiplier = 3;
         break;
-    case QDataVis::ShadowQualityHigh:
+    case QAbstract3DGraph::ShadowQualityHigh:
         m_shadowQualityToShader = 200.0f;
         m_shadowQualityMultiplier = 5;
         break;
-    case QDataVis::ShadowQualitySoftLow:
+    case QAbstract3DGraph::ShadowQualitySoftLow:
         m_shadowQualityToShader = 5.0f;
         m_shadowQualityMultiplier = 1;
         break;
-    case QDataVis::ShadowQualitySoftMedium:
+    case QAbstract3DGraph::ShadowQualitySoftMedium:
         m_shadowQualityToShader = 10.0f;
         m_shadowQualityMultiplier = 3;
         break;
-    case QDataVis::ShadowQualitySoftHigh:
+    case QAbstract3DGraph::ShadowQualitySoftHigh:
         m_shadowQualityToShader = 15.0f;
         m_shadowQualityMultiplier = 4;
         break;
@@ -2076,7 +2076,7 @@ void Surface3DRenderer::initShaders(const QString &vertexShader, const QString &
         delete m_surfaceShader;
 #if !defined(QT_OPENGL_ES_2)
     if (!m_cachedFlatShading) {
-        if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+        if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
             m_surfaceShader = new ShaderHelper(this, QStringLiteral(":/shaders/vertexShadow"),
                                                QStringLiteral(":/shaders/fragmentSurfaceShadowNoTex"));
         } else {
@@ -2084,7 +2084,7 @@ void Surface3DRenderer::initShaders(const QString &vertexShader, const QString &
                                                QStringLiteral(":/shaders/fragmentSurface"));
         }
     } else {
-        if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+        if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
             m_surfaceShader = new ShaderHelper(this, QStringLiteral(":/shaders/vertexSurfaceShadowFlat"),
                                                QStringLiteral(":/shaders/fragmentSurfaceShadowFlat"));
         } else {
@@ -2162,7 +2162,7 @@ void Surface3DRenderer::updateDepthBuffer()
     if (m_primarySubViewport.size().isEmpty())
         return;
 
-    if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+    if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
         m_depthTexture = m_textureHelper->createDepthTextureFrameBuffer(m_primarySubViewport.size(),
                                                                         m_depthFrameBuffer,
                                                                         m_shadowQualityMultiplier);
@@ -2188,4 +2188,4 @@ void Surface3DRenderer::generateUniformGradient(const QVector3D newColor)
     }
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/surface3drenderer_p.h b/src/datavisualization/engine/surface3drenderer_p.h
index 71e02db5..10c2c723 100644
--- a/src/datavisualization/engine/surface3drenderer_p.h
+++ b/src/datavisualization/engine/surface3drenderer_p.h
@@ -43,7 +43,7 @@
 
 class QOpenGLShaderProgram;
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class ShaderHelper;
 class ObjectHelper;
@@ -152,7 +152,7 @@ signals:
 
 private:
     void updateSliceDataModel(const QPoint &point);
-    void updateShadowQuality(QDataVis::ShadowQuality quality);
+    void updateShadowQuality(QAbstract3DGraph::ShadowQuality quality);
     void updateTextures();
     void initShaders(const QString &vertexShader, const QString &fragmentShader);
     QRect calculateSampleRect(const QSurfaceDataArray &array);
@@ -184,6 +184,6 @@ private:
     Q_DISABLE_COPY(Surface3DRenderer)
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif // SURFACE3DRENDERER_P_H
author	Tomi Korpipää <tomi.korpipaa@digia.com>	2014-01-15 11:34:59 +0200
committer	Tomi Korpipää <tomi.korpipaa@digia.com>	2014-01-15 11:36:17 +0200
commit	64d6b482bfb9dbacd548b72cb9c073513f6aa56f (patch)
tree	6adea7f584f31d2b650379a4dba9ff6d7de527e3 /src/datavisualization/engine
parent	ca8eb71e320d08071f0f43393da3bb3fabf56da7 (diff)