Enums moved to a class to be usable from QML and C++

Task-number: QTRD-2126

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

67 files changed, 737 insertions, 883 deletions

diff --git a/examples/barchart/main.cpp b/examples/barchart/main.cpp
index 9cad6c2f..77230b5d 100644
--- a/examples/barchart/main.cpp
+++ b/examples/barchart/main.cpp
@@ -82,15 +82,15 @@ ChartDataGenerator::ChartDataGenerator(Q3DBars *barchart, QTableWidget *tableWid
 
     // Set bar type to smooth bar
 #ifndef CYCLE_THROUGH_STYLES
-    m_chart->setBarType(Pyramids, false);
+    m_chart->setBarType(QDataVis::Pyramids, false);
 #endif
 
 #ifndef USE_STATIC_DATA
     // Set selection mode to full
-    m_chart->setSelectionMode(ModeItemRowAndColumn);
+    m_chart->setSelectionMode(QDataVis::ModeItemRowAndColumn);
 #else
     // Set selection mode to zoom row
-    m_chart->setSelectionMode(ModeZoomRow);
+    m_chart->setSelectionMode(QDataVis::ModeZoomRow);
     m_chart->setFont(QFont("Courier", 25));
 #endif
 
@@ -98,11 +98,11 @@ ChartDataGenerator::ChartDataGenerator(Q3DBars *barchart, QTableWidget *tableWid
     // Set bar colors
     m_chart->setBarColor(QColor(Qt::gray), QColor(Qt::red), QColor(Qt::darkBlue));
 #else
-    m_chart->setLabelTransparency(TransparencyNone);
+    m_chart->setLabelTransparency(QDataVis::TransparencyNone);
 #endif
 
     // Set preset camera position
-    m_chart->setCameraPreset(PresetFront);
+    m_chart->setCameraPreset(QDataVis::PresetFront);
 }
 
 ChartDataGenerator::~ChartDataGenerator()
@@ -221,28 +221,28 @@ void ChartDataGenerator::changeStyle()
     static int model = 0;
     switch (model) {
     case 0:
-        m_chart->setBarType(Cylinders, false);
+        m_chart->setBarType(QDataVis::Cylinders, false);
         break;
     case 1:
-        m_chart->setBarType(Cylinders, true);
+        m_chart->setBarType(QDataVis::Cylinders, true);
         break;
     case 2:
-        m_chart->setBarType(Cones, false);
+        m_chart->setBarType(QDataVis::Cones, false);
         break;
     case 3:
-        m_chart->setBarType(Cones, true);
+        m_chart->setBarType(QDataVis::Cones, true);
         break;
     case 4:
-        m_chart->setBarType(Bars, false);
+        m_chart->setBarType(QDataVis::Bars, false);
         break;
     case 5:
-        m_chart->setBarType(Bars, true);
+        m_chart->setBarType(QDataVis::Bars, true);
         break;
     case 6:
-        m_chart->setBarType(Pyramids, false);
+        m_chart->setBarType(QDataVis::Pyramids, false);
         break;
     case 7:
-        m_chart->setBarType(Pyramids, true);
+        m_chart->setBarType(QDataVis::Pyramids, true);
         break;
     }
     model++;
@@ -254,9 +254,9 @@ void ChartDataGenerator::changePresetCamera()
 {
     static int preset = 0;
 
-    m_chart->setCameraPreset((CameraPreset)preset);
+    m_chart->setCameraPreset((QDataVis::CameraPreset)preset);
 
-    if (++preset > (int)PresetDirectlyAboveCCW45)
+    if (++preset > (int)QDataVis::PresetDirectlyAboveCCW45)
         preset = 0;
 }
 
@@ -264,9 +264,9 @@ void ChartDataGenerator::changeTheme()
 {
     static int theme = 0;
 
-    m_chart->setTheme((ColorTheme)theme);
+    m_chart->setTheme((QDataVis::ColorTheme)theme);
 
-    if (++theme > (int)ThemeLight)
+    if (++theme > (int)QDataVis::ThemeLight)
         theme = 0;
 }
 
diff --git a/examples/mapdata/mapdata.cpp b/examples/mapdata/mapdata.cpp
index 18843a5a..6f0157da 100644
--- a/examples/mapdata/mapdata.cpp
+++ b/examples/mapdata/mapdata.cpp
@@ -216,40 +216,40 @@ void MapsModifier::changeStyle()
     static int model = 0;
     switch (model) {
     case 0:
-        m_chart->setBarType(Cylinders, false);
+        m_chart->setBarType(QDataVis::Cylinders, false);
         break;
     case 1:
-        m_chart->setBarType(Cylinders, true);
+        m_chart->setBarType(QDataVis::Cylinders, true);
         break;
     case 2:
-        m_chart->setBarType(Cones, false);
+        m_chart->setBarType(QDataVis::Cones, false);
         break;
     case 3:
-        m_chart->setBarType(Cones, true);
+        m_chart->setBarType(QDataVis::Cones, true);
         break;
     case 4:
-        m_chart->setBarType(Bars, false);
+        m_chart->setBarType(QDataVis::Bars, false);
         break;
     case 5:
-        m_chart->setBarType(Bars, true);
+        m_chart->setBarType(QDataVis::Bars, true);
         break;
     case 6:
-        m_chart->setBarType(Pyramids, false);
+        m_chart->setBarType(QDataVis::Pyramids, false);
         break;
     case 7:
-        m_chart->setBarType(Pyramids, true);
+        m_chart->setBarType(QDataVis::Pyramids, true);
         break;
     case 8:
-        m_chart->setBarType(BevelBars, false);
+        m_chart->setBarType(QDataVis::BevelBars, false);
         break;
     case 9:
-        m_chart->setBarType(BevelBars, true);
+        m_chart->setBarType(QDataVis::BevelBars, true);
         break;
     case 10:
-        m_chart->setBarType(Spheres, false);
+        m_chart->setBarType(QDataVis::Spheres, false);
         break;
     case 11:
-        m_chart->setBarType(Spheres, true);
+        m_chart->setBarType(QDataVis::Spheres, true);
         break;
     }
     model++;
@@ -259,32 +259,32 @@ void MapsModifier::changeStyle()
 
 void MapsModifier::changePresetCamera()
 {
-    static int preset = PresetFrontLow;
+    static int preset = QDataVis::PresetFrontLow;
 
-    m_chart->setCameraPreset((CameraPreset)preset);
+    m_chart->setCameraPreset((QDataVis::CameraPreset)preset);
 
-    if (++preset > PresetDirectlyAboveCCW45)
-        preset = PresetFrontLow;
+    if (++preset > QDataVis::PresetDirectlyAboveCCW45)
+        preset = QDataVis::PresetFrontLow;
 }
 
 void MapsModifier::changeTheme()
 {
-    static int theme = ThemeSystem;
+    static int theme = QDataVis::ThemeSystem;
 
-    m_chart->setTheme((ColorTheme)theme);
+    m_chart->setTheme((QDataVis::ColorTheme)theme);
 
-    if (++theme > ThemeLight)
-        theme = ThemeSystem;
+    if (++theme > QDataVis::ThemeLight)
+        theme = QDataVis::ThemeSystem;
 }
 
 void MapsModifier::changeTransparency()
 {
-    static int transparency = TransparencyNone;
+    static int transparency = QDataVis::TransparencyNone;
 
-    m_chart->setLabelTransparency((LabelTransparency)transparency);
+    m_chart->setLabelTransparency((QDataVis::LabelTransparency)transparency);
 
-    if (++transparency > TransparencyNoBackground)
-        transparency = TransparencyFromTheme;
+    if (++transparency > QDataVis::TransparencyNoBackground)
+        transparency = QDataVis::TransparencyFromTheme;
 }
 
 void MapsModifier::changeValueDimension(int dimension)
@@ -308,29 +308,29 @@ void MapsModifier::changeFontSize(int fontsize)
 
 void MapsModifier::changeShadowQuality(int quality)
 {
-    ShadowQuality sq = ShadowNone;
+    QDataVis::ShadowQuality sq = QDataVis::ShadowNone;
     switch (quality) {
     case 1:
-        sq = ShadowLow;
+        sq = QDataVis::ShadowLow;
         break;
     case 2:
-        sq = ShadowMedium;
+        sq = QDataVis::ShadowMedium;
         break;
     case 3:
-        sq = ShadowHigh;
+        sq = QDataVis::ShadowHigh;
         break;
     }
-    ShadowQuality realquality = m_chart->setShadowQuality(sq);
+    QDataVis::ShadowQuality realquality = m_chart->setShadowQuality(sq);
     // Check if it setting quality was successful
     if (realquality != sq) {
         switch (realquality) {
-        case ShadowLow:
+        case QDataVis::ShadowLow:
             quality = 1;
             break;
-        case ShadowMedium:
+        case QDataVis::ShadowMedium:
             quality = 2;
             break;
-        case ShadowHigh:
+        case QDataVis::ShadowHigh:
             quality = 3;
             break;
         }
diff --git a/examples/rainfall/rainfallchart.cpp b/examples/rainfall/rainfallchart.cpp
index a7d3a46b..f7bcd82b 100644
--- a/examples/rainfall/rainfallchart.cpp
+++ b/examples/rainfall/rainfallchart.cpp
@@ -59,23 +59,23 @@ RainfallChart::RainfallChart(Q3DBars *rainfall)
     m_chart->columnAxis()->setCategoryLabels(months);
 
     // Set bar type to cylinder
-    m_chart->setBarType(Cylinders, false);
+    m_chart->setBarType(QDataVis::Cylinders, false);
 
     // Set shadows to medium
-    m_chart->setShadowQuality(ShadowMedium);
+    m_chart->setShadowQuality(QDataVis::ShadowMedium);
 
     // Set font
     m_chart->setFont(QFont("Century Gothic", 40));
 
     // Set selection mode to bar and column
     //m_chart->setSelectionMode(ModeItemAndColumn);
-    m_chart->setSelectionMode(ModeZoomColumn);
+    m_chart->setSelectionMode(QDataVis::ModeZoomColumn);
 
     // Set theme
-    m_chart->setTheme(ThemeBlueNcs);
+    m_chart->setTheme(QDataVis::ThemeBlueNcs);
 
     // Set preset camera position
-    m_chart->setCameraPreset(PresetIsometricRightHigh);
+    m_chart->setCameraPreset(QDataVis::PresetIsometricRightHigh);
 
     // Disable grid
     m_chart->setGridVisible(false);
diff --git a/examples/rainfall/variantbardatamapping.h b/examples/rainfall/variantbardatamapping.h
index db1dd828..616ee563 100644
--- a/examples/rainfall/variantbardatamapping.h
+++ b/examples/rainfall/variantbardatamapping.h
@@ -19,7 +19,7 @@
 #ifndef VARIANTBARDATAMAPPING_H
 #define VARIANTBARDATAMAPPING_H
 
-#include "qdatavis3dnamespace.h"
+#include "qdatavis3denums.h"
 #include <QStringList>
 
 using namespace QtDataVis3D;
diff --git a/examples/rainfall/variantdataset.h b/examples/rainfall/variantdataset.h
index dcb4219f..f3965978 100644
--- a/examples/rainfall/variantdataset.h
+++ b/examples/rainfall/variantdataset.h
@@ -19,7 +19,7 @@
 #ifndef VARIANTDATASET_H
 #define VARIANTDATASET_H
 
-#include "qdatavis3dnamespace.h"
+#include "qdatavis3denums.h"
 #include <QScopedPointer>
 #include <QVariantList>
 
diff --git a/examples/scatterchart/scatterchart.cpp b/examples/scatterchart/scatterchart.cpp
index 67efdb93..ac8676b5 100644
--- a/examples/scatterchart/scatterchart.cpp
+++ b/examples/scatterchart/scatterchart.cpp
@@ -31,9 +31,9 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
       m_fontSize(30.0f)
 {
     m_chart->setFontSize(m_fontSize);
-    m_chart->setObjectType(Spheres, true);
-    m_chart->setTheme(ThemeBrownSand);
-    m_chart->setShadowQuality(ShadowHigh);
+    m_chart->setObjectType(QDataVis::Spheres, true);
+    m_chart->setTheme(QDataVis::ThemeBrownSand);
+    m_chart->setShadowQuality(QDataVis::ShadowHigh);
 
     QScatterDataProxy *proxy = new QScatterDataProxy;
     m_chart->setDataProxy(proxy);
@@ -88,16 +88,16 @@ void ScatterDataModifier::changeStyle()
     static int model = 0;
     switch (model) {
     case 0:
-        m_chart->setObjectType(Dots, false);
+        m_chart->setObjectType(QDataVis::Dots, false);
         break;
     case 1:
-        m_chart->setObjectType(Dots, true);
+        m_chart->setObjectType(QDataVis::Dots, true);
         break;
     case 2:
-        m_chart->setObjectType(Spheres, false);
+        m_chart->setObjectType(QDataVis::Spheres, false);
         break;
     case 3:
-        m_chart->setObjectType(Spheres, true);
+        m_chart->setObjectType(QDataVis::Spheres, true);
         break;
     }
     model++;
@@ -107,32 +107,32 @@ void ScatterDataModifier::changeStyle()
 
 void ScatterDataModifier::changePresetCamera()
 {
-    static int preset = PresetFrontLow;
+    static int preset = QDataVis::PresetFrontLow;
 
-    m_chart->setCameraPreset((CameraPreset)preset);
+    m_chart->setCameraPreset((QDataVis::CameraPreset)preset);
 
-    if (++preset > PresetDirectlyAboveCCW45)
-        preset = PresetFrontLow;
+    if (++preset > QDataVis::PresetDirectlyAboveCCW45)
+        preset = QDataVis::PresetFrontLow;
 }
 
 void ScatterDataModifier::changeTheme()
 {
-    static int theme = ThemeSystem;
+    static int theme = QDataVis::ThemeSystem;
 
-    m_chart->setTheme((ColorTheme)theme);
+    m_chart->setTheme((QDataVis::ColorTheme)theme);
 
-    if (++theme > ThemeLight)
-        theme = ThemeSystem;
+    if (++theme > QDataVis::ThemeLight)
+        theme = QDataVis::ThemeSystem;
 }
 
 void ScatterDataModifier::changeTransparency()
 {
-    static int transparency = TransparencyNone;
+    static int transparency = QDataVis::TransparencyNone;
 
-    m_chart->setLabelTransparency((LabelTransparency)transparency);
+    m_chart->setLabelTransparency((QDataVis::LabelTransparency)transparency);
 
-    if (++transparency > TransparencyNoBackground)
-        transparency = TransparencyNone;
+    if (++transparency > QDataVis::TransparencyNoBackground)
+        transparency = QDataVis::TransparencyNone;
 }
 
 void ScatterDataModifier::changeFont(const QFont &font)
@@ -148,17 +148,17 @@ void ScatterDataModifier::changeFontSize(int fontsize)
     m_chart->setFontSize((GLfloat)m_fontSize);
 }
 
-void ScatterDataModifier::shadowQualityUpdatedByVisual(ShadowQuality sq)
+void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq)
 {
     int quality = 0;
     switch (sq) {
-    case ShadowLow:
+    case QDataVis::ShadowLow:
         quality = 1;
         break;
-    case ShadowMedium:
+    case QDataVis::ShadowMedium:
         quality = 2;
         break;
-    case ShadowHigh:
+    case QDataVis::ShadowHigh:
         quality = 3;
         break;
     }
@@ -290,16 +290,16 @@ void ScatterDataModifier::startStopTimer()
 
 void ScatterDataModifier::changeShadowQuality(int quality)
 {
-    ShadowQuality sq = ShadowNone;
+    QDataVis::ShadowQuality sq = QDataVis::ShadowNone;
     switch (quality) {
     case 1:
-        sq = ShadowLow;
+        sq = QDataVis::ShadowLow;
         break;
     case 2:
-        sq = ShadowMedium;
+        sq = QDataVis::ShadowMedium;
         break;
     case 3:
-        sq = ShadowHigh;
+        sq = QDataVis::ShadowHigh;
         break;
     }
     m_chart->setShadowQuality(sq);
diff --git a/examples/scatterchart/scatterchart.h b/examples/scatterchart/scatterchart.h
index ee9f7760..8500ef29 100644
--- a/examples/scatterchart/scatterchart.h
+++ b/examples/scatterchart/scatterchart.h
@@ -47,7 +47,7 @@ public:
 
 public slots:
     void changeShadowQuality(int quality);
-    void shadowQualityUpdatedByVisual(ShadowQuality shadowQuality);
+    void shadowQualityUpdatedByVisual(QDataVis::ShadowQuality shadowQuality);
     void clear();
     void addOne();
     void addBunch();
diff --git a/examples/spectrum/spectrumapp/main.cpp b/examples/spectrum/spectrumapp/main.cpp
index c6502edb..d0333e75 100644
--- a/examples/spectrum/spectrumapp/main.cpp
+++ b/examples/spectrum/spectrumapp/main.cpp
@@ -74,13 +74,13 @@ MainApp::MainApp(Q3DBars *window)
     m_chart->valueAxis()->setSegmentCount(0);
     m_chart->valueAxis()->setRange(0.0, 1.0);
     // Disable shadows
-    m_chart->setShadowQuality(ShadowNone);
+    m_chart->setShadowQuality(QDataVis::ShadowNone);
 #if USE_CONES
     // Set bar specifications; make them a bit wider than deep and make them be drawn 75%
     // inside each other
     m_chart->setBarSpecs(QSizeF(1.0f, 0.75f), QSizeF(0.2f, -0.75f));
     // Set bar type, smooth cones
-    m_chart->setBarType(Cones, true);
+    m_chart->setBarType(QDataVis::Cones, true);
     // Adjust zoom manually; automatic zoom level calculation does not work well with negative
     // spacings (in setBarSpecs)
     m_chart->setCameraPosition(10.0f, 5.0f, 70);
@@ -88,14 +88,14 @@ MainApp::MainApp(Q3DBars *window)
     // Set bar specifications; make them twice as wide as they're deep
     m_chart->setBarSpecs(QSizeF(1.0f, 0.5f), QSizeF(0.0f, 0.0f));
     // Set bar type, flat bars
-    m_chart->setBarType(Bars, false);
+    m_chart->setBarType(QDataVis::Bars, false);
     // Adjust camera position
     m_chart->setCameraPosition(10.0f, 7.5f, 75);
 #endif
     // Set color scheme
     m_chart->setBarColor(QColor(Qt::black), QColor(Qt::red), QColor(Qt::darkYellow));
     // Disable selection
-    m_chart->setSelectionMode(ModeNone);
+    m_chart->setSelectionMode(QDataVis::ModeNone);
     QObject::connect(m_engine, &Engine::changedSpectrum, this, &MainApp::spectrumChanged);
     QObject::connect(m_engine, &Engine::stateChanged, this, &MainApp::stateChanged);
     m_restartTimer->setSingleShot(true);
diff --git a/examples/widget/chart.cpp b/examples/widget/chart.cpp
index d48e309b..a8c6c14a 100644
--- a/examples/widget/chart.cpp
+++ b/examples/widget/chart.cpp
@@ -77,14 +77,14 @@ void ChartModifier::restart(bool dynamicData)
     if (m_static) {
         start();
         // Set selection mode to zoom row
-        m_chart->setSelectionMode(ModeZoomRow);
+        m_chart->setSelectionMode(QDataVis::ModeZoomRow);
         m_chart->setFont(QFont("Times Roman", 20));
     } else {
         m_chart->dataProxy()->resetArray(0);
         // Set up sample space
         m_chart->setupSampleSpace(m_rowCount, m_columnCount);
         // Set selection mode to full
-        m_chart->setSelectionMode(ModeItemRowAndColumn);
+        m_chart->setSelectionMode(QDataVis::ModeItemRowAndColumn);
         m_chart->valueAxis()->setSegmentCount(m_segments * 2);
         m_chart->valueAxis()->setSubSegmentCount(0);
         m_chart->valueAxis()->setAutoAdjustRange(true);
@@ -251,34 +251,34 @@ void ChartModifier::changeStyle()
     static int model = 0;
     switch (model) {
     case 0:
-        m_chart->setBarType(Cylinders, false);
+        m_chart->setBarType(QDataVis::Cylinders, false);
         break;
     case 1:
-        m_chart->setBarType(Cylinders, true);
+        m_chart->setBarType(QDataVis::Cylinders, true);
         break;
     case 2:
-        m_chart->setBarType(Cones, false);
+        m_chart->setBarType(QDataVis::Cones, false);
         break;
     case 3:
-        m_chart->setBarType(Cones, true);
+        m_chart->setBarType(QDataVis::Cones, true);
         break;
     case 4:
-        m_chart->setBarType(Bars, false);
+        m_chart->setBarType(QDataVis::Bars, false);
         break;
     case 5:
-        m_chart->setBarType(Bars, true);
+        m_chart->setBarType(QDataVis::Bars, true);
         break;
     case 6:
-        m_chart->setBarType(Pyramids, false);
+        m_chart->setBarType(QDataVis::Pyramids, false);
         break;
     case 7:
-        m_chart->setBarType(Pyramids, true);
+        m_chart->setBarType(QDataVis::Pyramids, true);
         break;
     case 8:
-        m_chart->setBarType(BevelBars, false);
+        m_chart->setBarType(QDataVis::BevelBars, false);
         break;
     case 9:
-        m_chart->setBarType(BevelBars, true);
+        m_chart->setBarType(QDataVis::BevelBars, true);
         break;
     }
     model++;
@@ -288,42 +288,42 @@ void ChartModifier::changeStyle()
 
 void ChartModifier::changePresetCamera()
 {
-    static int preset = PresetFrontLow;
+    static int preset = QDataVis::PresetFrontLow;
 
-    m_chart->setCameraPreset((CameraPreset)preset);
+    m_chart->setCameraPreset((QDataVis::CameraPreset)preset);
 
-    if (++preset > PresetDirectlyBelow)
-        preset = PresetFrontLow;
+    if (++preset > QDataVis::PresetDirectlyBelow)
+        preset = QDataVis::PresetFrontLow;
 }
 
 void ChartModifier::changeTheme()
 {
-    static int theme = ThemeSystem;
+    static int theme = QDataVis::ThemeSystem;
 
-    m_chart->setTheme((ColorTheme)theme);
+    m_chart->setTheme((QDataVis::ColorTheme)theme);
 
-    if (++theme > ThemeLight)
-        theme = ThemeSystem;
+    if (++theme > QDataVis::ThemeLight)
+        theme = QDataVis::ThemeSystem;
 }
 
 void ChartModifier::changeTransparency()
 {
-    static int transparency = TransparencyNone;
+    static int transparency = QDataVis::TransparencyNone;
 
-    m_chart->setLabelTransparency((LabelTransparency)transparency);
+    m_chart->setLabelTransparency((QDataVis::LabelTransparency)transparency);
 
-    if (++transparency > TransparencyNoBackground)
-        transparency = TransparencyFromTheme;
+    if (++transparency > QDataVis::TransparencyNoBackground)
+        transparency = QDataVis::TransparencyFromTheme;
 }
 
 void ChartModifier::changeSelectionMode()
 {
-    static int selectionMode = ModeNone;
+    static int selectionMode = QDataVis::ModeNone;
 
-    m_chart->setSelectionMode((SelectionMode)selectionMode);
+    m_chart->setSelectionMode((QDataVis::SelectionMode)selectionMode);
 
-    if (++selectionMode > ModeZoomColumn)
-        selectionMode = ModeNone;
+    if (++selectionMode > QDataVis::ModeZoomColumn)
+        selectionMode = QDataVis::ModeNone;
 }
 
 void ChartModifier::changeFont(const QFont &font)
@@ -340,17 +340,17 @@ void ChartModifier::changeFontSize(int fontsize)
     m_chart->setFontSize((GLfloat)m_fontSize);
 }
 
-void ChartModifier::shadowQualityUpdatedByVisual(ShadowQuality sq)
+void ChartModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq)
 {
     int quality = 0;
     switch (sq) {
-    case ShadowLow:
+    case QDataVis::ShadowLow:
         quality = 1;
         break;
-    case ShadowMedium:
+    case QDataVis::ShadowMedium:
         quality = 2;
         break;
-    case ShadowHigh:
+    case QDataVis::ShadowHigh:
         quality = 3;
         break;
     }
@@ -361,16 +361,16 @@ void ChartModifier::shadowQualityUpdatedByVisual(ShadowQuality sq)
 
 void ChartModifier::changeShadowQuality(int quality)
 {
-    ShadowQuality sq = ShadowNone;
+    QDataVis::ShadowQuality sq = QDataVis::ShadowNone;
     switch (quality) {
     case 1:
-        sq = ShadowLow;
+        sq = QDataVis::ShadowLow;
         break;
     case 2:
-        sq = ShadowMedium;
+        sq = QDataVis::ShadowMedium;
         break;
     case 3:
-        sq = ShadowHigh;
+        sq = QDataVis::ShadowHigh;
         break;
     }
     m_chart->setShadowQuality(sq);
diff --git a/examples/widget/chart.h b/examples/widget/chart.h
index c27cb39b..67280e13 100644
--- a/examples/widget/chart.h
+++ b/examples/widget/chart.h
@@ -64,7 +64,7 @@ public:
 
 public slots:
     void changeShadowQuality(int quality);
-    void shadowQualityUpdatedByVisual(ShadowQuality shadowQuality);
+    void shadowQualityUpdatedByVisual(QDataVis::ShadowQuality shadowQuality);
 
 signals:
     void shadowQualityChanged(int quality);
diff --git a/src/datavis3d/axis/qabstractaxis.h b/src/datavis3d/axis/qabstractaxis.h
index be371a5b..4bc0ac16 100644
--- a/src/datavis3d/axis/qabstractaxis.h
+++ b/src/datavis3d/axis/qabstractaxis.h
@@ -19,7 +19,7 @@
 #ifndef QABSTRACTAXIS_H
 #define QABSTRACTAXIS_H
 
-#include <QtDataVis3D/qdatavis3dnamespace.h>
+#include <QtDataVis3D/qdatavis3denums.h>
 #include <QObject>
 #include <QScopedPointer>
 #include <QVector>
diff --git a/src/datavis3d/data/qabstractdataproxy.h b/src/datavis3d/data/qabstractdataproxy.h
index dbb06c7b..0e717dbb 100644
--- a/src/datavis3d/data/qabstractdataproxy.h
+++ b/src/datavis3d/data/qabstractdataproxy.h
@@ -19,7 +19,7 @@
 #ifndef QABSTRACTDATAPROXY_H
 #define QABSTRACTDATAPROXY_H
 
-#include <QtDataVis3D/qdatavis3dnamespace.h>
+#include <QtDataVis3D/qdatavis3denums.h>
 #include <QObject>
 #include <QScopedPointer>
 
diff --git a/src/datavis3d/data/qbardataitem.h b/src/datavis3d/data/qbardataitem.h
index dbc9ade8..d7062b66 100644
--- a/src/datavis3d/data/qbardataitem.h
+++ b/src/datavis3d/data/qbardataitem.h
@@ -19,7 +19,7 @@
 #ifndef QBARDATAITEM_H
 #define QBARDATAITEM_H
 
-#include <QtDataVis3D/qdatavis3dnamespace.h>
+#include <QtDataVis3D/qdatavis3denums.h>
 
 QT_DATAVIS3D_BEGIN_NAMESPACE
 
diff --git a/src/datavis3d/data/qitemmodelbardatamapping.h b/src/datavis3d/data/qitemmodelbardatamapping.h
index 1b4063b6..d9f74152 100644
--- a/src/datavis3d/data/qitemmodelbardatamapping.h
+++ b/src/datavis3d/data/qitemmodelbardatamapping.h
@@ -19,7 +19,7 @@
 #ifndef QITEMMODELBARDATAMAPPING_H
 #define QITEMMODELBARDATAMAPPING_H
 
-#include <QtDataVis3D/qdatavis3dnamespace.h>
+#include <QtDataVis3D/qdatavis3denums.h>
 #include <QStringList>
 
 QT_DATAVIS3D_BEGIN_NAMESPACE
diff --git a/src/datavis3d/data/qitemmodelmapdatamapping.h b/src/datavis3d/data/qitemmodelmapdatamapping.h
index e818ef65..79080a65 100644
--- a/src/datavis3d/data/qitemmodelmapdatamapping.h
+++ b/src/datavis3d/data/qitemmodelmapdatamapping.h
@@ -19,7 +19,7 @@
 #ifndef QITEMMODELMAPDATAMAPPING_H
 #define QITEMMODELMAPDATAMAPPING_H
 
-#include <QtDataVis3D/qdatavis3dnamespace.h>
+#include <QtDataVis3D/qdatavis3denums.h>
 #include <QStringList>
 
 QT_DATAVIS3D_BEGIN_NAMESPACE
diff --git a/src/datavis3d/data/qitemmodelscatterdatamapping.h b/src/datavis3d/data/qitemmodelscatterdatamapping.h
index d887b538..f4a2cfe6 100644
--- a/src/datavis3d/data/qitemmodelscatterdatamapping.h
+++ b/src/datavis3d/data/qitemmodelscatterdatamapping.h
@@ -19,7 +19,7 @@
 #ifndef QITEMMODELSCATTERDATAMAPPING_H
 #define QITEMMODELSCATTERDATAMAPPING_H
 
-#include <QtDataVis3D/qdatavis3dnamespace.h>
+#include <QtDataVis3D/qdatavis3denums.h>
 #include <QObject>
 
 QT_DATAVIS3D_BEGIN_NAMESPACE
diff --git a/src/datavis3d/data/qmapdataitem.h b/src/datavis3d/data/qmapdataitem.h
index d6ed24aa..240b03dd 100644
--- a/src/datavis3d/data/qmapdataitem.h
+++ b/src/datavis3d/data/qmapdataitem.h
@@ -19,7 +19,7 @@
 #ifndef QMAPDATAITEM_H
 #define QMAPDATAITEM_H
 
-#include <QtDataVis3D/qdatavis3dnamespace.h>
+#include <QtDataVis3D/qdatavis3denums.h>
 #include <QtDataVis3D/qbardataitem.h>
 #include <QPointF>
 
diff --git a/src/datavis3d/data/qscatterdataitem.h b/src/datavis3d/data/qscatterdataitem.h
index c878e82a..82383ae6 100644
--- a/src/datavis3d/data/qscatterdataitem.h
+++ b/src/datavis3d/data/qscatterdataitem.h
@@ -19,7 +19,7 @@
 #ifndef QSCATTERDATAITEM_H
 #define QSCATTERDATAITEM_H
 
-#include <QtDataVis3D/qdatavis3dnamespace.h>
+#include <QtDataVis3D/qdatavis3denums.h>
 #include <QVector3D>
 
 QT_DATAVIS3D_BEGIN_NAMESPACE
diff --git a/src/datavis3d/engine/abstract3dcontroller.cpp b/src/datavis3d/engine/abstract3dcontroller.cpp
index 619f39b6..81fd8537 100644
--- a/src/datavis3d/engine/abstract3dcontroller.cpp
+++ b/src/datavis3d/engine/abstract3dcontroller.cpp
@@ -30,15 +30,15 @@ Abstract3DController::Abstract3DController(QRect boundRect, QObject *parent) :
     m_verticalRotation(15.0f),
     m_theme(),
     m_font(QFont(QStringLiteral("Arial"))),
-    m_shadowQuality(ShadowLow),
-    m_labelTransparency(TransparencyFromTheme),
+    m_shadowQuality(QDataVis::ShadowLow),
+    m_labelTransparency(QDataVis::TransparencyFromTheme),
     m_cameraHelper(new CameraHelper()),
     m_zoomLevel(100),
     m_axisX(0),
     m_axisY(0),
     m_axisZ(0)
 {
-    m_theme.useColorTheme(ThemeSystem);
+    m_theme.useColorTheme(QDataVis::ThemeSystem);
 }
 
 Abstract3DController::~Abstract3DController()
@@ -161,7 +161,7 @@ void Abstract3DController::setZoomLevel(int zoomLevel)
     emit zoomLevelChanged(zoomLevel);
 }
 
-void Abstract3DController::setCameraPreset(CameraPreset preset)
+void Abstract3DController::setCameraPreset(QDataVis::CameraPreset preset)
 {
     m_cameraHelper->setCameraPreset(preset);
 }
@@ -187,7 +187,7 @@ void Abstract3DController::setObjectColor(QColor baseColor, QColor heightColor,
     emit themeChanged(m_theme);
 }
 
-void Abstract3DController::setColorTheme(ColorTheme colorTheme)
+void Abstract3DController::setColorTheme(QDataVis::ColorTheme colorTheme)
 {
     m_theme.useColorTheme(colorTheme);
     emit themeChanged(m_theme);
@@ -221,25 +221,25 @@ QFont Abstract3DController::font()
 }
 
 
-void Abstract3DController::setShadowQuality(ShadowQuality quality)
+void Abstract3DController::setShadowQuality(QDataVis::ShadowQuality quality)
 {
     m_shadowQuality = quality;
     emit shadowQualityChanged(m_shadowQuality);
 }
 
-ShadowQuality Abstract3DController::shadowQuality()
+QDataVis::ShadowQuality Abstract3DController::shadowQuality()
 {
     return m_shadowQuality;
 }
 
 
-void Abstract3DController::setLabelTransparency(LabelTransparency transparency)
+void Abstract3DController::setLabelTransparency(QDataVis::LabelTransparency transparency)
 {
     m_labelTransparency = transparency;
     emit labelTransparencyUpdated(m_labelTransparency);
 }
 
-LabelTransparency Abstract3DController::labelTransparency()
+QDataVis::LabelTransparency Abstract3DController::labelTransparency()
 {
     return m_labelTransparency;
 }
diff --git a/src/datavis3d/engine/abstract3dcontroller_p.h b/src/datavis3d/engine/abstract3dcontroller_p.h
index c89d7f60..c5f8da7c 100644
--- a/src/datavis3d/engine/abstract3dcontroller_p.h
+++ b/src/datavis3d/engine/abstract3dcontroller_p.h
@@ -62,8 +62,8 @@ private:
     GLfloat m_verticalRotation;
     Theme m_theme;
     QFont m_font;
-    ShadowQuality m_shadowQuality;
-    LabelTransparency m_labelTransparency;
+    QDataVis::ShadowQuality m_shadowQuality;
+    QDataVis::LabelTransparency m_labelTransparency;
 
 protected:
     CameraHelper *m_cameraHelper;
@@ -103,7 +103,7 @@ public:
     virtual void setZoomLevel(int zoomLevel);
 
     // Select preset camera placement
-    virtual void setCameraPreset(CameraPreset preset);
+    virtual void setCameraPreset(QDataVis::CameraPreset preset);
 
     // Set camera rotation if you don't want to use the presets (in horizontal (-180...180) and
     // vertical (0...90) (or (-90...90) if there are negative values) angles and distance in
@@ -117,7 +117,7 @@ public:
 
     // Set theme (bar colors, shaders, window color, background colors, light intensity and text
     // colors are affected)
-    virtual void setColorTheme(ColorTheme colorTheme);
+    virtual void setColorTheme(QDataVis::ColorTheme colorTheme);
     virtual Theme theme();
 
     // Font size adjustment
@@ -130,12 +130,12 @@ public:
 
 
     // Adjust shadow quality
-    virtual void setShadowQuality(ShadowQuality quality);
-    virtual ShadowQuality shadowQuality();
+    virtual void setShadowQuality(QDataVis::ShadowQuality quality);
+    virtual QDataVis::ShadowQuality shadowQuality();
 
     // Label transparency adjustment
-    virtual void setLabelTransparency(LabelTransparency transparency);
-    virtual LabelTransparency labelTransparency();
+    virtual void setLabelTransparency(QDataVis::LabelTransparency transparency);
+    virtual QDataVis::LabelTransparency labelTransparency();
 
 public slots:
     virtual void handleAxisTitleChanged(const QString &title);
@@ -152,8 +152,8 @@ signals:
     void zoomLevelChanged(int zoomLevel);
     void themeChanged(Theme theme);
     void fontChanged(QFont font); // TODO should be handled via axis?? What about font for selection label?
-    void shadowQualityChanged(ShadowQuality quality);
-    void labelTransparencyUpdated(LabelTransparency transparency);
+    void shadowQualityChanged(QDataVis::ShadowQuality quality);
+    void labelTransparencyUpdated(QDataVis::LabelTransparency transparency);
     void axisTypeChanged(QAbstractAxis::AxisOrientation orientation, QAbstractAxis::AxisType type);
     void axisTitleChanged(QAbstractAxis::AxisOrientation orientation, QString title);
     void axisLabelsChanged(QAbstractAxis::AxisOrientation orientation, QStringList labels);
diff --git a/src/datavis3d/engine/abstract3drenderer.cpp b/src/datavis3d/engine/abstract3drenderer.cpp
index caa0fc99..097b85ff 100644
--- a/src/datavis3d/engine/abstract3drenderer.cpp
+++ b/src/datavis3d/engine/abstract3drenderer.cpp
@@ -98,7 +98,7 @@ void Abstract3DRenderer::updateTheme(Theme theme)
 void Abstract3DRenderer::handleShadowQualityChange()
 {
 #if !defined(QT_OPENGL_ES_2)
-    if (m_cachedShadowQuality > ShadowNone) {
+    if (m_cachedShadowQuality > QDataVis::ShadowNone) {
         if (!m_cachedTheme.m_uniformColor) {
             initShaders(QStringLiteral(":/shaders/vertexShadow"),
                         QStringLiteral(":/shaders/fragmentShadowNoTexColorOnY"));
@@ -138,7 +138,7 @@ void Abstract3DRenderer::updateFont(const QFont &font)
     m_drawer->setFont(font);
 }
 
-void Abstract3DRenderer::updateLabelTransparency(LabelTransparency transparency)
+void Abstract3DRenderer::updateLabelTransparency(QDataVis::LabelTransparency transparency)
 {
     m_cachedLabelTransparency = transparency;
     m_drawer->setTransparency(transparency);
diff --git a/src/datavis3d/engine/abstract3drenderer_p.h b/src/datavis3d/engine/abstract3drenderer_p.h
index 8be3b0cf..c7c90c90 100644
--- a/src/datavis3d/engine/abstract3drenderer_p.h
+++ b/src/datavis3d/engine/abstract3drenderer_p.h
@@ -45,10 +45,10 @@ protected:
 
     bool m_hasNegativeValues;
     QRect m_cachedBoundingRect;
-    ShadowQuality m_cachedShadowQuality;
+    QDataVis::ShadowQuality m_cachedShadowQuality;
     Theme m_cachedTheme;
     QFont m_cachedFont;
-    LabelTransparency m_cachedLabelTransparency;
+    QDataVis::LabelTransparency m_cachedLabelTransparency;
     Drawer *m_drawer;
     GLfloat m_autoScaleAdjustment;
 
@@ -66,7 +66,7 @@ protected:
 
     virtual void updateTheme(Theme theme);
     virtual void updateFont(const QFont &font);
-    virtual void updateLabelTransparency(LabelTransparency transparency);
+    virtual void updateLabelTransparency(QDataVis::LabelTransparency transparency);
 
     virtual void handleShadowQualityChange();
 
@@ -74,7 +74,7 @@ protected:
     virtual void updateTextures()=0;
     virtual void initSelectionBuffer()=0;
     virtual void updateDepthBuffer()=0;
-    virtual void updateShadowQuality(ShadowQuality quality)=0;
+    virtual void updateShadowQuality(QDataVis::ShadowQuality quality)=0;
     virtual void initShaders(const QString &vertexShader, const QString &fragmentShader)=0;
     virtual void initBackgroundShaders(const QString &vertexShader, const QString &fragmentShader)=0;
     virtual void updateAxisType(QAbstractAxis::AxisOrientation orientation, QAbstractAxis::AxisType type);
diff --git a/src/datavis3d/engine/bars3dcontroller.cpp b/src/datavis3d/engine/bars3dcontroller.cpp
index 0a48f0ed..4394c133 100644
--- a/src/datavis3d/engine/bars3dcontroller.cpp
+++ b/src/datavis3d/engine/bars3dcontroller.cpp
@@ -40,7 +40,7 @@ Bars3dController::Bars3dController(QRect boundRect)
       m_columnCount(0),
       m_mouseState(MouseNone),
       m_mousePos(QPoint(0, 0)),
-      m_selectionMode(ModeItem),
+      m_selectionMode(QDataVis::ModeItem),
       m_isSlicingActivated(false),
       m_isBarSpecRelative(true),
       m_barThickness(QSizeF(0.75f, 0.75f)),
@@ -349,29 +349,29 @@ QString Bars3dController::objFile()
     return m_objFile;
 }
 
-void Bars3dController::setBarType(MeshStyle style, bool smooth)
+void Bars3dController::setBarType(QDataVis::MeshStyle style, bool smooth)
 {
-    if (style == Bars) {
+    if (style == QDataVis::Bars) {
         if (smooth)
             m_objFile = QStringLiteral(":/defaultMeshes/barSmooth");
         else
             m_objFile = QStringLiteral(":/defaultMeshes/bar");
-    } else if (style == Pyramids) {
+    } else if (style == QDataVis::Pyramids) {
         if (smooth)
             m_objFile = QStringLiteral(":/defaultMeshes/pyramidSmooth");
         else
             m_objFile = QStringLiteral(":/defaultMeshes/pyramid");
-    } else if (style == Cones) {
+    } else if (style == QDataVis::Cones) {
         if (smooth)
             m_objFile = QStringLiteral(":/defaultMeshes/coneSmooth");
         else
             m_objFile = QStringLiteral(":/defaultMeshes/cone");
-    } else if (style == Cylinders) {
+    } else if (style == QDataVis::Cylinders) {
         if (smooth)
             m_objFile = QStringLiteral(":/defaultMeshes/cylinderSmooth");
         else
             m_objFile = QStringLiteral(":/defaultMeshes/cylinder");
-    } else if (style == BevelBars) {
+    } else if (style == QDataVis::BevelBars) {
         if (smooth)
             m_objFile = QStringLiteral(":/defaultMeshes/bevelbarSmooth");
         else
@@ -403,7 +403,7 @@ void Bars3dController::setupSampleSpace(int rowCount, int columnCount)
 }
 
 
-void Bars3dController::setSelectionMode(SelectionMode mode)
+void Bars3dController::setSelectionMode(QDataVis::SelectionMode mode)
 {
     m_selectionMode = mode;
     // Disable zoom if selection mode changes
@@ -416,7 +416,7 @@ QPoint Bars3dController::mousePosition()
     return m_mousePos;
 }
 
-SelectionMode Bars3dController::selectionMode()
+QDataVis::SelectionMode Bars3dController::selectionMode()
 {
     return m_selectionMode;
 }
diff --git a/src/datavis3d/engine/bars3dcontroller_p.h b/src/datavis3d/engine/bars3dcontroller_p.h
index 5a533fc5..f87ab866 100644
--- a/src/datavis3d/engine/bars3dcontroller_p.h
+++ b/src/datavis3d/engine/bars3dcontroller_p.h
@@ -69,7 +69,7 @@ private:
     // Interaction
     MouseState m_mouseState;
     QPoint m_mousePos;
-    SelectionMode m_selectionMode;
+    QDataVis::SelectionMode m_selectionMode;
     bool m_isSlicingActivated;
 
     bool m_isBarSpecRelative;
@@ -114,7 +114,7 @@ public:
     bool isBarSpecRelative();
 
     // bar type; bars (=cubes), pyramids, cones, cylinders, etc.
-    void setBarType(MeshStyle style, bool smooth = false);
+    void setBarType(QDataVis::MeshStyle style, bool smooth = false);
     QString objFile();
 
     // override bar type with own mesh
@@ -126,8 +126,8 @@ public:
     // TODO: light placement API
 
     // Change selection mode; single bar, bar and row, bar and column, or all
-    void setSelectionMode(SelectionMode mode);
-    SelectionMode selectionMode();
+    void setSelectionMode(QDataVis::SelectionMode mode);
+    QDataVis::SelectionMode selectionMode();
 
 
     // Enable or disable background grid
@@ -162,7 +162,7 @@ public slots:
     virtual void handleAxisAutoAdjustRangeChanged(bool autoAdjust);
 
 signals:
-    void selectionModeChanged(SelectionMode mode);
+    void selectionModeChanged(QDataVis::SelectionMode mode);
     void slicingActiveChanged(bool isSlicing);
     void sampleSpaceChanged(int samplesRow, int samplesColumn);
     void barSpecsChanged(QSizeF thickness, QSizeF spacing, bool relative);
diff --git a/src/datavis3d/engine/bars3drenderer.cpp b/src/datavis3d/engine/bars3drenderer.cpp
index 140cb4de..22409b23 100644
--- a/src/datavis3d/engine/bars3drenderer.cpp
+++ b/src/datavis3d/engine/bars3drenderer.cpp
@@ -339,7 +339,7 @@ void Bars3dRenderer::drawSlicedScene(CameraHelper *camera,
     // Set light position a bit below the camera to reduce glare (depends on do we have row or column zoom)
     QVector3D sliceLightPos = defaultLightPos;
     sliceLightPos.setY(-10.0f);
-    if (ModeZoomColumn == m_cachedSelectionMode)
+    if (QDataVis::ModeZoomColumn == m_cachedSelectionMode)
         lightPos = camera->calculateLightPosition(sliceLightPos, -85.0f);
     else
         lightPos = camera->calculateLightPosition(sliceLightPos, 5.0f);
@@ -365,7 +365,7 @@ void Bars3dRenderer::drawSlicedScene(CameraHelper *camera,
         QMatrix4x4 itModelMatrix;
 
         GLfloat barPosY = item->translation().y() - m_yAdjustment / 2.0f + 0.2f; // we need some room for labels underneath; add +0.2f
-        if (ModeZoomRow == m_cachedSelectionMode)
+        if (QDataVis::ModeZoomRow == m_cachedSelectionMode)
             barPosX = item->translation().x();
         else
             barPosX = -(item->translation().z() - zComp); // flip z; frontmost bar to the left
@@ -407,7 +407,7 @@ void Bars3dRenderer::drawSlicedScene(CameraHelper *camera,
     glDisable(GL_DEPTH_TEST);
     glEnable(GL_TEXTURE_2D);
     glCullFace(GL_BACK);
-    if (m_cachedLabelTransparency > TransparencyNone) {
+    if (m_cachedLabelTransparency > QDataVis::TransparencyNone) {
         glEnable(GL_BLEND);
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     }
@@ -415,7 +415,7 @@ void Bars3dRenderer::drawSlicedScene(CameraHelper *camera,
     // Draw labels for axes
     BarRenderItem *dummyItem(0);
     const LabelItem &sliceSelectionLabel = *m_sliceTitleItem;
-    if (ModeZoomRow == m_cachedSelectionMode) {
+    if (QDataVis::ModeZoomRow == m_cachedSelectionMode) {
         if (m_sliceTitleItem) {
             m_drawer->drawLabel(*dummyItem, sliceSelectionLabel, viewMatrix, projectionMatrix,
                                 QVector3D(0.0f, m_yAdjustment, zComp),
@@ -477,7 +477,7 @@ void Bars3dRenderer::drawSlicedScene(CameraHelper *camera,
     }
 
     glDisable(GL_TEXTURE_2D);
-    if (m_cachedLabelTransparency > TransparencyNone)
+    if (m_cachedLabelTransparency > QDataVis::TransparencyNone)
         glDisable(GL_BLEND);
     glEnable(GL_DEPTH_TEST);
 
@@ -571,7 +571,7 @@ void Bars3dRenderer::drawScene(CameraHelper *camera,
     QMatrix4x4 depthProjectionMatrix;
 
 #if !defined(QT_OPENGL_ES_2)
-    if (m_cachedShadowQuality > ShadowNone/*!m_cachedIsSlicingActivated*/) {
+    if (m_cachedShadowQuality > QDataVis::ShadowNone/*!m_cachedIsSlicingActivated*/) {
         // Render scene into a depth texture for using with shadow mapping
         // Enable drawing to depth framebuffer
         glBindFramebuffer(GL_FRAMEBUFFER, m_depthFrameBuffer);
@@ -690,7 +690,7 @@ void Bars3dRenderer::drawScene(CameraHelper *camera,
 #endif
 
     // Skip selection mode drawing if we're slicing or have no selection mode
-    if (!m_cachedIsSlicingActivated && m_cachedSelectionMode > ModeNone) {
+    if (!m_cachedIsSlicingActivated && m_cachedSelectionMode > QDataVis::ModeNone) {
         // Bind selection shader
         m_selectionShader->bind();
 
@@ -847,7 +847,7 @@ void Bars3dRenderer::drawScene(CameraHelper *camera,
 
             GLfloat lightStrength = m_cachedTheme.m_lightStrength;
 
-            if (m_cachedSelectionMode > ModeNone) {
+            if (m_cachedSelectionMode > QDataVis::ModeNone) {
                Bars3dController::SelectionType selectionType = isSelected(row, bar);
 
                 switch (selectionType) {
@@ -860,7 +860,7 @@ void Bars3dRenderer::drawScene(CameraHelper *camera,
                         m_selectedBar->setPosition(QPoint(row, bar));
                         item.setTranslation(modelMatrix.column(3).toVector3D());
                         barSelectionFound = true;
-                        if (m_cachedSelectionMode >= ModeZoomRow) {
+                        if (m_cachedSelectionMode >= QDataVis::ModeZoomRow) {
                             item.setTranslation(modelMatrix.column(3).toVector3D());
                             m_sliceSelection->append(&item);
                         }
@@ -871,7 +871,7 @@ void Bars3dRenderer::drawScene(CameraHelper *camera,
                     // Current bar is on the same row as the selected bar
                     barColor = Utils::vectorFromColor(m_cachedTheme.m_highlightRowColor);
                     lightStrength = m_cachedTheme.m_highlightLightStrength;
-                    if (!m_cachedIsSlicingActivated && ModeZoomRow == m_cachedSelectionMode) {
+                    if (!m_cachedIsSlicingActivated && QDataVis::ModeZoomRow == m_cachedSelectionMode) {
                         item.setTranslation(modelMatrix.column(3).toVector3D());
                         m_sliceSelection->append(&item);
                         if (!m_sliceCache) {
@@ -887,7 +887,8 @@ void Bars3dRenderer::drawScene(CameraHelper *camera,
                     // Current bar is on the same column as the selected bar
                     barColor = Utils::vectorFromColor(m_cachedTheme.m_highlightColumnColor);
                     lightStrength = m_cachedTheme.m_highlightLightStrength;
-                    if (!m_cachedIsSlicingActivated && ModeZoomColumn == m_cachedSelectionMode) {
+                    if (!m_cachedIsSlicingActivated
+                            && QDataVis::ModeZoomColumn == m_cachedSelectionMode) {
                         item.setTranslation(modelMatrix.column(3).toVector3D());
                         m_sliceSelection->append(&item);
                         if (!m_sliceCache) {
@@ -920,7 +921,7 @@ void Bars3dRenderer::drawScene(CameraHelper *camera,
                 m_barShader->setUniformValue(m_barShader->ambientS(), m_cachedTheme.m_ambientStrength);
 
 #if !defined(QT_OPENGL_ES_2)
-                if (m_cachedShadowQuality > ShadowNone) {
+                if (m_cachedShadowQuality > QDataVis::ShadowNone) {
                     // Set shadow shader bindings
                     m_barShader->setUniformValue(m_barShader->shadowQ(), m_shadowQualityToShader);
                     m_barShader->setUniformValue(m_barShader->depth(), depthMVPMatrix);
@@ -989,7 +990,7 @@ void Bars3dRenderer::drawScene(CameraHelper *camera,
                                             m_cachedTheme.m_ambientStrength * 2.0f);
 
 #if !defined(QT_OPENGL_ES_2)
-        if (m_cachedShadowQuality > ShadowNone) {
+        if (m_cachedShadowQuality > QDataVis::ShadowNone) {
             // Set shadow shader bindings
             m_backgroundShader->setUniformValue(m_backgroundShader->shadowQ(),
                                                 m_shadowQualityToShader);
@@ -1063,7 +1064,7 @@ void Bars3dRenderer::drawScene(CameraHelper *camera,
             m_barShader->setUniformValue(m_barShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-            if (m_cachedShadowQuality > ShadowNone) {
+            if (m_cachedShadowQuality > QDataVis::ShadowNone) {
                 // Set shadow shader bindings
                 m_barShader->setUniformValue(m_barShader->shadowQ(), m_shadowQualityToShader);
                 m_barShader->setUniformValue(m_barShader->depth(), depthMVPMatrix);
@@ -1112,7 +1113,7 @@ void Bars3dRenderer::drawScene(CameraHelper *camera,
             m_barShader->setUniformValue(m_barShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-            if (m_cachedShadowQuality > ShadowNone) {
+            if (m_cachedShadowQuality > QDataVis::ShadowNone) {
                 // Set shadow shader bindings
                 m_barShader->setUniformValue(m_barShader->shadowQ(), m_shadowQualityToShader);
                 m_barShader->setUniformValue(m_barShader->depth(), depthMVPMatrix);
@@ -1171,7 +1172,7 @@ void Bars3dRenderer::drawScene(CameraHelper *camera,
                 m_barShader->setUniformValue(m_barShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-                if (m_cachedShadowQuality > ShadowNone) {
+                if (m_cachedShadowQuality > QDataVis::ShadowNone) {
                     // Set shadow shader bindings
                     m_barShader->setUniformValue(m_barShader->shadowQ(), m_shadowQualityToShader);
                     m_barShader->setUniformValue(m_barShader->depth(), depthMVPMatrix);
@@ -1223,7 +1224,7 @@ void Bars3dRenderer::drawScene(CameraHelper *camera,
                 m_barShader->setUniformValue(m_barShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-                if (m_cachedShadowQuality > ShadowNone) {
+                if (m_cachedShadowQuality > QDataVis::ShadowNone) {
                     // Set shadow shader bindings
                     m_barShader->setUniformValue(m_barShader->shadowQ(), m_shadowQualityToShader);
                     m_barShader->setUniformValue(m_barShader->depth(), depthMVPMatrix);
@@ -1260,9 +1261,10 @@ void Bars3dRenderer::drawScene(CameraHelper *camera,
     if (!barSelectionFound) {
         // We have no ownership, don't delete. Just NULL the pointer.
         m_selectedBar = NULL;
-        if (m_cachedIsSlicingActivated && Bars3dController::MouseOnOverview == m_controller->mouseState())
+        if (m_cachedIsSlicingActivated
+                && Bars3dController::MouseOnOverview == m_controller->mouseState())
             m_controller->setSlicingActive(false);
-    } else if (m_cachedSelectionMode >= ModeZoomRow
+    } else if (m_cachedSelectionMode >= QDataVis::ModeZoomRow
                && Bars3dController::MouseOnScene == m_controller->mouseState()) {
         // Activate slice mode
         m_controller->setSlicingActive(true);
@@ -1277,7 +1279,7 @@ void Bars3dRenderer::drawScene(CameraHelper *camera,
         m_labelShader->bind();
         glDisable(GL_DEPTH_TEST);
         glEnable(GL_TEXTURE_2D);
-        if (m_cachedLabelTransparency > TransparencyNone) {
+        if (m_cachedLabelTransparency > QDataVis::TransparencyNone) {
             glEnable(GL_BLEND);
             glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
         }
@@ -1319,7 +1321,7 @@ void Bars3dRenderer::drawScene(CameraHelper *camera,
                             m_labelObj, camera, true, false);
 #endif
         glDisable(GL_TEXTURE_2D);
-        if (m_cachedLabelTransparency > TransparencyNone)
+        if (m_cachedLabelTransparency > QDataVis::TransparencyNone)
             glDisable(GL_BLEND);
         glEnable(GL_DEPTH_TEST);
 
@@ -1335,7 +1337,7 @@ void Bars3dRenderer::drawScene(CameraHelper *camera,
     m_labelShader->bind();
 
     glEnable(GL_TEXTURE_2D);
-    if (m_cachedLabelTransparency > TransparencyNone) {
+    if (m_cachedLabelTransparency > QDataVis::TransparencyNone) {
         glEnable(GL_BLEND);
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     }
@@ -1490,7 +1492,7 @@ void Bars3dRenderer::drawScene(CameraHelper *camera,
     }
 
     glDisable(GL_TEXTURE_2D);
-    if (m_cachedLabelTransparency > TransparencyNone)
+    if (m_cachedLabelTransparency > QDataVis::TransparencyNone)
         glDisable(GL_BLEND);
 
     // Release label shader
@@ -1596,14 +1598,14 @@ void Bars3dRenderer::updateSampleSpace(int rowCount, int columnCount)
 }
 
 
-void Bars3dRenderer::updateSelectionMode(SelectionMode mode)
+void Bars3dRenderer::updateSelectionMode(QDataVis::SelectionMode mode)
 {
     m_cachedSelectionMode      = mode;
 
     // Create zoom selection if there isn't one
-    if (mode >= ModeZoomRow && !m_sliceSelection) {
+    if (mode >= QDataVis::ModeZoomRow && !m_sliceSelection) {
         m_sliceSelection = new QList<BarRenderItem *>;
-        if (mode == ModeZoomRow)
+        if (mode == QDataVis::ModeZoomRow)
             m_sliceSelection->reserve(m_cachedRowCount);
         else
             m_sliceSelection->reserve(m_cachedColumnCount);
@@ -1627,18 +1629,18 @@ void Bars3dRenderer::updateBackgroundEnabled(bool enable)
     }
 }
 
-void Bars3dRenderer::updateShadowQuality(ShadowQuality quality)
+void Bars3dRenderer::updateShadowQuality(QDataVis::ShadowQuality quality)
 {
     qDebug() << "Bars3dRenderer::setShadowQuality" << quality;
     m_cachedShadowQuality = quality;
     switch (quality) {
-    case ShadowLow:
+    case QDataVis::ShadowLow:
         m_shadowQualityToShader = 33.3f;
         break;
-    case ShadowMedium:
+    case QDataVis::ShadowMedium:
         m_shadowQualityToShader = 100.0f;
         break;
-    case ShadowHigh:
+    case QDataVis::ShadowHigh:
         m_shadowQualityToShader = 200.0f;
         break;
     default:
@@ -1646,7 +1648,7 @@ void Bars3dRenderer::updateShadowQuality(ShadowQuality quality)
         break;
     }
 #if !defined(QT_OPENGL_ES_2)
-    if (m_cachedShadowQuality > ShadowNone) {
+    if (m_cachedShadowQuality > QDataVis::ShadowNone) {
         // Re-init shaders
         if (!m_cachedTheme.m_uniformColor) {
             initShaders(QStringLiteral(":/shaders/vertexShadow"),
@@ -1782,14 +1784,14 @@ Bars3dController::SelectionType Bars3dRenderer::isSelected(GLint row, GLint bar)
     if (current == m_selection) {
         isSelectedType = Bars3dController::SelectionBar;
     }
-    else if (current.y() == m_selection.y() && (m_cachedSelectionMode == ModeItemAndColumn
-                                                || m_cachedSelectionMode == ModeItemRowAndColumn
-                                                || m_cachedSelectionMode == ModeZoomColumn)) {
+    else if (current.y() == m_selection.y() && (m_cachedSelectionMode == QDataVis::ModeItemAndColumn
+                                                || m_cachedSelectionMode == QDataVis::ModeItemRowAndColumn
+                                                || m_cachedSelectionMode == QDataVis::ModeZoomColumn)) {
         isSelectedType = Bars3dController::SelectionColumn;
     }
-    else if (current.x() == m_selection.x() && (m_cachedSelectionMode == ModeItemAndRow
-                                                || m_cachedSelectionMode == ModeItemRowAndColumn
-                                                || m_cachedSelectionMode == ModeZoomRow)) {
+    else if (current.x() == m_selection.x() && (m_cachedSelectionMode == QDataVis::ModeItemAndRow
+                                                || m_cachedSelectionMode == QDataVis::ModeItemRowAndColumn
+                                                || m_cachedSelectionMode == QDataVis::ModeZoomRow)) {
         isSelectedType = Bars3dController::SelectionRow;
     }
     return isSelectedType;
@@ -1798,10 +1800,13 @@ Bars3dController::SelectionType Bars3dRenderer::isSelected(GLint row, GLint bar)
 void Bars3dRenderer::updateSlicingActive(bool isSlicing)
 {
     m_cachedIsSlicingActivated = isSlicing;
-    if (isSlicing)
-        m_mainViewPort = QRect(0, m_cachedBoundingRect.height() - m_cachedBoundingRect.height() / 5, m_cachedBoundingRect.width() / 5, m_cachedBoundingRect.height() / 5);
-    else
-        m_mainViewPort = QRect(0, 0, this->m_cachedBoundingRect.width(), this->m_cachedBoundingRect.height());
+    if (isSlicing) {
+        m_mainViewPort = QRect(0, m_cachedBoundingRect.height() - m_cachedBoundingRect.height() / 5,
+                               m_cachedBoundingRect.width() / 5, m_cachedBoundingRect.height() / 5);
+    } else {
+        m_mainViewPort = QRect(0, 0, this->m_cachedBoundingRect.width(),
+                               this->m_cachedBoundingRect.height());
+    }
 }
 
 void Bars3dRenderer::updateZoomLevel(int newZoomLevel)
@@ -1859,23 +1864,23 @@ void Bars3dRenderer::updateDepthBuffer()
         m_depthTexture = 0;
     }
 
-    if (m_cachedShadowQuality > ShadowNone) {
+    if (m_cachedShadowQuality > QDataVis::ShadowNone) {
         m_depthTexture = m_textureHelper->createDepthTexture(m_mainViewPort.size(),
                                                              m_depthFrameBuffer,
                                                              m_cachedShadowQuality);
         if (!m_depthTexture) {
             switch (m_cachedShadowQuality) {
-            case ShadowHigh:
+            case QDataVis::ShadowHigh:
                 qWarning("Creating high quality shadows failed. Changing to medium quality.");
-                (void)m_controller->setShadowQuality(ShadowMedium);
+                (void)m_controller->setShadowQuality(QDataVis::ShadowMedium);
                 break;
-            case ShadowMedium:
+            case QDataVis::ShadowMedium:
                 qWarning("Creating medium quality shadows failed. Changing to low quality.");
-                (void)m_controller->setShadowQuality(ShadowLow);
+                (void)m_controller->setShadowQuality(QDataVis::ShadowLow);
                 break;
-            case ShadowLow:
+            case QDataVis::ShadowLow:
                 qWarning("Creating low quality shadows failed. Switching shadows off.");
-                (void)m_controller->setShadowQuality(ShadowNone);
+                (void)m_controller->setShadowQuality(QDataVis::ShadowNone);
                 break;
             default:
                 // You'll never get here
diff --git a/src/datavis3d/engine/bars3drenderer_p.h b/src/datavis3d/engine/bars3drenderer_p.h
index 97ad5bf4..68c34598 100644
--- a/src/datavis3d/engine/bars3drenderer_p.h
+++ b/src/datavis3d/engine/bars3drenderer_p.h
@@ -76,7 +76,7 @@ private:
     QSizeF m_cachedBarSpacing;
     QString m_cachedObjFile;
     bool m_cachedIsSlicingActivated;
-    SelectionMode m_cachedSelectionMode;
+    QDataVis::SelectionMode m_cachedSelectionMode;
     int m_cachedZoomLevel;
     int m_cachedRowCount;
     int m_cachedColumnCount;
@@ -152,7 +152,7 @@ public slots:
     void updateBarSpecs(QSizeF thickness = QSizeF(1.0f, 1.0f),
                         QSizeF spacing = QSizeF(1.0f, 1.0f),
                         bool relative = true);
-    void updateSelectionMode(SelectionMode newMode);
+    void updateSelectionMode(QDataVis::SelectionMode newMode);
     void updateSlicingActive(bool isSlicing);
     void updateSampleSpace(int rowCount, int columnCount);
     void updateZoomLevel(int newZoomLevel);
@@ -175,7 +175,7 @@ private:
     virtual void initializePreOpenGL();
     virtual void initializeOpenGL();
     virtual void initShaders(const QString &vertexShader, const QString &fragmentShader);
-    virtual void updateShadowQuality(ShadowQuality quality);
+    virtual void updateShadowQuality(QDataVis::ShadowQuality quality);
     virtual void updateTextures();
 
     void drawSlicedScene(CameraHelper *camera,
diff --git a/src/datavis3d/engine/drawer.cpp b/src/datavis3d/engine/drawer.cpp
index a0bc65fc..5d524963 100644
--- a/src/datavis3d/engine/drawer.cpp
+++ b/src/datavis3d/engine/drawer.cpp
@@ -16,7 +16,7 @@
 **
 ****************************************************************************/
 
-#include "qdatavis3dnamespace.h"
+#include "qdatavis3denums.h"
 #include "drawer_p.h"
 #include "shaderhelper_p.h"
 #include "objecthelper_p.h"
@@ -41,7 +41,7 @@ StaticLibInitializer staticLibInitializer;
 
 QT_DATAVIS3D_BEGIN_NAMESPACE
 
-Drawer::Drawer(const Theme &theme, const QFont &font, LabelTransparency transparency)
+Drawer::Drawer(const Theme &theme, const QFont &font, QDataVis::LabelTransparency transparency)
     : m_theme(theme),
       m_font(font),
       m_transparency(transparency),
@@ -73,7 +73,7 @@ void Drawer::setFont(const QFont &font)
     emit drawerChanged();
 }
 
-void Drawer::setTransparency(LabelTransparency transparency)
+void Drawer::setTransparency(QDataVis::LabelTransparency transparency)
 {
     m_transparency = transparency;
     emit drawerChanged();
@@ -173,7 +173,7 @@ void Drawer::drawSurfaceGrid(ShaderHelper *shader, SurfaceObject *object)
 void Drawer::drawLabel(const AbstractRenderItem &item, const LabelItem &labelItem,
                        const QMatrix4x4 &viewmatrix, const QMatrix4x4 &projectionmatrix,
                        const QVector3D &positionComp, const QVector3D &rotation,
-                       GLfloat itemHeight, SelectionMode mode,
+                       GLfloat itemHeight, QDataVis::SelectionMode mode,
                        ShaderHelper *shader, ObjectHelper *object,
                        CameraHelper *camera,
                        bool useDepth, bool rotateAlong,
@@ -270,7 +270,7 @@ void Drawer::drawLabel(const AbstractRenderItem &item, const LabelItem &labelIte
         xPosition = item.translation().x();
         if (useDepth)
             zPosition = item.translation().z();
-        else if (ModeZoomColumn == mode)
+        else if (QDataVis::ModeZoomColumn == mode)
             xPosition = -(item.translation().z()) + positionComp.z(); // flip first to left
     }
 
diff --git a/src/datavis3d/engine/drawer_p.h b/src/datavis3d/engine/drawer_p.h
index 4b79c7dd..3139fbe0 100644
--- a/src/datavis3d/engine/drawer_p.h
+++ b/src/datavis3d/engine/drawer_p.h
@@ -63,14 +63,14 @@ public:
     };
 
 public:
-    explicit Drawer(const Theme &theme, const QFont &font, LabelTransparency transparency);
+    explicit Drawer(const Theme &theme, const QFont &font, QDataVis::LabelTransparency transparency);
     ~Drawer();
 
     void initializeOpenGL();
 
     void setTheme(const Theme &theme);
     void setFont(const QFont &font);
-    void setTransparency(LabelTransparency transparency);
+    void setTransparency(QDataVis::LabelTransparency transparency);
 
     void drawObject(ShaderHelper *shader, AbstractObjectHelper *object, GLuint textureId = 0,
                     GLuint depthTextureId = 0);
@@ -78,7 +78,7 @@ public:
     void drawLabel(const AbstractRenderItem &item, const LabelItem &labelItem,
                    const QMatrix4x4 &viewmatrix, const QMatrix4x4 &projectionmatrix,
                    const QVector3D &positionComp, const QVector3D &rotation, GLfloat itemHeight,
-                   SelectionMode mode, ShaderHelper *shader, ObjectHelper *object,
+                   QDataVis::SelectionMode mode, ShaderHelper *shader, ObjectHelper *object,
                    CameraHelper *camera,
                    bool useDepth = false, bool rotateAlong = false,
                    LabelPosition position = LabelOver,
@@ -93,7 +93,7 @@ Q_SIGNALS:
 private:
     Theme m_theme;
     QFont m_font;
-    LabelTransparency m_transparency;
+    QDataVis::LabelTransparency m_transparency;
     TextureHelper *m_textureHelper;
 };
 
diff --git a/src/datavis3d/engine/maps3dcontroller.cpp b/src/datavis3d/engine/maps3dcontroller.cpp
index 6050cc05..9dc15bc4 100644
--- a/src/datavis3d/engine/maps3dcontroller.cpp
+++ b/src/datavis3d/engine/maps3dcontroller.cpp
@@ -81,7 +81,7 @@ Maps3DController::Maps3DController(const QRect &rect)
       m_scaleFactor(1.0f),
       m_theme(new Theme()),
       m_isInitialized(false),
-      m_selectionMode(ModeItem),
+      m_selectionMode(QDataVis::ModeItem),
       m_selectedBar(0),
       m_previouslySelectedBar(0),
       m_axisLabelX(QStringLiteral("X")),
@@ -91,7 +91,7 @@ Maps3DController::Maps3DController(const QRect &rect)
       m_zoomViewPort(rect.x(), rect.y(), rect.width(), rect.height()),
       m_zoomActivated(false),
       m_textureHelper(new TextureHelper()),
-      m_labelTransparency(TransparencyFromTheme),
+      m_labelTransparency(QDataVis::TransparencyFromTheme),
       m_font(QFont(QStringLiteral("Arial"))),
       m_drawer(new Drawer(*m_theme, m_font, m_labelTransparency)),
       m_areaSize(QSizeF(1.0f, 1.0f)),
@@ -103,7 +103,7 @@ Maps3DController::Maps3DController(const QRect &rect)
       m_selectionDepthBuffer(0),
       m_updateLabels(true),
       m_adjustDirection(Q3DMaps::AdjustHeight),
-      m_shadowQuality(ShadowLow),
+      m_shadowQuality(QDataVis::ShadowLow),
       m_shadowQualityToShader(33.3f),
       m_bgrHasAlpha(false),
       m_boundingRect(rect.x(), rect.y(), rect.width(), rect.height()),
@@ -146,7 +146,7 @@ void Maps3DController::initializeOpenGL()
 
     // Initialize shaders
 #if !defined(QT_OPENGL_ES_2)
-    if (m_shadowQuality > ShadowNone) {
+    if (m_shadowQuality > QDataVis::ShadowNone) {
         if (!m_theme->m_uniformColor) {
             initShaders(QStringLiteral(":/shaders/vertexShadow"),
                         QStringLiteral(":/shaders/fragmentShadowNoTexColorOnY"));
@@ -380,7 +380,7 @@ void Maps3DController::drawScene(const GLuint defaultFboHandle)
     QMatrix4x4 depthProjectionMatrix;
 
 #if !defined(QT_OPENGL_ES_2)
-    if (m_shadowQuality > ShadowNone) {
+    if (m_shadowQuality > QDataVis::ShadowNone) {
         // Render scene into a depth texture for using with shadow mapping
         // Bind depth shader
         m_depthShader->bind();
@@ -526,7 +526,7 @@ void Maps3DController::drawScene(const GLuint defaultFboHandle)
 
 #if 1
     // Skip selection mode drawing if we're zoomed or have no selection mode
-    if (!m_zoomActivated && m_selectionMode > ModeNone) {
+    if (!m_zoomActivated && m_selectionMode > QDataVis::ModeNone) {
         // Bind selection shader
         m_selectionShader->bind();
 
@@ -665,7 +665,7 @@ void Maps3DController::drawScene(const GLuint defaultFboHandle)
         QVector3D barColor = baseColor + heightColor;
 
         GLfloat lightStrength = m_theme->m_lightStrength;
-        if (m_selectionMode > ModeNone) {
+        if (m_selectionMode > QDataVis::ModeNone) {
             Maps3DController::SelectionType selectionType = isSelected(bar, selection);
             switch (selectionType) {
             case Maps3DController::SelectionBar: {
@@ -703,7 +703,7 @@ void Maps3DController::drawScene(const GLuint defaultFboHandle)
             m_barShader->setUniformValue(m_barShader->ambientS(), m_theme->m_ambientStrength);
 
 #if !defined(QT_OPENGL_ES_2)
-            if (m_shadowQuality > ShadowNone) {
+            if (m_shadowQuality > QDataVis::ShadowNone) {
                 // Set shadow shader bindings
                 m_barShader->setUniformValue(m_barShader->shadowQ(), m_shadowQualityToShader);
                 m_barShader->setUniformValue(m_barShader->depth(), depthMVPMatrix);
@@ -767,7 +767,7 @@ void Maps3DController::drawScene(const GLuint defaultFboHandle)
                                             m_theme->m_ambientStrength * 3.0f);
 
 #if !defined(QT_OPENGL_ES_2)
-        if (m_shadowQuality > ShadowNone) {
+        if (m_shadowQuality > QDataVis::ShadowNone) {
             // Set shadow shader bindings
             m_backgroundShader->setUniformValue(m_backgroundShader->shadowQ(),
                                                 m_shadowQualityToShader);
@@ -823,7 +823,7 @@ void Maps3DController::drawScene(const GLuint defaultFboHandle)
         m_labelShader->bind();
         glDisable(GL_DEPTH_TEST);
         glEnable(GL_TEXTURE_2D);
-        if (m_labelTransparency > TransparencyNone) {
+        if (m_labelTransparency > QDataVis::TransparencyNone) {
             glEnable(GL_BLEND);
             glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
         }
@@ -857,7 +857,7 @@ void Maps3DController::drawScene(const GLuint defaultFboHandle)
                             m_labelObj, true, false);
 #endif
         glDisable(GL_TEXTURE_2D);
-        if (m_labelTransparency > TransparencyNone)
+        if (m_labelTransparency > QDataVis::TransparencyNone)
             glDisable(GL_BLEND);
         glEnable(GL_DEPTH_TEST);
 
@@ -1150,34 +1150,34 @@ void Maps3DController::setBarSpecs(const QVector3D &thickness,
     m_adjustDirection = direction;
 }
 
-void Maps3DController::setBarType(MeshStyle style, bool smooth)
+void Maps3DController::setBarType(QDataVis::MeshStyle style, bool smooth)
 {
-    if (style == Bars) {
+    if (style == QDataVis::Bars) {
         if (smooth)
             m_objFile = QStringLiteral(":/defaultMeshes/barSmooth");
         else
             m_objFile = QStringLiteral(":/defaultMeshes/bar");
-    } else if (style == Pyramids) {
+    } else if (style == QDataVis::Pyramids) {
         if (smooth)
             m_objFile = QStringLiteral(":/defaultMeshes/pyramidSmooth");
         else
             m_objFile = QStringLiteral(":/defaultMeshes/pyramid");
-    } else if (style == Cones) {
+    } else if (style == QDataVis::Cones) {
         if (smooth)
             m_objFile = QStringLiteral(":/defaultMeshes/coneSmooth");
         else
             m_objFile = QStringLiteral(":/defaultMeshes/cone");
-    } else if (style == Cylinders) {
+    } else if (style == QDataVis::Cylinders) {
         if (smooth)
             m_objFile = QStringLiteral(":/defaultMeshes/cylinderSmooth");
         else
             m_objFile = QStringLiteral(":/defaultMeshes/cylinder");
-    } else if (style == BevelBars) {
+    } else if (style == QDataVis::BevelBars) {
         if (smooth)
             m_objFile = QStringLiteral(":/defaultMeshes/bevelbarSmooth");
         else
             m_objFile = QStringLiteral(":/defaultMeshes/bevelbar");
-    } else if (style == Spheres) {
+    } else if (style == QDataVis::Spheres) {
         if (smooth)
             m_objFile = QStringLiteral(":/defaultMeshes/sphereSmooth");
         else
@@ -1193,7 +1193,7 @@ void Maps3DController::setMeshFileName(const QString &objFileName)
     m_objFile = objFileName;
 }
 
-void Maps3DController::setCameraPreset(CameraPreset preset)
+void Maps3DController::setCameraPreset(QDataVis::CameraPreset preset)
 {
     m_camera->setCameraPreset(preset);
 }
@@ -1207,12 +1207,12 @@ void Maps3DController::setCameraPosition(GLfloat horizontal, GLfloat vertical, G
     //qDebug() << "camera rotation set to" << m_horizontalRotation << m_verticalRotation;
 }
 
-void Maps3DController::setTheme(ColorTheme colorTheme)
+void Maps3DController::setTheme(QDataVis::ColorTheme colorTheme)
 {
     m_theme->useColorTheme(colorTheme);
     m_drawer->setTheme(*m_theme);
 #if !defined(QT_OPENGL_ES_2)
-    if (m_shadowQuality > ShadowNone) {
+    if (m_shadowQuality > QDataVis::ShadowNone) {
         // Re-init shaders
         if (!m_theme->m_uniformColor) {
             initShaders(QStringLiteral(":/shaders/vertexShadow"),
@@ -1249,7 +1249,7 @@ void Maps3DController::setBarColor(QColor baseColor, QColor heightColor, bool un
     m_theme->m_heightColor = heightColor;
     if (m_theme->m_uniformColor != uniform) {
 #if !defined(QT_OPENGL_ES_2)
-        if (m_shadowQuality > ShadowNone) {
+        if (m_shadowQuality > QDataVis::ShadowNone) {
             // Re-init shaders
             if (!m_theme->m_uniformColor) {
                 initShaders(QStringLiteral(":/shaders/vertexShadow"),
@@ -1295,7 +1295,7 @@ void Maps3DController::setImage(const QImage &image)
     m_bgrTexture = m_textureHelper->create2DTexture(image, true, true);
 }
 
-void Maps3DController::setSelectionMode(SelectionMode mode)
+void Maps3DController::setSelectionMode(QDataVis::SelectionMode mode)
 {
     m_selectionMode = mode;
     // Disable zoom if mode changes
@@ -1303,7 +1303,7 @@ void Maps3DController::setSelectionMode(SelectionMode mode)
     //m_sceneViewPort = QRect(0, 0, width(), height());
 }
 
-SelectionMode Maps3DController::selectionMode()
+QDataVis::SelectionMode Maps3DController::selectionMode()
 {
     return m_selectionMode;
 }
@@ -1332,31 +1332,31 @@ QFont Maps3DController::font()
     return m_font;
 }
 
-void Maps3DController::setLabelTransparency(LabelTransparency transparency)
+void Maps3DController::setLabelTransparency(QDataVis::LabelTransparency transparency)
 {
     m_labelTransparency = transparency;
     m_drawer->setTransparency(transparency);
     m_updateLabels = true;
 }
 
-LabelTransparency Maps3DController::labelTransparency()
+QDataVis::LabelTransparency Maps3DController::labelTransparency()
 {
     return m_labelTransparency;
 }
 
-ShadowQuality Maps3DController::setShadowQuality(ShadowQuality quality)
+QDataVis::ShadowQuality Maps3DController::setShadowQuality(QDataVis::ShadowQuality quality)
 {
     m_shadowQuality = quality;
     switch (quality) {
-    case ShadowLow:
+    case QDataVis::ShadowLow:
         //qDebug() << "ShadowLow";
         m_shadowQualityToShader = 33.3f;
         break;
-    case ShadowMedium:
+    case QDataVis::ShadowMedium:
         //qDebug() << "ShadowMedium";
         m_shadowQualityToShader = 100.0f;
         break;
-    case ShadowHigh:
+    case QDataVis::ShadowHigh:
         //qDebug() << "ShadowHigh";
         m_shadowQualityToShader = 200.0f;
         break;
@@ -1366,7 +1366,7 @@ ShadowQuality Maps3DController::setShadowQuality(ShadowQuality quality)
     }
     if (m_isInitialized) {
 #if !defined(QT_OPENGL_ES_2)
-        if (m_shadowQuality > ShadowNone) {
+        if (m_shadowQuality > QDataVis::ShadowNone) {
             // Re-init shaders
             if (!m_theme->m_uniformColor) {
                 initShaders(QStringLiteral(":/shaders/vertexShadow"),
@@ -1406,7 +1406,7 @@ ShadowQuality Maps3DController::setShadowQuality(ShadowQuality quality)
     return m_shadowQuality;
 }
 
-ShadowQuality Maps3DController::shadowQuality()
+QDataVis::ShadowQuality Maps3DController::shadowQuality()
 {
     return m_shadowQuality;
 }
@@ -1550,22 +1550,22 @@ void Maps3DController::initDepthBuffer()
         m_depthTexture = 0;
     }
 
-    if (m_shadowQuality > ShadowNone) {
+    if (m_shadowQuality > QDataVis::ShadowNone) {
         m_depthTexture = m_textureHelper->createDepthTexture(this->size(), m_depthFrameBuffer,
                                                              m_shadowQuality);
         if (!m_depthTexture) {
             switch (m_shadowQuality) {
-            case ShadowHigh:
+            case QDataVis::ShadowHigh:
                 qWarning("Creating high quality shadows failed. Changing to medium quality.");
-                (void)setShadowQuality(ShadowMedium);
+                (void)setShadowQuality(QDataVis::ShadowMedium);
                 break;
-            case ShadowMedium:
+            case QDataVis::ShadowMedium:
                 qWarning("Creating medium quality shadows failed. Changing to low quality.");
-                (void)setShadowQuality(ShadowLow);
+                (void)setShadowQuality(QDataVis::ShadowLow);
                 break;
-            case ShadowLow:
+            case QDataVis::ShadowLow:
                 qWarning("Creating low quality shadows failed. Switching shadows off.");
-                (void)setShadowQuality(ShadowNone);
+                (void)setShadowQuality(QDataVis::ShadowNone);
                 break;
             default:
                 // Cannot get here
diff --git a/src/datavis3d/engine/maps3dcontroller_p.h b/src/datavis3d/engine/maps3dcontroller_p.h
index 5dc7ee59..5043bf97 100644
--- a/src/datavis3d/engine/maps3dcontroller_p.h
+++ b/src/datavis3d/engine/maps3dcontroller_p.h
@@ -86,20 +86,20 @@ public:
                      Q3DMaps::AdjustmentDirection direction = Q3DMaps::AdjustHeight);
 
     // bar type; bars (=cubes), pyramids, cones, cylinders, balls, etc.
-    void setBarType(MeshStyle style, bool smooth = false);
+    void setBarType(QDataVis::MeshStyle style, bool smooth = false);
 
     // override bar type with own mesh
     void setMeshFileName(const QString &objFileName);
 
     // Select preset camera placement
-    void setCameraPreset(CameraPreset preset);
+    void setCameraPreset(QDataVis::CameraPreset preset);
 
     // Set camera rotation if you don't want to use the presets (in horizontal (-180...180) and
     // vertical (0...90) angles and distance in percentage (10...500))
     void setCameraPosition(GLfloat horizontal, GLfloat vertical, GLint distance = 100);
 
     // Set theme (bar colors, shaders, window color, background colors, light intensity and text colors are affected)
-    void setTheme(ColorTheme theme);
+    void setTheme(QDataVis::ColorTheme theme);
 
     // Set color if you don't want to use themes. Set uniform to false if you want the (height) color to change from bottom to top
     void setBarColor(QColor baseColor, QColor heightColor, bool uniform = true);
@@ -113,8 +113,8 @@ public:
     // TODO: light placement API
 
     // Change selection mode; single bar, bar and row, bar and column, or all
-    void setSelectionMode(SelectionMode mode);
-    SelectionMode selectionMode();
+    void setSelectionMode(QDataVis::SelectionMode mode);
+    QDataVis::SelectionMode selectionMode();
 
     // Font size adjustment
     void setFontSize(float fontsize);
@@ -125,12 +125,12 @@ public:
     QFont font();
 
     // Label transparency adjustment
-    void setLabelTransparency(LabelTransparency transparency);
-    LabelTransparency labelTransparency();
+    void setLabelTransparency(QDataVis::LabelTransparency transparency);
+    QDataVis::LabelTransparency labelTransparency();
 
     // Adjust shadow quality
-    ShadowQuality setShadowQuality(ShadowQuality quality);
-    ShadowQuality shadowQuality();
+    QDataVis::ShadowQuality setShadowQuality(QDataVis::ShadowQuality quality);
+    QDataVis::ShadowQuality shadowQuality();
 
     // Size
     const QSize size();
@@ -216,7 +216,7 @@ private:
     GLfloat m_scaleFactor;
     Theme *m_theme;
     bool m_isInitialized;
-    SelectionMode m_selectionMode;
+    QDataVis::SelectionMode m_selectionMode;
     BarRenderItem *m_selectedBar; // points to renderitem array
     BarRenderItem *m_previouslySelectedBar; // points to renderitem array
     QString m_axisLabelX;
@@ -226,7 +226,7 @@ private:
     QRect m_zoomViewPort;
     bool m_zoomActivated;
     TextureHelper *m_textureHelper;
-    LabelTransparency m_labelTransparency;
+    QDataVis::LabelTransparency m_labelTransparency;
     QFont m_font;
     Drawer *m_drawer;
     QSizeF m_areaSize;
@@ -238,7 +238,7 @@ private:
     GLuint m_selectionDepthBuffer;
     bool m_updateLabels;
     Q3DMaps::AdjustmentDirection m_adjustDirection;
-    ShadowQuality m_shadowQuality;
+    QDataVis::ShadowQuality m_shadowQuality;
     GLfloat m_shadowQualityToShader;
     bool m_bgrHasAlpha;
     QRect m_boundingRect;
diff --git a/src/datavis3d/engine/q3dbars.cpp b/src/datavis3d/engine/q3dbars.cpp
index 14195d68..9ee3da9b 100644
--- a/src/datavis3d/engine/q3dbars.cpp
+++ b/src/datavis3d/engine/q3dbars.cpp
@@ -102,7 +102,7 @@ void Q3DBars::render()
     d_ptr->m_shared->render();
 }
 
-void Q3DBars::handleShadowQualityUpdate(ShadowQuality quality)
+void Q3DBars::handleShadowQualityUpdate(QDataVis::ShadowQuality quality)
 {
     emit shadowQualityChanged(quality);
 }
@@ -207,7 +207,7 @@ void Q3DBars::setBarSpecs(QSizeF thickness, QSizeF spacing, bool relative)
  *
  * \sa setMeshFileName()
  */
-void Q3DBars::setBarType(MeshStyle style, bool smooth)
+void Q3DBars::setBarType(QDataVis::MeshStyle style, bool smooth)
 {
     d_ptr->m_shared->setBarType(style, smooth);
 }
@@ -233,11 +233,11 @@ QSize Q3DBars::sampleSpace() const
 }
 
 /*!
- * \a preset Move camera to a predefined position from \c CameraPreset.
+ * \a preset Move camera to a predefined position from \c QDataVis::CameraPreset.
  *
  * Moves camera to a predefined position.
  */
-void Q3DBars::setCameraPreset(CameraPreset preset)
+void Q3DBars::setCameraPreset(QDataVis::CameraPreset preset)
 {
     d_ptr->m_shared->setCameraPreset(preset);
 }
@@ -260,12 +260,12 @@ void Q3DBars::setCameraPosition(qreal horizontal, qreal vertical, int distance)
 }
 
 /*!
- * \a theme Apply a predefined theme from \c ColorTheme.
+ * \a theme Apply a predefined theme from \c QDataVis::ColorTheme.
  *
  * Sets a predefined theme. Theme affects bar colors, label colors, text color, background color,
  * window color and grid color. Lighting is also adjusted by themes.
  */
-void Q3DBars::setTheme(ColorTheme theme)
+void Q3DBars::setTheme(QDataVis::ColorTheme theme)
 {
     d_ptr->m_shared->setColorTheme(theme);
 }
@@ -293,16 +293,16 @@ void Q3DBars::setBarColor(QColor baseColor, QColor heightColor, QColor depthColo
 /*!
  * \property Q3DBars::selectionMode
  *
- * \a mode Set bar selection mode from \c SelectionMode. \c ModeItem by default.
+ * \a mode Set bar selection mode from \c QDataVis::SelectionMode. \c ModeItem by default.
  *
  * Sets bar selection mode to be used.
  */
-void Q3DBars::setSelectionMode(SelectionMode mode)
+void Q3DBars::setSelectionMode(QDataVis::SelectionMode mode)
 {
     d_ptr->m_shared->setSelectionMode(mode);
 }
 
-SelectionMode Q3DBars::selectionMode() const
+QDataVis::SelectionMode Q3DBars::selectionMode() const
 {
     return d_ptr->m_shared->selectionMode();
 }
@@ -372,17 +372,17 @@ QFont Q3DBars::font() const
 /*!
  * \property Q3DBars::labelTransparency
  *
- * \a transparency Transparency level of labels from \c LabelTransparency.
+ * \a transparency Transparency level of labels from \c QDataVis::LabelTransparency.
  * \c TransparencyFromTheme by default.
  *
  * Sets label transparency.
  */
-void Q3DBars::setLabelTransparency(LabelTransparency transparency)
+void Q3DBars::setLabelTransparency(QDataVis::LabelTransparency transparency)
 {
     d_ptr->m_shared->setLabelTransparency(transparency);
 }
 
-LabelTransparency Q3DBars::labelTransparency() const
+QDataVis::LabelTransparency Q3DBars::labelTransparency() const
 {
     return d_ptr->m_shared->labelTransparency();
 }
@@ -424,17 +424,17 @@ bool Q3DBars::isBackgroundVisible() const
 /*!
  * \property Q3DBars::shadowQuality
  *
- * \a quality Shadow quality from \c ShadowQuality. \c ShadowLow by default.
+ * \a quality Shadow quality from \c QDataVis::ShadowQuality. \c ShadowLow by default.
  *
- * Sets shadow quality. If setting ShadowQuality of a certain level fails, a level is lowered
+ * Sets shadow quality. If setting QDataVis::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 Q3DBars::setShadowQuality(ShadowQuality quality)
+void Q3DBars::setShadowQuality(QDataVis::ShadowQuality quality)
 {
     return d_ptr->m_shared->setShadowQuality(quality);
 }
 
-ShadowQuality Q3DBars::shadowQuality() const
+QDataVis::ShadowQuality Q3DBars::shadowQuality() const
 {
     return d_ptr->m_shared->shadowQuality();
 }
diff --git a/src/datavis3d/engine/q3dbars.h b/src/datavis3d/engine/q3dbars.h
index 49e2ebce..a0eb9cb5 100644
--- a/src/datavis3d/engine/q3dbars.h
+++ b/src/datavis3d/engine/q3dbars.h
@@ -19,7 +19,7 @@
 #ifndef Q3DBARS_H
 #define Q3DBARS_H
 
-#include <QtDataVis3D/qdatavis3dnamespace.h>
+#include <QtDataVis3D/qdatavis3denums.h>
 #include <QtDataVis3D/q3dwindow.h>
 #include <QFont>
 
@@ -33,17 +33,17 @@ class QBarDataProxy;
 class QT_DATAVIS3D_EXPORT Q3DBars : public Q3DWindow
 {
     Q_OBJECT
-    Q_PROPERTY(SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
-    Q_PROPERTY(LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
-    Q_PROPERTY(ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality)
+    Q_PROPERTY(QtDataVis3D::QDataVis::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
+    Q_PROPERTY(QtDataVis3D::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
+    Q_PROPERTY(QtDataVis3D::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality)
     Q_PROPERTY(QString windowTitle READ windowTitle WRITE setWindowTitle)
     Q_PROPERTY(QFont font READ font WRITE setFont)
     Q_PROPERTY(float fontSize READ fontSize WRITE setFontSize)
     Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible)
     Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible)
-    Q_ENUMS(SelectionMode)
-    Q_ENUMS(ShadowQuality)
-    Q_ENUMS(LabelTransparency)
+    Q_ENUMS(QtDataVis3D::QDataVis::SelectionMode)
+    Q_ENUMS(QtDataVis3D::QDataVis::ShadowQuality)
+    Q_ENUMS(QtDataVis3D::QDataVis::LabelTransparency)
 
 public:
     explicit Q3DBars();
@@ -57,7 +57,7 @@ public:
                      bool relative = true);
 
     // bar type; bars (=cubes), pyramids, cones, cylinders, etc.
-    void setBarType(MeshStyle style, bool smooth = false);
+    void setBarType(QDataVis::MeshStyle style, bool smooth = false);
 
     // how many samples per row and column, and names for axes
     // TODO: This defines the data window, needs additional parameters startRow, startColumn
@@ -65,7 +65,7 @@ public:
     QSize sampleSpace() const; // TODO: Return QRect once data window properly implemented?
 
     // Select preset camera placement
-    void setCameraPreset(CameraPreset preset);
+    void setCameraPreset(QDataVis::CameraPreset preset);
 
     // Set camera rotation if you don't want to use the presets (in horizontal (-180...180) and
     // vertical (0...90) (or (-90...90) if there are negative values) angles and distance in
@@ -74,7 +74,7 @@ public:
 
     // Set theme (bar colors, shaders, window color, background colors, light intensity and text
     // colors are affected)
-    void setTheme(ColorTheme theme);
+    void setTheme(QDataVis::ColorTheme theme);
 
     // Set color if you don't want to use themes. Set uniform to false if you want the (height)
     // color to change from bottom to top
@@ -86,8 +86,8 @@ public:
     // TODO: light placement API
 
     // Change selection mode; single bar, bar and row, bar and column, or all
-    void setSelectionMode(SelectionMode mode);
-    SelectionMode selectionMode() const;
+    void setSelectionMode(QDataVis::SelectionMode mode);
+    QDataVis::SelectionMode selectionMode() const;
 
     // Set window title
     void setWindowTitle(const QString &title);
@@ -102,8 +102,8 @@ public:
     QFont font() const;
 
     // Label transparency adjustment
-    void setLabelTransparency(LabelTransparency transparency);
-    LabelTransparency labelTransparency() const;
+    void setLabelTransparency(QDataVis::LabelTransparency transparency);
+    QDataVis::LabelTransparency labelTransparency() const;
 
     // Enable or disable background grid
     void setGridVisible(bool visible);
@@ -118,8 +118,8 @@ public:
     bool isBackgroundVisible() const;
 
     // Adjust shadow quality
-    void setShadowQuality(ShadowQuality quality);
-    ShadowQuality shadowQuality() const;
+    void setShadowQuality(QDataVis::ShadowQuality quality);
+    QDataVis::ShadowQuality shadowQuality() const;
 
     // Axes - row & column axes are fixed to category axes, value axis can be
     // customized.
@@ -134,11 +134,11 @@ public:
 
 public slots:
     // Used to detect when shadow quality changes autonomously due to e.g. resizing.
-    void handleShadowQualityUpdate(ShadowQuality quality);
+    void handleShadowQualityUpdate(QDataVis::ShadowQuality quality);
 
 signals:
     // Signals shadow quality changes.
-    void shadowQualityChanged(ShadowQuality quality);
+    void shadowQualityChanged(QDataVis::ShadowQuality quality);
 
 protected:
     void render();
diff --git a/src/datavis3d/engine/q3dbars_p.h b/src/datavis3d/engine/q3dbars_p.h
index 318b9192..9eed8162 100644
--- a/src/datavis3d/engine/q3dbars_p.h
+++ b/src/datavis3d/engine/q3dbars_p.h
@@ -30,7 +30,7 @@
 #define Q3DBARS_p_H
 
 #include "bars3dcontroller_p.h"
-#include "qdatavis3dnamespace.h"
+#include "qdatavis3denums.h"
 
 QT_DATAVIS3D_BEGIN_NAMESPACE
 
diff --git a/src/datavis3d/engine/q3dmaps.cpp b/src/datavis3d/engine/q3dmaps.cpp
index 9fd2ea69..ffa5ed1b 100644
--- a/src/datavis3d/engine/q3dmaps.cpp
+++ b/src/datavis3d/engine/q3dmaps.cpp
@@ -145,7 +145,7 @@ void Q3DMaps::setBarSpecs(const QVector3D &thickness, AdjustmentDirection direct
     d_ptr->m_shared->setBarSpecs(thickness, direction);
 }
 
-void Q3DMaps::setBarType(MeshStyle style, bool smooth)
+void Q3DMaps::setBarType(QDataVis::MeshStyle style, bool smooth)
 {
     d_ptr->m_shared->setBarType(style, smooth);
 }
@@ -155,7 +155,7 @@ void Q3DMaps::setMeshFileName(const QString &objFileName)
     d_ptr->m_shared->setMeshFileName(objFileName);
 }
 
-void Q3DMaps::setCameraPreset(CameraPreset preset)
+void Q3DMaps::setCameraPreset(QDataVis::CameraPreset preset)
 {
     d_ptr->m_shared->setCameraPreset(preset);
 }
@@ -165,7 +165,7 @@ void Q3DMaps::setCameraPosition(GLfloat horizontal, GLfloat vertical, GLint dist
     d_ptr->m_shared->setCameraPosition(horizontal, vertical, distance);
 }
 
-void Q3DMaps::setTheme(ColorTheme theme)
+void Q3DMaps::setTheme(QDataVis::ColorTheme theme)
 {
     d_ptr->m_shared->setTheme(theme);
 }
@@ -185,12 +185,12 @@ void Q3DMaps::setImage(const QImage &image)
     d_ptr->m_shared->setImage(image);
 }
 
-void Q3DMaps::setSelectionMode(SelectionMode mode)
+void Q3DMaps::setSelectionMode(QDataVis::SelectionMode mode)
 {
     d_ptr->m_shared->setSelectionMode(mode);
 }
 
-SelectionMode Q3DMaps::selectionMode() const
+QDataVis::SelectionMode Q3DMaps::selectionMode() const
 {
     return d_ptr->m_shared->selectionMode();
 }
@@ -225,22 +225,22 @@ QFont Q3DMaps::font() const
     return d_ptr->m_shared->font();
 }
 
-void Q3DMaps::setLabelTransparency(LabelTransparency transparency)
+void Q3DMaps::setLabelTransparency(QDataVis::LabelTransparency transparency)
 {
     d_ptr->m_shared->setLabelTransparency(transparency);
 }
 
-LabelTransparency Q3DMaps::labelTransparency() const
+QDataVis::LabelTransparency Q3DMaps::labelTransparency() const
 {
     return d_ptr->m_shared->labelTransparency();
 }
 
-ShadowQuality Q3DMaps::setShadowQuality(ShadowQuality quality)
+QDataVis::ShadowQuality Q3DMaps::setShadowQuality(QDataVis::ShadowQuality quality)
 {
     return d_ptr->m_shared->setShadowQuality(quality);
 }
 
-ShadowQuality Q3DMaps::shadowQuality() const
+QDataVis::ShadowQuality Q3DMaps::shadowQuality() const
 {
     return d_ptr->m_shared->shadowQuality();
 }
diff --git a/src/datavis3d/engine/q3dmaps.h b/src/datavis3d/engine/q3dmaps.h
index e32977e2..195b91e0 100644
--- a/src/datavis3d/engine/q3dmaps.h
+++ b/src/datavis3d/engine/q3dmaps.h
@@ -19,7 +19,7 @@
 #ifndef Q3DMAPS_H
 #define Q3DMAPS_H
 
-#include <QtDataVis3D/qdatavis3dnamespace.h>
+#include <QtDataVis3D/qdatavis3denums.h>
 #include <QtDataVis3D/q3dwindow.h>
 
 #include <QFont>
@@ -66,20 +66,20 @@ public:
                      AdjustmentDirection direction = AdjustHeight);
 
     // bar type; bars (=cubes), pyramids, cones, cylinders, balls, etc.
-    void setBarType(MeshStyle style, bool smooth = false);
+    void setBarType(QDataVis::MeshStyle style, bool smooth = false);
 
     // override bar type with own mesh
     void setMeshFileName(const QString &objFileName);
 
     // Select preset camera placement
-    void setCameraPreset(CameraPreset preset);
+    void setCameraPreset(QDataVis::CameraPreset preset);
 
     // Set camera rotation if you don't want to use the presets (in horizontal (-180...180) and
     // vertical (0...90) angles and distance in percentage (10...500))
     void setCameraPosition(GLfloat horizontal, GLfloat vertical, GLint distance = 100);
 
     // Set theme (bar colors, shaders, window color, background colors, light intensity and text colors are affected)
-    void setTheme(ColorTheme theme);
+    void setTheme(QDataVis::ColorTheme theme);
 
     // Set color if you don't want to use themes. Set uniform to false if you want the (height) color to change from bottom to top
     void setBarColor(QColor baseColor, QColor heightColor, bool uniform = true);
@@ -93,8 +93,8 @@ public:
     // TODO: light placement API
 
     // Change selection mode; single bar, bar and row, bar and column, or all
-    void setSelectionMode(SelectionMode mode);
-    SelectionMode selectionMode() const;
+    void setSelectionMode(QDataVis::SelectionMode mode);
+    QDataVis::SelectionMode selectionMode() const;
 
     // Set window title
     void setWindowTitle(const QString &title);
@@ -109,12 +109,12 @@ public:
     QFont font() const;
 
     // Label transparency adjustment
-    void setLabelTransparency(LabelTransparency transparency);
-    LabelTransparency labelTransparency() const;
+    void setLabelTransparency(QDataVis::LabelTransparency transparency);
+    QDataVis::LabelTransparency labelTransparency() const;
 
     // Adjust shadow quality
-    ShadowQuality setShadowQuality(ShadowQuality quality);
-    ShadowQuality shadowQuality() const;
+    QDataVis::ShadowQuality setShadowQuality(QDataVis::ShadowQuality quality);
+    QDataVis::ShadowQuality shadowQuality() const;
 
     // Sets the data proxy. Assumes ownership of the data proxy. Deletes old proxy.
     void setDataProxy(QMapDataProxy *proxy);
diff --git a/src/datavis3d/engine/q3dmaps_p.h b/src/datavis3d/engine/q3dmaps_p.h
index a27370dc..166ed8f7 100644
--- a/src/datavis3d/engine/q3dmaps_p.h
+++ b/src/datavis3d/engine/q3dmaps_p.h
@@ -30,7 +30,7 @@
 #define Q3DMAPS_P_H
 
 #include "maps3dcontroller_p.h"
-#include "qdatavis3dnamespace.h"
+#include "qdatavis3denums.h"
 
 QT_DATAVIS3D_BEGIN_NAMESPACE
 
diff --git a/src/datavis3d/engine/q3dscatter.cpp b/src/datavis3d/engine/q3dscatter.cpp
index d9e03306..0493e444 100644
--- a/src/datavis3d/engine/q3dscatter.cpp
+++ b/src/datavis3d/engine/q3dscatter.cpp
@@ -102,7 +102,7 @@ void Q3DScatter::render()
     d_ptr->m_shared->render();
 }
 
-void Q3DScatter::handleShadowQualityUpdate(ShadowQuality quality)
+void Q3DScatter::handleShadowQualityUpdate(QDataVis::ShadowQuality quality)
 {
     emit shadowQualityChanged(quality);
 }
@@ -181,7 +181,7 @@ void Q3DScatter::setHeight(const int height)
 }
 
 /*!
- * \a style One of the values in \c MeshStyle. \c Spheres by default.
+ * \a style One of the values in \c QDataVis::MeshStyle. \c Spheres by default.
  *
  * \a smooth A flag to set shading to smooth. \c false by default.
  *
@@ -189,17 +189,17 @@ void Q3DScatter::setHeight(const int height)
  *
  * \sa setMeshFileName()
  */
-void Q3DScatter::setObjectType(MeshStyle style, bool smooth)
+void Q3DScatter::setObjectType(QDataVis::MeshStyle style, bool smooth)
 {
     d_ptr->m_shared->setObjectType(style, smooth);
 }
 
 /*!
- * \a preset Move camera to a predefined position from \c CameraPreset.
+ * \a preset Move camera to a predefined position from \c QDataVis::CameraPreset.
  *
  * Moves camera to a predefined position.
  */
-void Q3DScatter::setCameraPreset(CameraPreset preset)
+void Q3DScatter::setCameraPreset(QDataVis::CameraPreset preset)
 {
     d_ptr->m_shared->setCameraPreset(preset);
 }
@@ -221,12 +221,12 @@ void Q3DScatter::setCameraPosition(qreal horizontal, qreal vertical, int distanc
 }
 
 /*!
- * \a theme Apply a predefined theme from \c ColorTheme.
+ * \a theme Apply a predefined theme from \c QDataVis::ColorTheme.
  *
  * Sets a predefined theme. Theme affects object colors, label colors, text color, background color,
  * window color and grid color. Lighting is also adjusted by themes.
  */
-void Q3DScatter::setTheme(ColorTheme theme)
+void Q3DScatter::setTheme(QDataVis::ColorTheme theme)
 {
     d_ptr->m_shared->setColorTheme(theme);
 }
@@ -255,16 +255,16 @@ void Q3DScatter::setObjectColor(QColor baseColor, QColor heightColor, QColor dep
 /*!
  * \property Q3DScatter::selectionMode
  *
- * \a mode Set object selection mode from \c SelectionMode. \c ModeItem by default.
+ * \a mode Set object selection mode from \c QDataVis::SelectionMode. \c ModeItem by default.
  *
  * Sets object selection mode to be used.
  */
-void Q3DScatter::setSelectionMode(SelectionMode mode)
+void Q3DScatter::setSelectionMode(QDataVis::SelectionMode mode)
 {
     d_ptr->m_shared->setSelectionMode(mode);
 }
 
-SelectionMode Q3DScatter::selectionMode() const
+QDataVis::SelectionMode Q3DScatter::selectionMode() const
 {
     return d_ptr->m_shared->selectionMode();
 }
@@ -334,17 +334,17 @@ QFont Q3DScatter::font() const
 /*!
  * \property Q3DScatter::labelTransparency
  *
- * \a transparency Transparency level of labels from \c LabelTransparency.
+ * \a transparency Transparency level of labels from \c QDataVis::LabelTransparency.
  * \c TransparencyFromTheme by default.
  *
  * Sets label transparency.
  */
-void Q3DScatter::setLabelTransparency(LabelTransparency transparency)
+void Q3DScatter::setLabelTransparency(QDataVis::LabelTransparency transparency)
 {
     d_ptr->m_shared->setLabelTransparency(transparency);
 }
 
-LabelTransparency Q3DScatter::labelTransparency() const
+QDataVis::LabelTransparency Q3DScatter::labelTransparency() const
 {
     return d_ptr->m_shared->labelTransparency();
 }
@@ -386,17 +386,17 @@ bool Q3DScatter::isBackgroundVisible() const
 /*!
  * \property Q3DScatter::shadowQuality
  *
- * \a quality Shadow quality from \c ShadowQuality. \c ShadowLow by default.
+ * \a quality Shadow quality from \c QDataVis::ShadowQuality. \c ShadowLow by default.
  *
- * Sets shadow quality. If setting ShadowQuality of a certain level fails, a level is lowered
+ * Sets shadow quality. If setting QDataVis::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 Q3DScatter::setShadowQuality(ShadowQuality quality)
+void Q3DScatter::setShadowQuality(QDataVis::ShadowQuality quality)
 {
     return d_ptr->m_shared->setShadowQuality(quality);
 }
 
-ShadowQuality Q3DScatter::shadowQuality() const
+QDataVis::ShadowQuality Q3DScatter::shadowQuality() const
 {
     return d_ptr->m_shared->shadowQuality();
 }
diff --git a/src/datavis3d/engine/q3dscatter.h b/src/datavis3d/engine/q3dscatter.h
index cd0ec072..73a7d214 100644
--- a/src/datavis3d/engine/q3dscatter.h
+++ b/src/datavis3d/engine/q3dscatter.h
@@ -19,7 +19,7 @@
 #ifndef Q3DSCATTER_H
 #define Q3DSCATTER_H
 
-#include <QtDataVis3D/qdatavis3dnamespace.h>
+#include <QtDataVis3D/qdatavis3denums.h>
 #include <QtDataVis3D/q3dwindow.h>
 #include <QFont>
 
@@ -34,27 +34,27 @@ class QScatterDataProxy;
 class QT_DATAVIS3D_EXPORT Q3DScatter : public Q3DWindow
 {
     Q_OBJECT
-    Q_PROPERTY(SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
-    Q_PROPERTY(LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
-    Q_PROPERTY(ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality)
+    Q_PROPERTY(QtDataVis3D::QDataVis::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
+    Q_PROPERTY(QtDataVis3D::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
+    Q_PROPERTY(QtDataVis3D::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality)
     Q_PROPERTY(QString windowTitle READ windowTitle WRITE setWindowTitle)
     Q_PROPERTY(QFont font READ font WRITE setFont)
     Q_PROPERTY(float fontSize READ fontSize WRITE setFontSize)
     Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible)
     Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible)
-    Q_ENUMS(SelectionMode)
-    Q_ENUMS(ShadowQuality)
-    Q_ENUMS(LabelTransparency)
+    Q_ENUMS(QtDataVis3D::QDataVis::SelectionMode)
+    Q_ENUMS(QtDataVis3D::QDataVis::ShadowQuality)
+    Q_ENUMS(QtDataVis3D::QDataVis::LabelTransparency)
 
 public:
     explicit Q3DScatter();
     ~Q3DScatter();
 
     // object type; spheres, dots
-    void setObjectType(MeshStyle style, bool smooth = false);
+    void setObjectType(QDataVis::MeshStyle style, bool smooth = false);
 
     // Select preset camera placement
-    void setCameraPreset(CameraPreset preset);
+    void setCameraPreset(QDataVis::CameraPreset preset);
 
     // Set camera rotation if you don't want to use the presets (in horizontal (-180...180) and
     // vertical (-90...90) angles and distance in percentage (10...500))
@@ -62,7 +62,7 @@ public:
 
     // Set theme (object colors, shaders, window color, background colors, light intensity and text
     // colors are affected)
-    void setTheme(ColorTheme theme);
+    void setTheme(QDataVis::ColorTheme theme);
 
     // Set color if you don't want to use themes. Set uniform to false if you want the (height)
     // color to change from bottom to top
@@ -73,8 +73,8 @@ public:
     void setMeshFileName(const QString &objFileName);
 
     // Change selection mode
-    void setSelectionMode(SelectionMode mode);
-    SelectionMode selectionMode() const;
+    void setSelectionMode(QDataVis::SelectionMode mode);
+    QDataVis::SelectionMode selectionMode() const;
 
     // Set window title
     void setWindowTitle(const QString &title);
@@ -89,8 +89,8 @@ public:
     QFont font() const;
 
     // Label transparency adjustment
-    void setLabelTransparency(LabelTransparency transparency);
-    LabelTransparency labelTransparency() const;
+    void setLabelTransparency(QDataVis::LabelTransparency transparency);
+    QDataVis::LabelTransparency labelTransparency() const;
 
     // Enable or disable background grid
     void setGridVisible(bool visible);
@@ -105,8 +105,8 @@ public:
     bool isBackgroundVisible() const;
 
     // Adjust shadow quality
-    void setShadowQuality(ShadowQuality quality);
-    ShadowQuality shadowQuality() const;
+    void setShadowQuality(QDataVis::ShadowQuality quality);
+    QDataVis::ShadowQuality shadowQuality() const;
 
     // Axes
     void setValueAxisX(QValueAxis *axis);
@@ -124,11 +124,11 @@ public:
 
 public slots:
     // Used to detect when shadow quality changes autonomously due to e.g. resizing.
-    void handleShadowQualityUpdate(ShadowQuality quality);
+    void handleShadowQualityUpdate(QDataVis::ShadowQuality quality);
 
 signals:
     // Signals shadow quality changes.
-    void shadowQualityChanged(ShadowQuality quality);
+    void shadowQualityChanged(QDataVis::ShadowQuality quality);
 
 protected:
     void render();
diff --git a/src/datavis3d/engine/q3dscatter_p.h b/src/datavis3d/engine/q3dscatter_p.h
index 0bab65cd..ab2e2b06 100644
--- a/src/datavis3d/engine/q3dscatter_p.h
+++ b/src/datavis3d/engine/q3dscatter_p.h
@@ -30,7 +30,7 @@
 #define Q3DSCATTER_p_H
 
 #include "scatter3dcontroller_p.h"
-#include "qdatavis3dnamespace.h"
+#include "qdatavis3denums.h"
 
 QT_DATAVIS3D_BEGIN_NAMESPACE
 
diff --git a/src/datavis3d/engine/q3dsurface.h b/src/datavis3d/engine/q3dsurface.h
index 96a4fd62..c2deea9a 100644
--- a/src/datavis3d/engine/q3dsurface.h
+++ b/src/datavis3d/engine/q3dsurface.h
@@ -19,7 +19,7 @@
 #ifndef Q3DSURFACE_H
 #define Q3DSURFACE_H
 
-#include <QtDataVis3D/qdatavis3dnamespace.h>
+#include <QtDataVis3D/qdatavis3denums.h>
 #include <QtDataVis3D/q3dwindow.h>
 
 QT_DATAVIS3D_BEGIN_NAMESPACE
diff --git a/src/datavis3d/engine/q3dsurface_p.h b/src/datavis3d/engine/q3dsurface_p.h
index e3b23730..1e132416 100644
--- a/src/datavis3d/engine/q3dsurface_p.h
+++ b/src/datavis3d/engine/q3dsurface_p.h
@@ -30,7 +30,7 @@
 #define Q3DSURFACE_P_H
 
 #include "surface3dcontroller_p.h"
-#include "qdatavis3dnamespace.h"
+#include "qdatavis3denums.h"
 
 #include <QList>
 
diff --git a/src/datavis3d/engine/q3dwindow.h b/src/datavis3d/engine/q3dwindow.h
index f6e11ea5..e9f8fe1d 100644
--- a/src/datavis3d/engine/q3dwindow.h
+++ b/src/datavis3d/engine/q3dwindow.h
@@ -19,7 +19,7 @@
 #ifndef Q3DWINDOW_H
 #define Q3DWINDOW_H
 
-#include <QtDataVis3D/qdatavis3dnamespace.h>
+#include <QtDataVis3D/qdatavis3denums.h>
 
 #include <QWindow>
 #include <QOpenGLFunctions>
diff --git a/src/datavis3d/engine/scatter3dcontroller.cpp b/src/datavis3d/engine/scatter3dcontroller.cpp
index abbf0ed5..89646af7 100644
--- a/src/datavis3d/engine/scatter3dcontroller.cpp
+++ b/src/datavis3d/engine/scatter3dcontroller.cpp
@@ -37,7 +37,7 @@ Scatter3DController::Scatter3DController(QRect boundRect)
       m_isInitialized(false),
       m_mouseState(MouseNone),
       m_mousePos(QPoint(0, 0)),
-      m_selectionMode(ModeItem),
+      m_selectionMode(QDataVis::ModeItem),
       m_isSlicingActivated(false),
       m_objFile(QStringLiteral(":/defaultMeshes/sphere")),
       m_font(QFont(QStringLiteral("Arial"))),
@@ -301,9 +301,9 @@ QString Scatter3DController::objFile()
     return m_objFile;
 }
 
-void Scatter3DController::setObjectType(MeshStyle style, bool smooth)
+void Scatter3DController::setObjectType(QDataVis::MeshStyle style, bool smooth)
 {
-    if (style == Spheres) {
+    if (style == QDataVis::Spheres) {
         if (smooth)
             m_objFile = QStringLiteral(":/defaultMeshes/sphereSmooth");
         else
@@ -325,9 +325,9 @@ void Scatter3DController::setMeshFileName(const QString &objFileName)
     emit objFileChanged(m_objFile);
 }
 
-void Scatter3DController::setSelectionMode(SelectionMode mode)
+void Scatter3DController::setSelectionMode(QDataVis::SelectionMode mode)
 {
-    if (mode > ModeItem) {
+    if (mode > QDataVis::ModeItem) {
         qWarning("Unsupported selection mode.");
         return;
     }
@@ -342,7 +342,7 @@ QPoint Scatter3DController::mousePosition()
     return m_mousePos;
 }
 
-SelectionMode Scatter3DController::selectionMode()
+QDataVis::SelectionMode Scatter3DController::selectionMode()
 {
     return m_selectionMode;
 }
diff --git a/src/datavis3d/engine/scatter3dcontroller_p.h b/src/datavis3d/engine/scatter3dcontroller_p.h
index b9d3e44b..96d3391f 100644
--- a/src/datavis3d/engine/scatter3dcontroller_p.h
+++ b/src/datavis3d/engine/scatter3dcontroller_p.h
@@ -66,7 +66,7 @@ private:
     // Interaction
     MouseState m_mouseState;
     QPoint m_mousePos;
-    SelectionMode m_selectionMode;
+    QDataVis::SelectionMode m_selectionMode;
     bool m_isSlicingActivated;
 
     // Look'n'Feel
@@ -96,15 +96,15 @@ public:
                                    bool showUnder = false);
 
     // bar type; bars (=cubes), pyramids, cones, cylinders, etc.
-    void setObjectType(MeshStyle style, bool smooth = false);
+    void setObjectType(QDataVis::MeshStyle style, bool smooth = false);
     QString objFile();
 
     // override bar type with own mesh
     void setMeshFileName(const QString &objFileName);
 
     // Change selection mode; single bar, bar and row, bar and column, or all
-    void setSelectionMode(SelectionMode mode);
-    SelectionMode selectionMode();
+    void setSelectionMode(QDataVis::SelectionMode mode);
+    QDataVis::SelectionMode selectionMode();
 
     // Font size adjustment
     void setFontSize(float fontsize);
@@ -145,7 +145,7 @@ public slots:
     virtual void handleAxisAutoAdjustRangeChanged(bool autoAdjust);
 
 signals:
-    void selectionModeChanged(SelectionMode mode);
+    void selectionModeChanged(QDataVis::SelectionMode mode);
     void slicingActiveChanged(bool isSlicing);
     void objFileChanged(QString fileName);
     void fontChanged(QFont font);
diff --git a/src/datavis3d/engine/scatter3drenderer.cpp b/src/datavis3d/engine/scatter3drenderer.cpp
index 34b2da39..e0c4bdf9 100644
--- a/src/datavis3d/engine/scatter3drenderer.cpp
+++ b/src/datavis3d/engine/scatter3drenderer.cpp
@@ -373,7 +373,7 @@ void Scatter3DRenderer::drawScene(CameraHelper *camera,
     QMatrix4x4 depthProjectionMatrix;
 
 #if !defined(QT_OPENGL_ES_2)
-    if (m_cachedShadowQuality > ShadowNone) {
+    if (m_cachedShadowQuality > QDataVis::ShadowNone) {
         // Render scene into a depth texture for using with shadow mapping
         // Bind depth shader
         m_depthShader->bind();
@@ -486,7 +486,7 @@ void Scatter3DRenderer::drawScene(CameraHelper *camera,
 #endif
 
     // Skip selection mode drawing if we have no selection mode
-    if (m_cachedSelectionMode > ModeNone) {
+    if (m_cachedSelectionMode > QDataVis::ModeNone) {
         // Bind selection shader
         m_selectionShader->bind();
 
@@ -643,7 +643,7 @@ void Scatter3DRenderer::drawScene(CameraHelper *camera,
         QVector3D barColor = baseColor + heightColor;
 
         GLfloat lightStrength = m_cachedTheme.m_lightStrength;
-        if (m_cachedSelectionMode > ModeNone) {
+        if (m_cachedSelectionMode > QDataVis::ModeNone) {
             Scatter3DController::SelectionType selectionType = isSelected(bar, m_selection);
             switch (selectionType) {
             case Scatter3DController::SelectionBar: {
@@ -678,7 +678,7 @@ void Scatter3DRenderer::drawScene(CameraHelper *camera,
         m_dotShader->setUniformValue(m_dotShader->ambientS(), m_cachedTheme.m_ambientStrength);
 
 #if !defined(QT_OPENGL_ES_2)
-        if (m_cachedShadowQuality > ShadowNone) {
+        if (m_cachedShadowQuality > QDataVis::ShadowNone) {
             // Set shadow shader bindings
             m_dotShader->setUniformValue(m_dotShader->shadowQ(), m_shadowQualityToShader);
             m_dotShader->setUniformValue(m_dotShader->depth(), depthMVPMatrix);
@@ -755,7 +755,7 @@ void Scatter3DRenderer::drawScene(CameraHelper *camera,
                                             m_cachedTheme.m_ambientStrength * 2.0f);
 
 #if !defined(QT_OPENGL_ES_2)
-        if (m_cachedShadowQuality > ShadowNone) {
+        if (m_cachedShadowQuality > QDataVis::ShadowNone) {
             // Set shadow shader bindings
             m_backgroundShader->setUniformValue(m_backgroundShader->shadowQ(),
                                                 m_shadowQualityToShader);
@@ -860,7 +860,7 @@ void Scatter3DRenderer::drawScene(CameraHelper *camera,
                 m_dotShader->setUniformValue(m_dotShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-                if (m_cachedShadowQuality > ShadowNone) {
+                if (m_cachedShadowQuality > QDataVis::ShadowNone) {
                     // Set shadow shader bindings
                     m_dotShader->setUniformValue(m_dotShader->shadowQ(), m_shadowQualityToShader);
                     m_dotShader->setUniformValue(m_dotShader->depth(), depthMVPMatrix);
@@ -940,7 +940,7 @@ void Scatter3DRenderer::drawScene(CameraHelper *camera,
                 m_dotShader->setUniformValue(m_dotShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-                if (m_cachedShadowQuality > ShadowNone) {
+                if (m_cachedShadowQuality > QDataVis::ShadowNone) {
                     // Set shadow shader bindings
                     m_dotShader->setUniformValue(m_dotShader->shadowQ(), m_shadowQualityToShader);
                     m_dotShader->setUniformValue(m_dotShader->depth(), depthMVPMatrix);
@@ -1012,7 +1012,7 @@ void Scatter3DRenderer::drawScene(CameraHelper *camera,
                 m_dotShader->setUniformValue(m_dotShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-                if (m_cachedShadowQuality > ShadowNone) {
+                if (m_cachedShadowQuality > QDataVis::ShadowNone) {
                     // Set shadow shader bindings
                     m_dotShader->setUniformValue(m_dotShader->shadowQ(), m_shadowQualityToShader);
                     m_dotShader->setUniformValue(m_dotShader->depth(), depthMVPMatrix);
@@ -1082,7 +1082,7 @@ void Scatter3DRenderer::drawScene(CameraHelper *camera,
                 m_dotShader->setUniformValue(m_dotShader->MVP(), MVPMatrix);
 
 #if !defined(QT_OPENGL_ES_2)
-                if (m_cachedShadowQuality > ShadowNone) {
+                if (m_cachedShadowQuality > QDataVis::ShadowNone) {
                     // Set shadow shader bindings
                     m_dotShader->setUniformValue(m_dotShader->shadowQ(), m_shadowQualityToShader);
                     m_dotShader->setUniformValue(m_dotShader->depth(), depthMVPMatrix);
@@ -1117,7 +1117,7 @@ void Scatter3DRenderer::drawScene(CameraHelper *camera,
         m_labelShader->bind();
         glDisable(GL_DEPTH_TEST);
         glEnable(GL_TEXTURE_2D);
-        if (m_cachedLabelTransparency > TransparencyNone) {
+        if (m_cachedLabelTransparency > QDataVis::TransparencyNone) {
             glEnable(GL_BLEND);
             glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
         }
@@ -1152,7 +1152,7 @@ void Scatter3DRenderer::drawScene(CameraHelper *camera,
                             m_labelObj, camera, true, false, Drawer::LabelMid);
 #endif
         glDisable(GL_TEXTURE_2D);
-        if (m_cachedLabelTransparency > TransparencyNone)
+        if (m_cachedLabelTransparency > QDataVis::TransparencyNone)
             glDisable(GL_BLEND);
         glEnable(GL_DEPTH_TEST);
 
@@ -1170,7 +1170,7 @@ void Scatter3DRenderer::drawScene(CameraHelper *camera,
     m_labelShader->bind();
 
     glEnable(GL_TEXTURE_2D);
-    if (m_cachedLabelTransparency > TransparencyNone) {
+    if (m_cachedLabelTransparency > QDataVis::TransparencyNone) {
         glEnable(GL_BLEND);
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     }
@@ -1366,7 +1366,7 @@ void Scatter3DRenderer::drawScene(CameraHelper *camera,
         }
     }
     glDisable(GL_TEXTURE_2D);
-    if (m_cachedLabelTransparency > TransparencyNone)
+    if (m_cachedLabelTransparency > QDataVis::TransparencyNone)
         glDisable(GL_BLEND);
 
     // Release label shader
@@ -1401,7 +1401,7 @@ void Scatter3DRenderer::updateMeshFileName(const QString &objFileName)
     loadBarMesh();
 }
 
-void Scatter3DRenderer::updateSelectionMode(SelectionMode mode)
+void Scatter3DRenderer::updateSelectionMode(QDataVis::SelectionMode mode)
 {
     //qDebug() << __FUNCTION__;
     m_cachedSelectionMode = mode;
@@ -1423,18 +1423,18 @@ void Scatter3DRenderer::updateBackgroundEnabled(bool enable)
     }
 }
 
-void Scatter3DRenderer::updateShadowQuality(ShadowQuality quality)
+void Scatter3DRenderer::updateShadowQuality(QDataVis::ShadowQuality quality)
 {
     qDebug() << "Scatter3DRenderer::setShadowQuality" << quality;
     m_cachedShadowQuality = quality;
     switch (quality) {
-    case ShadowLow:
+    case QDataVis::ShadowLow:
         m_shadowQualityToShader = 33.3f;
         break;
-    case ShadowMedium:
+    case QDataVis::ShadowMedium:
         m_shadowQualityToShader = 100.0f;
         break;
-    case ShadowHigh:
+    case QDataVis::ShadowHigh:
         m_shadowQualityToShader = 200.0f;
         break;
     default:
@@ -1442,7 +1442,7 @@ void Scatter3DRenderer::updateShadowQuality(ShadowQuality quality)
         break;
     }
 #if !defined(QT_OPENGL_ES_2)
-    if (m_cachedShadowQuality > ShadowNone) {
+    if (m_cachedShadowQuality > QDataVis::ShadowNone) {
         // Re-init shaders
         if (!m_cachedTheme.m_uniformColor) {
             initShaders(QStringLiteral(":/shaders/vertexShadow"),
@@ -1657,23 +1657,23 @@ void Scatter3DRenderer::updateDepthBuffer()
         m_depthTexture = 0;
     }
 
-    if (m_cachedShadowQuality > ShadowNone) {
+    if (m_cachedShadowQuality > QDataVis::ShadowNone) {
         m_depthTexture = m_textureHelper->createDepthTexture(m_mainViewPort.size(),
                                                              m_depthFrameBuffer,
                                                              m_cachedShadowQuality);
         if (!m_depthTexture) {
             switch (m_cachedShadowQuality) {
-            case ShadowHigh:
+            case QDataVis::ShadowHigh:
                 qWarning("Creating high quality shadows failed. Changing to medium quality.");
-                (void)m_controller->setShadowQuality(ShadowMedium);
+                (void)m_controller->setShadowQuality(QDataVis::ShadowMedium);
                 break;
-            case ShadowMedium:
+            case QDataVis::ShadowMedium:
                 qWarning("Creating medium quality shadows failed. Changing to low quality.");
-                (void)m_controller->setShadowQuality(ShadowLow);
+                (void)m_controller->setShadowQuality(QDataVis::ShadowLow);
                 break;
-            case ShadowLow:
+            case QDataVis::ShadowLow:
                 qWarning("Creating low quality shadows failed. Switching shadows off.");
-                (void)m_controller->setShadowQuality(ShadowNone);
+                (void)m_controller->setShadowQuality(QDataVis::ShadowNone);
                 break;
             default:
                 // You'll never get here
diff --git a/src/datavis3d/engine/scatter3drenderer_p.h b/src/datavis3d/engine/scatter3drenderer_p.h
index 4d4c8a19..bae41a14 100644
--- a/src/datavis3d/engine/scatter3drenderer_p.h
+++ b/src/datavis3d/engine/scatter3drenderer_p.h
@@ -75,7 +75,7 @@ private:
 
     // Cached state based on emitted signals from the controller
     QString m_cachedObjFile;
-    SelectionMode m_cachedSelectionMode;
+    QDataVis::SelectionMode m_cachedSelectionMode;
     int m_cachedZoomLevel;
     bool m_cachedIsGridEnabled;
     bool m_cachedIsBackgroundEnabled;
@@ -137,7 +137,7 @@ public:
     QRect mainViewPort();
 
 public slots:
-    void updateSelectionMode(SelectionMode newMode);
+    void updateSelectionMode(QDataVis::SelectionMode newMode);
     void updateZoomLevel(int newZoomLevel);
     void updateGridEnabled(bool enable);
     void updateBackgroundEnabled(bool enable);
@@ -158,7 +158,7 @@ private:
     virtual void initializePreOpenGL();
     virtual void initializeOpenGL();
     virtual void initShaders(const QString &vertexShader, const QString &fragmentShader);
-    virtual void updateShadowQuality(ShadowQuality quality);
+    virtual void updateShadowQuality(QDataVis::ShadowQuality quality);
     virtual void updateTextures();
 
     void drawScene(CameraHelper *camera, const GLuint defaultFboHandle);
diff --git a/src/datavis3d/engine/surface3dcontroller_p.h b/src/datavis3d/engine/surface3dcontroller_p.h
index ab33ef6d..74f825f9 100644
--- a/src/datavis3d/engine/surface3dcontroller_p.h
+++ b/src/datavis3d/engine/surface3dcontroller_p.h
@@ -58,7 +58,7 @@ private:
     // Interaction
     MouseState m_mouseState;
     QPoint m_mousePos;
-    SelectionMode m_selectionMode;
+    QDataVis::SelectionMode m_selectionMode;
 
 public:
     explicit Surface3dController(QRect rect);
diff --git a/src/datavis3d/engine/surface3drenderer.cpp b/src/datavis3d/engine/surface3drenderer.cpp
index 13f95460..781ff090 100644
--- a/src/datavis3d/engine/surface3drenderer.cpp
+++ b/src/datavis3d/engine/surface3drenderer.cpp
@@ -47,8 +47,8 @@ Surface3dRenderer::Surface3dRenderer(Surface3dController *controller)
       m_mousePos(QPoint(0, 0)),
       m_isGridEnabled(true),
       m_isBackgroundEnabled(true),
-      m_shadowQuality(ShadowLow),
-      m_labelTransparency(TransparencyFromTheme),
+      m_shadowQuality(QDataVis::ShadowLow),
+      m_labelTransparency(QDataVis::TransparencyFromTheme),
       m_font(QFont(QStringLiteral("Arial"))),
       m_hasNegativeValues(false),
       m_segmentYCount(0),
@@ -138,7 +138,7 @@ void Surface3dRenderer::initializeOpenGL()
 
     // Initialize shaders
 #if !defined(QT_OPENGL_ES_2)
-    if (m_shadowQuality > ShadowNone) {
+    if (m_shadowQuality > QDataVis::ShadowNone) {
         initBackgroundShaders(QStringLiteral(":/shaders/vertexShadow"),
                               QStringLiteral(":/shaders/fragmentShadowNoTex"));
     } else {
@@ -452,7 +452,7 @@ void Surface3dRenderer::drawScene(CameraHelper *camera, const GLuint defaultFboH
                                             m_cachedTheme.m_ambientStrength * 2.0f);
 
 #if !defined(QT_OPENGL_ES_2)
-        if (m_shadowQuality > ShadowNone) {
+        if (m_shadowQuality > QDataVis::ShadowNone) {
             // Set shadow shader bindings
             m_backgroundShader->setUniformValue(m_backgroundShader->shadowQ(),
                                                 m_shadowQualityToShader);
@@ -806,7 +806,7 @@ void Surface3dRenderer::updateDepthBuffer()
     }
 
     // TODO: bars uses some m_cachedShadowQuality
-    if (m_shadowQuality > ShadowNone && !m_mainViewPort.size().isEmpty()) {
+    if (m_shadowQuality > QDataVis::ShadowNone && !m_mainViewPort.size().isEmpty()) {
         m_depthTexture = m_textureHelper->createDepthTexture(m_mainViewPort.size(),
                                                              m_depthFrameBuffer,
                                                              m_shadowQuality);
diff --git a/src/datavis3d/engine/surface3drenderer_p.h b/src/datavis3d/engine/surface3drenderer_p.h
index 71b9600d..f2fb120a 100644
--- a/src/datavis3d/engine/surface3drenderer_p.h
+++ b/src/datavis3d/engine/surface3drenderer_p.h
@@ -70,16 +70,16 @@ public:
     // Interaction related parameters // TODO: Moved to controller
     MousePressType m_mousePressed;
     QPoint m_mousePos;
-    SelectionMode m_selectionMode;
+    QDataVis::SelectionMode m_selectionMode;
 
     // Visual parameters
     QRect m_boundingRect;
     Theme m_cachedTheme;
-    LabelTransparency m_labelTransparency;
+    QDataVis::LabelTransparency m_labelTransparency;
     QFont m_font;
     bool m_isGridEnabled;
     bool m_isBackgroundEnabled;
-    ShadowQuality m_shadowQuality;
+    QDataVis::ShadowQuality m_shadowQuality;
     bool m_hasNegativeValues;
 
 private:
diff --git a/src/datavis3d/engine/theme.cpp b/src/datavis3d/engine/theme.cpp
index 1c12a12e..7b2cb210 100644
--- a/src/datavis3d/engine/theme.cpp
+++ b/src/datavis3d/engine/theme.cpp
@@ -53,16 +53,16 @@ Theme::~Theme()
 {
 }
 
-ColorTheme Theme::colorTheme()
+QDataVis::ColorTheme Theme::colorTheme()
 {
     return m_colorTheme;
 }
 
-void Theme::useColorTheme(ColorTheme colorTheme)
+void Theme::useColorTheme(QDataVis::ColorTheme colorTheme)
 {
     m_colorTheme = colorTheme;
     switch (colorTheme) {
-    case ThemeSystem: {
+    case QDataVis::ThemeSystem: {
 #ifdef Q_OS_WIN
         DWORD colorHighlight;
         colorHighlight = GetSysColor(COLOR_HIGHLIGHT);
@@ -145,7 +145,7 @@ void Theme::useColorTheme(ColorTheme colorTheme)
         qDebug("ThemeSystem");
         break;
     }
-    case ThemeBlueCerulean: {
+    case QDataVis::ThemeBlueCerulean: {
         m_baseColor = QColor(QRgb(0xc7e85b));
         m_heightColor = QColor(QRgb(0xee7392));
         m_depthColor = QColor(QRgb(0x1cb54f));
@@ -164,7 +164,7 @@ void Theme::useColorTheme(ColorTheme colorTheme)
         qDebug("ThemeBlueCerulean");
         break;
     }
-    case ThemeBlueIcy: {
+    case QDataVis::ThemeBlueIcy: {
         m_baseColor = QRgb(0x3daeda);
         m_heightColor = QRgb(0x2fa3b4);
         m_depthColor = QColor(QRgb(0x2685bf));
@@ -183,7 +183,7 @@ void Theme::useColorTheme(ColorTheme colorTheme)
         qDebug("ThemeBlueIcy");
         break;
     }
-    case ThemeBlueNcs: {
+    case QDataVis::ThemeBlueNcs: {
         m_baseColor = QColor(QRgb(0x1db0da));
         m_heightColor = QColor(QRgb(0x398ca3));
         m_depthColor = QColor(QRgb(0x1341a6));
@@ -202,7 +202,7 @@ void Theme::useColorTheme(ColorTheme colorTheme)
         qDebug("ThemeBlueNcs");
         break;
     }
-    case ThemeBrownSand: {
+    case QDataVis::ThemeBrownSand: {
         m_baseColor = QColor(QRgb(0xb39b72));
         m_heightColor = QColor(QRgb(0x494345));
         m_depthColor = QColor(QRgb(0xb3b376));
@@ -221,7 +221,7 @@ void Theme::useColorTheme(ColorTheme colorTheme)
         qDebug("ThemeBrownSand");
         break;
     }
-    case ThemeDark: {
+    case QDataVis::ThemeDark: {
         m_baseColor = QColor(QRgb(0x38ad6b));               // charts: series color 1
         m_heightColor = QColor(QRgb(0xbf593e));             // charts: series color 5
         m_depthColor = QColor(QRgb(0x3c84a7));              // charts: series color 2
@@ -240,7 +240,7 @@ void Theme::useColorTheme(ColorTheme colorTheme)
         qDebug("ThemeDark");
         break;
     }
-    case ThemeHighContrast: {
+    case QDataVis::ThemeHighContrast: {
         m_baseColor = QColor(QRgb(0x202020));
         m_heightColor = QColor(QRgb(0xff4a41));
         m_depthColor = QColor(QRgb(0x596a74));
@@ -259,7 +259,7 @@ void Theme::useColorTheme(ColorTheme colorTheme)
         qDebug("ThemeHighContrast");
         break;
     }
-    case ThemeLight: {
+    case QDataVis::ThemeLight: {
         m_baseColor = QColor(QRgb(0x209fdf));
         m_heightColor = QColor(QRgb(0xbf593e));
         m_depthColor = QColor(QRgb(0x99ca53));
diff --git a/src/datavis3d/engine/theme_p.h b/src/datavis3d/engine/theme_p.h
index fd4b7f81..31c47941 100644
--- a/src/datavis3d/engine/theme_p.h
+++ b/src/datavis3d/engine/theme_p.h
@@ -43,8 +43,8 @@ public:
     explicit Theme();
     ~Theme();
 
-    void useColorTheme(ColorTheme theme);
-    ColorTheme colorTheme();
+    void useColorTheme(QDataVis::ColorTheme theme);
+    QDataVis::ColorTheme colorTheme();
     void setFromTheme(Theme &theme);
 
 private:
@@ -57,7 +57,7 @@ private:
     friend class Scatter3DRenderer;
     friend class Drawer;
 
-    ColorTheme m_colorTheme;
+    QDataVis::ColorTheme m_colorTheme;
     QColor m_baseColor;
     QColor m_heightColor;
     QColor m_depthColor;
diff --git a/src/datavis3d/global/datavis3dglobal_p.h b/src/datavis3d/global/datavis3dglobal_p.h
index e6c40a78..d556c5e1 100644
--- a/src/datavis3d/global/datavis3dglobal_p.h
+++ b/src/datavis3d/global/datavis3dglobal_p.h
@@ -30,7 +30,7 @@
 #define DATAVIS3DGLOBAL_P_H
 
 #include "qdatavis3dglobal.h"
-#include "qdatavis3dnamespace.h"
+#include "qdatavis3denums.h"
 #include <QOpenGLFunctions>
 #include <QVector3D>
 #include <QDebug>
diff --git a/src/datavis3d/global/global.pri b/src/datavis3d/global/global.pri
index d8405546..7292bbd6 100644
--- a/src/datavis3d/global/global.pri
+++ b/src/datavis3d/global/global.pri
@@ -1,4 +1,4 @@
 HEADERS += \
     $$PWD/qdatavis3dglobal.h \
-    $$PWD/qdatavis3dnamespace.h \
+    $$PWD/qdatavis3denums.h \
     $$PWD/datavis3dglobal_p.h
diff --git a/src/datavis3d/global/qdatavis3denums.h b/src/datavis3d/global/qdatavis3denums.h
new file mode 100644
index 00000000..a6384508
--- /dev/null
+++ b/src/datavis3d/global/qdatavis3denums.h
@@ -0,0 +1,115 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVis3D module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+#ifndef QDATAVIS3DENUMS_H
+#define QDATAVIS3DENUMS_H
+
+#include <QtDataVis3D/qdatavis3dglobal.h>
+#include <QObject>
+
+QT_DATAVIS3D_BEGIN_NAMESPACE
+
+class QT_DATAVIS3D_EXPORT QDataVis : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(MeshStyle)
+    Q_ENUMS(CameraPreset)
+    Q_ENUMS(ColorTheme)
+    Q_ENUMS(SelectionMode)
+    Q_ENUMS(ShadowQuality)
+    Q_ENUMS(LabelTransparency)
+
+public:
+
+    enum MeshStyle {
+        Bars = 0,
+        Pyramids,
+        Cones,
+        Cylinders,
+        BevelBars,
+        Spheres,
+        Dots
+    };
+
+    enum CameraPreset {
+        NoPreset = -1,
+        PresetFrontLow = 0,
+        PresetFront,
+        PresetFrontHigh,
+        PresetLeftLow,
+        PresetLeft,
+        PresetLeftHigh,
+        PresetRightLow,
+        PresetRight,
+        PresetRightHigh,
+        PresetBehindLow,
+        PresetBehind,
+        PresetBehindHigh,
+        PresetIsometricLeft,
+        PresetIsometricLeftHigh,
+        PresetIsometricRight,
+        PresetIsometricRightHigh,
+        PresetDirectlyAbove,
+        PresetDirectlyAboveCW45,
+        PresetDirectlyAboveCCW45,
+        PresetFrontBelow,           // These work only for graphs including negative values.
+        PresetLeftBelow,            // They act as Preset...Low for positive-only values.
+        PresetRightBelow,
+        PresetBehindBelow,
+        PresetDirectlyBelow
+    };
+
+    enum ColorTheme {
+        ThemeDefault = -1,
+        ThemeSystem = 0,
+        ThemeBlueCerulean,
+        ThemeBlueIcy,
+        ThemeBlueNcs,
+        ThemeBrownSand,
+        ThemeDark,
+        ThemeHighContrast,
+        ThemeLight
+    };
+
+    enum SelectionMode {
+        ModeNone = 0,
+        ModeItem,
+        ModeItemAndRow,         // From here onwards used for Q3DBars only
+        ModeItemAndColumn,
+        ModeItemRowAndColumn,
+        ModeZoomRow,
+        ModeZoomColumn
+    };
+
+    enum ShadowQuality {
+        ShadowNone = 0,
+        ShadowLow = 1,
+        ShadowMedium = 3,
+        ShadowHigh = 5
+    };
+
+    enum LabelTransparency {
+        TransparencyNone = 0,       // Full solid, using colors from theme
+        TransparencyFromTheme,      // Use colors and transparencies from theme
+        TransparencyNoBackground    // Draw just text on transparent background
+    };
+};
+
+QT_DATAVIS3D_END_NAMESPACE
+
+#endif
diff --git a/src/datavis3d/global/qdatavis3dnamespace.h b/src/datavis3d/global/qdatavis3dnamespace.h
deleted file mode 100644
index 812f3809..00000000
--- a/src/datavis3d/global/qdatavis3dnamespace.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtDataVis3D module.
-**
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-**
-****************************************************************************/
-
-#ifndef QVIS3DNAMESPACE_H
-#define QVIS3DNAMESPACE_H
-
-#include <QtDataVis3D/qdatavis3dglobal.h>
-
-namespace QtDataVis3D {
-
-// Enums used in several files
-enum MeshStyle {
-    Bars = 0,
-    Pyramids,
-    Cones,
-    Cylinders,
-    BevelBars,
-    Spheres,
-    Dots
-};
-
-enum CameraPreset {
-    PresetFrontLow = 0,
-    PresetFront,
-    PresetFrontHigh,
-    PresetLeftLow,
-    PresetLeft,
-    PresetLeftHigh,
-    PresetRightLow,
-    PresetRight,
-    PresetRightHigh,
-    PresetBehindLow,
-    PresetBehind,
-    PresetBehindHigh,
-    PresetIsometricLeft,
-    PresetIsometricLeftHigh,
-    PresetIsometricRight,
-    PresetIsometricRightHigh,
-    PresetDirectlyAbove,
-    PresetDirectlyAboveCW45,
-    PresetDirectlyAboveCCW45,
-    PresetFrontBelow,           // These work only for graphs including negative values.
-    PresetLeftBelow,            // They act as Preset...Low for positive-only values.
-    PresetRightBelow,
-    PresetBehindBelow,
-    PresetDirectlyBelow
-};
-
-enum ColorTheme {
-    ThemeSystem = 0,
-    ThemeBlueCerulean,
-    ThemeBlueIcy,
-    ThemeBlueNcs,
-    ThemeBrownSand,
-    ThemeDark,
-    ThemeHighContrast,
-    ThemeLight
-};
-
-enum SelectionMode {
-    ModeNone = 0,
-    ModeItem,
-    ModeItemAndRow,         // From here onwards used for Q3DBars only
-    ModeItemAndColumn,
-    ModeItemRowAndColumn,
-    ModeZoomRow,
-    ModeZoomColumn
-};
-
-enum ShadowQuality {
-    ShadowNone = 0,
-    ShadowLow = 1,
-    ShadowMedium = 3,
-    ShadowHigh = 5
-};
-
-enum LabelTransparency {
-    TransparencyNone = 0,       // Full solid, using colors from theme
-    TransparencyFromTheme,      // Use colors and transparencies from theme
-    TransparencyNoBackground    // Draw just text on transparent background
-};
-
-}
-
-#endif
diff --git a/src/datavis3d/utils/camerahelper.cpp b/src/datavis3d/utils/camerahelper.cpp
index 1e7f255c..5ae91adb 100644
--- a/src/datavis3d/utils/camerahelper.cpp
+++ b/src/datavis3d/utils/camerahelper.cpp
@@ -155,125 +155,125 @@ QPointF CameraHelper::getCameraRotations()
     return rotations;
 }
 
-void CameraHelper::setCameraPreset(CameraPreset preset)
+void CameraHelper::setCameraPreset(QDataVis::CameraPreset preset)
 {
     switch (preset) {
-    case PresetFrontLow: {
+    case QDataVis::PresetFrontLow: {
         qDebug("PresetFrontLow");
         CameraHelper::setCameraRotation(QPointF(0.0f, 0.0f));
         break;
     }
-    case PresetFront: {
+    case QDataVis::PresetFront: {
         qDebug("PresetFront");
         CameraHelper::setCameraRotation(QPointF(0.0f, 22.5f));
         break;
     }
-    case PresetFrontHigh: {
+    case QDataVis::PresetFrontHigh: {
         qDebug("PresetFrontHigh");
         CameraHelper::setCameraRotation(QPointF(0.0f, 45.0f));
         break;
     }
-    case PresetLeftLow: {
+    case QDataVis::PresetLeftLow: {
         qDebug("PresetLeftLow");
         CameraHelper::setCameraRotation(QPointF(90.0f, 0.0f));
         break;
     }
-    case PresetLeft: {
+    case QDataVis::PresetLeft: {
         qDebug("PresetLeft");
         CameraHelper::setCameraRotation(QPointF(90.0f, 22.5f));
         break;
     }
-    case PresetLeftHigh: {
+    case QDataVis::PresetLeftHigh: {
         qDebug("PresetLeftHigh");
         CameraHelper::setCameraRotation(QPointF(90.0f, 45.0f));
         break;
     }
-    case PresetRightLow: {
+    case QDataVis::PresetRightLow: {
         qDebug("PresetRightLow");
         CameraHelper::setCameraRotation(QPointF(-90.0f, 0.0f));
         break;
     }
-    case PresetRight: {
+    case QDataVis::PresetRight: {
         qDebug("PresetRight");
         CameraHelper::setCameraRotation(QPointF(-90.0f, 22.5f));
         break;
     }
-    case PresetRightHigh: {
+    case QDataVis::PresetRightHigh: {
         qDebug("PresetRightHigh");
         CameraHelper::setCameraRotation(QPointF(-90.0f, 45.0f));
         break;
     }
-    case PresetBehindLow: {
+    case QDataVis::PresetBehindLow: {
         qDebug("PresetBehindLow");
         CameraHelper::setCameraRotation(QPointF(180.0f, 0.0f));
         break;
     }
-    case PresetBehind: {
+    case QDataVis::PresetBehind: {
         qDebug("PresetBehind");
         CameraHelper::setCameraRotation(QPointF(180.0f, 22.5f));
         break;
     }
-    case PresetBehindHigh: {
+    case QDataVis::PresetBehindHigh: {
         qDebug("PresetBehindHigh");
         CameraHelper::setCameraRotation(QPointF(180.0f, 45.0f));
         break;
     }
-    case PresetIsometricLeft: {
+    case QDataVis::PresetIsometricLeft: {
         qDebug("PresetIsometricLeft");
         CameraHelper::setCameraRotation(QPointF(45.0f, 22.5f));
         break;
     }
-    case PresetIsometricLeftHigh: {
+    case QDataVis::PresetIsometricLeftHigh: {
         qDebug("PresetIsometricLeftHigh");
         CameraHelper::setCameraRotation(QPointF(45.0f, 45.0f));
         break;
     }
-    case PresetIsometricRight: {
+    case QDataVis::PresetIsometricRight: {
         qDebug("PresetIsometricRight");
         CameraHelper::setCameraRotation(QPointF(-45.0f, 22.5f));
         break;
     }
-    case PresetIsometricRightHigh: {
+    case QDataVis::PresetIsometricRightHigh: {
         qDebug("PresetIsometricRightHigh");
         CameraHelper::setCameraRotation(QPointF(-45.0f, 45.0f));
         break;
     }
-    case PresetDirectlyAbove: {
+    case QDataVis::PresetDirectlyAbove: {
         qDebug("PresetDirectlyAbove");
         CameraHelper::setCameraRotation(QPointF(0.0f, 90.0f));
         break;
     }
-    case PresetDirectlyAboveCW45: {
+    case QDataVis::PresetDirectlyAboveCW45: {
         qDebug("PresetDirectlyAboveCW45");
         CameraHelper::setCameraRotation(QPointF(-45.0f, 90.0f));
         break;
     }
-    case PresetDirectlyAboveCCW45: {
+    case QDataVis::PresetDirectlyAboveCCW45: {
         qDebug("PresetDirectlyAboveCCW45");
         CameraHelper::setCameraRotation(QPointF(45.0f, 90.0f));
         break;
     }
-    case PresetFrontBelow: {
+    case QDataVis::PresetFrontBelow: {
         qDebug("PresetFrontBelow");
         CameraHelper::setCameraRotation(QPointF(0.0f, -45.0f));
         break;
     }
-    case PresetLeftBelow: {
+    case QDataVis::PresetLeftBelow: {
         qDebug("PresetLeftBelow");
         CameraHelper::setCameraRotation(QPointF(90.0f, -45.0f));
         break;
     }
-    case PresetRightBelow: {
+    case QDataVis::PresetRightBelow: {
         qDebug("PresetRightBelow");
         CameraHelper::setCameraRotation(QPointF(-90.0f, -45.0f));
         break;
     }
-    case PresetBehindBelow: {
+    case QDataVis::PresetBehindBelow: {
         qDebug("PresetBehindBelow");
         CameraHelper::setCameraRotation(QPointF(180.0f, -45.0f));
         break;
     }
-    case PresetDirectlyBelow: {
+    case QDataVis::PresetDirectlyBelow: {
         qDebug("PresetDirectlyBelow");
         CameraHelper::setCameraRotation(QPointF(0.0f, -90.0f));
         break;
diff --git a/src/datavis3d/utils/camerahelper_p.h b/src/datavis3d/utils/camerahelper_p.h
index 89eeda9f..3b8c0c9c 100644
--- a/src/datavis3d/utils/camerahelper_p.h
+++ b/src/datavis3d/utils/camerahelper_p.h
@@ -82,7 +82,7 @@ public:
                                             GLfloat fixedRotation = 0.0f,
                                             GLfloat distanceModifier = 0.0f);
     void updateMousePos(const QPoint &mousePos);
-    void setCameraPreset(CameraPreset preset);
+    void setCameraPreset(QDataVis::CameraPreset preset);
 };
 
 QT_DATAVIS3D_END_NAMESPACE
diff --git a/src/datavis3d/utils/utils.cpp b/src/datavis3d/utils/utils.cpp
index 376ce94d..cf6b91f8 100644
--- a/src/datavis3d/utils/utils.cpp
+++ b/src/datavis3d/utils/utils.cpp
@@ -121,7 +121,7 @@ void Utils::printText(QPainter *painter, const QString &text, const QSize &posit
 }
 
 QImage Utils::printTextToImage(const QFont &font, const QString &text, const QColor &bgrColor,
-                               const QColor &txtColor, LabelTransparency transparency)
+                               const QColor &txtColor, QDataVis::LabelTransparency transparency)
 {
     GLuint paddingWidth = 15;
     GLuint paddingHeight = 15;
@@ -147,7 +147,7 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo
     paddingHeight /= 2;
     //qDebug() << "label size after padding" << labelSize << paddingWidth << paddingHeight;
 #else
-    if (TransparencyNoBackground == transparency)
+    if (QDataVis::TransparencyNoBackground == transparency)
         labelSize = QSize(valueStrWidth, valueStrHeight);
     else
         labelSize = QSize(valueStrWidth + paddingWidth * 2, valueStrHeight + paddingHeight * 2);
@@ -164,7 +164,7 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo
     painter.setCompositionMode(QPainter::CompositionMode_Source);
     switch (transparency) {
     // TODO: Texture size padding fix for Android f**ks this up for axis labels. Fix or disable for android.
-    case TransparencyNoBackground: {
+    case QDataVis::TransparencyNoBackground: {
         painter.setFont(valueFont);
         painter.setPen(txtColor);
         painter.drawText(0, 0,
@@ -173,7 +173,7 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo
                          text);
         break;
     }
-    case TransparencyFromTheme: {
+    case QDataVis::TransparencyFromTheme: {
         painter.setBrush(QBrush(bgrColor));
         painter.setPen(bgrColor);
         painter.drawRoundedRect(0, 0, labelSize.width(), labelSize.height(), 10.0, 10.0f);
@@ -185,7 +185,7 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo
                          text);
         break;
     }
-    case TransparencyNone: {
+    case QDataVis::TransparencyNone: {
         painter.setBrush(QBrush(bgrColor));
         painter.setPen(bgrColor);
         painter.drawRect(0, 0, labelSize.width(), labelSize.height());
diff --git a/src/datavis3d/utils/utils_p.h b/src/datavis3d/utils/utils_p.h
index f6d689ce..fe7d6081 100644
--- a/src/datavis3d/utils/utils_p.h
+++ b/src/datavis3d/utils/utils_p.h
@@ -52,7 +52,7 @@ class Utils
                                    const QString &text,
                                    const QColor &bgrColor,
                                    const QColor &txtColor,
-                                   LabelTransparency transparency);
+                                   QDataVis::LabelTransparency transparency);
     static QVector3D getSelection(QPoint mousepos, int height);
 };
 
diff --git a/src/datavis3dqml2/datavis3dqml2_plugin.cpp b/src/datavis3dqml2/datavis3dqml2_plugin.cpp
index baf97eb9..9c6796e2 100644
--- a/src/datavis3dqml2/datavis3dqml2_plugin.cpp
+++ b/src/datavis3dqml2/datavis3dqml2_plugin.cpp
@@ -27,6 +27,9 @@ void Datavis3dqml2Plugin::registerTypes(const char *uri)
     // @uri com.digia.QtDataVis3D
     qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 0, "AbstractItemModel",
                                                    QLatin1String("Trying to create uncreatable: AbstractItemModel."));
+    qmlRegisterUncreatableType<QDataVis>(uri, 1, 0, "DataVis",
+                                         QLatin1String("Trying to create uncreatable: DataVis."));
+
 
     qmlRegisterType<QItemModelBarDataMapping>(uri, 1, 0, "BarDataMapping");
     qmlRegisterType<QItemModelMapDataMapping>(uri, 1, 0, "MapDataMapping");
diff --git a/src/datavis3dqml2/datavis3dqml2_plugin.h b/src/datavis3dqml2/datavis3dqml2_plugin.h
index 36dd53ab..f8f78ccb 100644
--- a/src/datavis3dqml2/datavis3dqml2_plugin.h
+++ b/src/datavis3dqml2/datavis3dqml2_plugin.h
@@ -39,6 +39,7 @@ Q_DECLARE_METATYPE(QItemModelBarDataMapping *)
 Q_DECLARE_METATYPE(QItemModelMapDataMapping *)
 Q_DECLARE_METATYPE(QItemModelScatterDataMapping *)
 Q_DECLARE_METATYPE(QAbstractItemModel *)
+Q_DECLARE_METATYPE(QDataVis *)
 
 QT_DATAVIS3D_BEGIN_NAMESPACE
 
diff --git a/src/datavis3dqml2/declarativebars.cpp b/src/datavis3dqml2/declarativebars.cpp
index 1f17d17b..0b4196cd 100644
--- a/src/datavis3dqml2/declarativebars.cpp
+++ b/src/datavis3dqml2/declarativebars.cpp
@@ -29,8 +29,8 @@ DeclarativeBars::DeclarativeBars(QQuickItem *parent)
     : QQuickItem(parent),
       m_shared(0),
       m_initialisedSize(0, 0),
-      m_cameraPreset(NoPreset),
-      m_theme(ThemeDefault)
+      m_cameraPreset(QDataVis::NoPreset),
+      m_theme(QDataVis::ThemeDefault)
 {
     setFlags(QQuickItem::ItemHasContents);
     setAcceptedMouseButtons(Qt::AllButtons);
@@ -52,9 +52,9 @@ DeclarativeBars::~DeclarativeBars()
     delete m_shared;
 }
 
-void DeclarativeBars::handleShadowQualityUpdate(QtDataVis3D::ShadowQuality quality)
+void DeclarativeBars::handleShadowQualityUpdate(QDataVis::ShadowQuality quality)
 {
-    emit shadowQualityChanged(DeclarativeBars::ShadowQuality(quality));
+    emit shadowQualityChanged(quality);
 }
 
 void DeclarativeBars::classBegin()
@@ -169,20 +169,20 @@ bool DeclarativeBars::isBarSpacingRelative()
     return m_shared->isBarSpecRelative();
 }
 
-void DeclarativeBars::setBarType(MeshStyle style)
+void DeclarativeBars::setBarType(QDataVis::MeshStyle style)
 {
     QString objFile = m_shared->objFile();
     bool smooth = objFile.endsWith(smoothString);
-    m_shared->setBarType(QtDataVis3D::MeshStyle(style), smooth);
+    m_shared->setBarType(style, smooth);
 }
 
-DeclarativeBars::MeshStyle DeclarativeBars::barType()
+QDataVis::MeshStyle DeclarativeBars::barType()
 {
     QString objFile = m_shared->objFile();
     if (objFile.contains("/sphere"))
-        return Spheres;
+        return QDataVis::Spheres;
     else
-        return Dots;
+        return QDataVis::Dots;
 }
 
 void DeclarativeBars::setBarSmooth(bool smooth)
@@ -218,28 +218,28 @@ QString DeclarativeBars::meshFileName()
     return m_shared->objFile();
 }
 
-void DeclarativeBars::setCameraPreset(CameraPreset preset)
+void DeclarativeBars::setCameraPreset(QDataVis::CameraPreset preset)
 {
     // TODO: Implement correctly once "improved camera api" (QTRD-2122) is implemented
     // We need to save this locally, as there are no getters for it in controller
     m_cameraPreset = preset;
-    m_shared->setCameraPreset(QtDataVis3D::CameraPreset(preset));
+    m_shared->setCameraPreset(preset);
 }
 
-DeclarativeBars::CameraPreset DeclarativeBars::cameraPreset()
+QDataVis::CameraPreset DeclarativeBars::cameraPreset()
 {
     return m_cameraPreset;
 }
 
-void DeclarativeBars::setTheme(ColorTheme theme)
+void DeclarativeBars::setTheme(QDataVis::ColorTheme theme)
 {
     // TODO: Implement correctly once "user-modifiable themes" (QTRD-2120) is implemented
     // We need to save this locally, as there are no getters for it in controller
     m_theme = theme;
-    m_shared->setColorTheme(QtDataVis3D::ColorTheme(theme));
+    m_shared->setColorTheme(theme);
 }
 
-DeclarativeBars::ColorTheme DeclarativeBars::theme()
+QDataVis::ColorTheme DeclarativeBars::theme()
 {
     return m_theme;
 }
@@ -264,14 +264,14 @@ QFont DeclarativeBars::font()
     return m_shared->font();
 }
 
-void DeclarativeBars::setLabelTransparency(DeclarativeBars::LabelTransparency transparency)
+void DeclarativeBars::setLabelTransparency(QDataVis::LabelTransparency transparency)
 {
-    m_shared->setLabelTransparency(QtDataVis3D::LabelTransparency(transparency));
+    m_shared->setLabelTransparency(transparency);
 }
 
-DeclarativeBars::LabelTransparency DeclarativeBars::labelTransparency()
+QDataVis::LabelTransparency DeclarativeBars::labelTransparency()
 {
-    return DeclarativeBars::LabelTransparency(m_shared->labelTransparency());
+    return m_shared->labelTransparency();
 }
 
 void DeclarativeBars::setGridVisible(bool visible)
@@ -294,24 +294,24 @@ bool DeclarativeBars::isBackgroundVisible()
     return m_shared->backgroundEnabled();
 }
 
-void DeclarativeBars::setSelectionMode(DeclarativeBars::SelectionMode mode)
+void DeclarativeBars::setSelectionMode(QDataVis::SelectionMode mode)
 {
-    m_shared->setSelectionMode(QtDataVis3D::SelectionMode(mode));
+    m_shared->setSelectionMode(mode);
 }
 
-DeclarativeBars::SelectionMode DeclarativeBars::selectionMode()
+QDataVis::SelectionMode DeclarativeBars::selectionMode()
 {
-    return DeclarativeBars::SelectionMode(m_shared->selectionMode());
+    return m_shared->selectionMode();
 }
 
-void DeclarativeBars::setShadowQuality(DeclarativeBars::ShadowQuality quality)
+void DeclarativeBars::setShadowQuality(QDataVis::ShadowQuality quality)
 {
-    m_shared->setShadowQuality(QtDataVis3D::ShadowQuality(quality));
+    m_shared->setShadowQuality(quality);
 }
 
-DeclarativeBars::ShadowQuality DeclarativeBars::shadowQuality()
+QDataVis::ShadowQuality DeclarativeBars::shadowQuality()
 {
-    return DeclarativeBars::ShadowQuality(m_shared->shadowQuality());
+    return m_shared->shadowQuality();
 }
 
 int DeclarativeBars::rows() const
diff --git a/src/datavis3dqml2/declarativebars_p.h b/src/datavis3dqml2/declarativebars_p.h
index 36f44542..169de795 100644
--- a/src/datavis3dqml2/declarativebars_p.h
+++ b/src/datavis3dqml2/declarativebars_p.h
@@ -45,12 +45,12 @@ class DeclarativeBars : public QQuickItem
     Q_OBJECT
     Q_PROPERTY(QAbstractItemModel *data READ data WRITE setData)
     Q_PROPERTY(QItemModelBarDataMapping *mapping READ mapping WRITE setMapping)
-    Q_PROPERTY(SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
-    Q_PROPERTY(LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
-    Q_PROPERTY(ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality)
-    Q_PROPERTY(MeshStyle barType READ barType WRITE setBarType)
-    Q_PROPERTY(CameraPreset cameraPreset READ cameraPreset WRITE setCameraPreset)
-    Q_PROPERTY(ColorTheme theme READ theme WRITE setTheme)
+    Q_PROPERTY(QtDataVis3D::QDataVis::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
+    Q_PROPERTY(QtDataVis3D::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
+    Q_PROPERTY(QtDataVis3D::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality)
+    Q_PROPERTY(QtDataVis3D::QDataVis::MeshStyle barType READ barType WRITE setBarType)
+    Q_PROPERTY(QtDataVis3D::QDataVis::CameraPreset cameraPreset READ cameraPreset WRITE setCameraPreset)
+    Q_PROPERTY(QtDataVis3D::QDataVis::ColorTheme theme READ theme WRITE setTheme)
     Q_PROPERTY(QSizeF barThickness READ barThickness WRITE setBarThickness)
     Q_PROPERTY(QSizeF barSpacing READ barSpacing WRITE setBarSpacing)
     Q_PROPERTY(bool barSpacingRelative READ isBarSpacingRelative WRITE setBarSpacingRelative)
@@ -62,87 +62,12 @@ class DeclarativeBars : public QQuickItem
     Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible)
     Q_PROPERTY(int rows READ rows WRITE setRows)
     Q_PROPERTY(int columns READ columns WRITE setColumns)
-    Q_ENUMS(SelectionMode)
-    Q_ENUMS(ShadowQuality)
-    Q_ENUMS(LabelTransparency)
-    Q_ENUMS(MeshStyle)
-    Q_ENUMS(CameraPreset)
-    Q_ENUMS(ColorTheme)
-
-public:
-    // Duplicated here to be able to use the same enums
-    enum SelectionMode {
-        ModeNone = 0,
-        ModeItem,
-        ModeItemAndRow,
-        ModeItemAndColumn,
-        ModeItemRowAndColumn,
-        ModeZoomRow,
-        ModeZoomColumn
-    };
-
-    enum ShadowQuality {
-        ShadowNone = 0,
-        ShadowLow = 1,
-        ShadowMedium = 3,
-        ShadowHigh = 5
-    };
-
-    enum LabelTransparency {
-        TransparencyNone = 0,       // Full solid, using colors from theme
-        TransparencyFromTheme,      // Use colors and transparencies from theme
-        TransparencyNoBackground    // Draw just text on transparent background
-    };
-
-    enum MeshStyle {
-        Bars = 0,
-        Pyramids,
-        Cones,
-        Cylinders,
-        BevelBars,
-        Spheres,
-        Dots
-    };
-
-    enum CameraPreset {
-        NoPreset = -1,
-        PresetFrontLow = 0,
-        PresetFront,
-        PresetFrontHigh,
-        PresetLeftLow,
-        PresetLeft,
-        PresetLeftHigh,
-        PresetRightLow,
-        PresetRight,
-        PresetRightHigh,
-        PresetBehindLow,
-        PresetBehind,
-        PresetBehindHigh,
-        PresetIsometricLeft,
-        PresetIsometricLeftHigh,
-        PresetIsometricRight,
-        PresetIsometricRightHigh,
-        PresetDirectlyAbove,
-        PresetDirectlyAboveCW45,
-        PresetDirectlyAboveCCW45,
-        PresetFrontBelow,           // These work only for graphs including negative values.
-        PresetLeftBelow,            // They act as Preset...Low for positive-only values.
-        PresetRightBelow,
-        PresetBehindBelow,
-        PresetDirectlyBelow
-    };
-
-    enum ColorTheme {
-        ThemeDefault = -1,
-        ThemeSystem = 0,
-        ThemeBlueCerulean,
-        ThemeBlueIcy,
-        ThemeBlueNcs,
-        ThemeBrownSand,
-        ThemeDark,
-        ThemeHighContrast,
-        ThemeLight
-    };
+    Q_ENUMS(QtDataVis3D::QDataVis::SelectionMode)
+    Q_ENUMS(QtDataVis3D::QDataVis::ShadowQuality)
+    Q_ENUMS(QtDataVis3D::QDataVis::LabelTransparency)
+    Q_ENUMS(QtDataVis3D::QDataVis::MeshStyle)
+    Q_ENUMS(QtDataVis3D::QDataVis::CameraPreset)
+    Q_ENUMS(QtDataVis3D::QDataVis::ColorTheme)
 
 public:
     explicit DeclarativeBars(QQuickItem *parent = 0);
@@ -190,8 +115,8 @@ public:
     bool isBarSpacingRelative();
 
     // Bar type
-    void setBarType(MeshStyle style);
-    MeshStyle barType();
+    void setBarType(QDataVis::MeshStyle style);
+    QDataVis::MeshStyle barType();
 
     // Bar smoothing
     void setBarSmooth(bool smooth);
@@ -202,17 +127,17 @@ public:
     QString meshFileName();
 
     // Select preset camera placement
-    void setCameraPreset(CameraPreset preset);
-    CameraPreset cameraPreset();
+    void setCameraPreset(QDataVis::CameraPreset preset);
+    QDataVis::CameraPreset cameraPreset();
 
     // Set theme (object colors, shaders, window color, background colors, light intensity and text
     // colors are affected)
-    void setTheme(ColorTheme theme);
-    ColorTheme theme();
+    void setTheme(QDataVis::ColorTheme theme);
+    QDataVis::ColorTheme theme();
 
     // Change selection mode; single bar, bar and row, bar and column, or all
-    void setSelectionMode(SelectionMode mode);
-    SelectionMode selectionMode();
+    void setSelectionMode(QDataVis::SelectionMode mode);
+    QDataVis::SelectionMode selectionMode();
 
     // Font size adjustment
     void setFontSize(float fontsize);
@@ -223,8 +148,8 @@ public:
     QFont font();
 
     // Label transparency adjustment
-    void setLabelTransparency(LabelTransparency transparency);
-    LabelTransparency labelTransparency();
+    void setLabelTransparency(QDataVis::LabelTransparency transparency);
+    QDataVis::LabelTransparency labelTransparency();
 
     // Enable or disable background grid
     void setGridVisible(bool visible);
@@ -235,8 +160,8 @@ public:
     bool isBackgroundVisible();
 
     // Adjust shadow quality
-    void setShadowQuality(ShadowQuality quality);
-    ShadowQuality shadowQuality();
+    void setShadowQuality(QDataVis::ShadowQuality quality);
+    QDataVis::ShadowQuality shadowQuality();
 
     int rows() const;
     void setRows(int rows);
@@ -246,11 +171,11 @@ public:
 
 public slots:
     // Used to detect when shadow quality changes autonomously due to e.g. resizing.
-    void handleShadowQualityUpdate(QtDataVis3D::ShadowQuality quality);
+    void handleShadowQualityUpdate(QDataVis::ShadowQuality quality);
 
 signals:
     // Signals shadow quality changes.
-    void shadowQualityChanged(DeclarativeBars::ShadowQuality quality);
+    void shadowQualityChanged(QDataVis::ShadowQuality quality);
 
 protected:
     Bars3dController *m_shared;
@@ -264,8 +189,8 @@ protected:
 
 private:
     QSize m_initialisedSize;
-    CameraPreset m_cameraPreset;
-    ColorTheme m_theme;
+    QDataVis::CameraPreset m_cameraPreset;
+    QDataVis::ColorTheme m_theme;
 };
 
 QT_DATAVIS3D_END_NAMESPACE
diff --git a/src/datavis3dqml2/declarativemaps.cpp b/src/datavis3dqml2/declarativemaps.cpp
index d20fabb1..7be239f2 100644
--- a/src/datavis3dqml2/declarativemaps.cpp
+++ b/src/datavis3dqml2/declarativemaps.cpp
@@ -95,7 +95,7 @@ void DeclarativeMaps::setBarSpecs(const QVector3D &thickness,
     m_shared->setBarSpecs(thickness, direction);
 }
 
-void DeclarativeMaps::setBarType(MeshStyle style, bool smooth)
+void DeclarativeMaps::setBarType(QDataVis::MeshStyle style, bool smooth)
 {
     m_shared->setBarType(style, smooth);
 }
@@ -105,7 +105,7 @@ void DeclarativeMaps::setMeshFileName(const QString &objFileName)
     m_shared->setMeshFileName(objFileName);
 }
 
-void DeclarativeMaps::setCameraPreset(CameraPreset preset)
+void DeclarativeMaps::setCameraPreset(QDataVis::CameraPreset preset)
 {
     m_shared->setCameraPreset(preset);
 }
@@ -115,7 +115,7 @@ void DeclarativeMaps::setCameraPosition(GLfloat horizontal, GLfloat vertical, GL
     m_shared->setCameraPosition(horizontal, vertical, distance);
 }
 
-void DeclarativeMaps::setTheme(ColorTheme theme)
+void DeclarativeMaps::setTheme(QDataVis::ColorTheme theme)
 {
     m_shared->setTheme(theme);
 }
@@ -140,14 +140,14 @@ void DeclarativeMaps::setImage(const QString &imageUrl)
     m_shared->setImage(QImage(imageUrl));
 }
 
-void DeclarativeMaps::setSelectionMode(DeclarativeMaps::SelectionMode mode)
+void DeclarativeMaps::setSelectionMode(QDataVis::SelectionMode mode)
 {
-    m_shared->setSelectionMode(QtDataVis3D::SelectionMode(mode));
+    m_shared->setSelectionMode(mode);
 }
 
-DeclarativeMaps::SelectionMode DeclarativeMaps::selectionMode()
+QDataVis::SelectionMode DeclarativeMaps::selectionMode()
 {
-    return DeclarativeMaps::SelectionMode(m_shared->selectionMode());
+    return m_shared->selectionMode();
 }
 
 void DeclarativeMaps::setFontSize(float fontsize)
@@ -170,24 +170,24 @@ QFont DeclarativeMaps::font()
     return m_shared->font();
 }
 
-void DeclarativeMaps::setLabelTransparency(DeclarativeMaps::LabelTransparency transparency)
+void DeclarativeMaps::setLabelTransparency(QDataVis::LabelTransparency transparency)
 {
-    m_shared->setLabelTransparency(QtDataVis3D::LabelTransparency(transparency));
+    m_shared->setLabelTransparency(transparency);
 }
 
-DeclarativeMaps::LabelTransparency DeclarativeMaps::labelTransparency()
+QDataVis::LabelTransparency DeclarativeMaps::labelTransparency()
 {
-    return DeclarativeMaps::LabelTransparency(m_shared->labelTransparency());
+    return m_shared->labelTransparency();
 }
 
-void DeclarativeMaps::setShadowQuality(DeclarativeMaps::ShadowQuality quality)
+void DeclarativeMaps::setShadowQuality(QDataVis::ShadowQuality quality)
 {
-    m_shared->setShadowQuality(QtDataVis3D::ShadowQuality(quality));
+    m_shared->setShadowQuality(quality);
 }
 
-DeclarativeMaps::ShadowQuality DeclarativeMaps::shadowQuality()
+QDataVis::ShadowQuality DeclarativeMaps::shadowQuality()
 {
-    return DeclarativeMaps::ShadowQuality(m_shared->shadowQuality());
+    return m_shared->shadowQuality();
 }
 
 QItemModelMapDataMapping *DeclarativeMaps::mapping() const
diff --git a/src/datavis3dqml2/declarativemaps_p.h b/src/datavis3dqml2/declarativemaps_p.h
index 18c9b95b..e395f4b8 100644
--- a/src/datavis3dqml2/declarativemaps_p.h
+++ b/src/datavis3dqml2/declarativemaps_p.h
@@ -44,40 +44,15 @@ class DeclarativeMaps : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(QAbstractItemModel *data READ data WRITE setData)
-    Q_PROPERTY(SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
-    Q_PROPERTY(LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
-    Q_PROPERTY(ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality)
+    Q_PROPERTY(QtDataVis3D::QDataVis::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
+    Q_PROPERTY(QtDataVis3D::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
+    Q_PROPERTY(QtDataVis3D::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality)
     Q_PROPERTY(QFont font READ font WRITE setFont)
     Q_PROPERTY(float fontSize READ fontSize WRITE setFontSize)
     Q_PROPERTY(QItemModelMapDataMapping *mapping READ mapping WRITE setMapping)
-    Q_ENUMS(SelectionMode)
-    Q_ENUMS(ShadowQuality)
-    Q_ENUMS(LabelTransparency)
-
-public:
-    // Duplicated here to be able to use the same enums
-    enum SelectionMode {
-        ModeNone = 0,
-        ModeItem,
-        ModeItemAndRow,
-        ModeItemAndColumn,
-        ModeItemRowAndColumn,
-        ModeZoomRow,
-        ModeZoomColumn
-    };
-
-    enum ShadowQuality {
-        ShadowNone = 0,
-        ShadowLow = 1,
-        ShadowMedium = 3,
-        ShadowHigh = 5
-    };
-
-    enum LabelTransparency {
-        TransparencyNone = 0,       // Full solid, using colors from theme
-        TransparencyFromTheme,      // Use colors and transparencies from theme
-        TransparencyNoBackground    // Draw just text on transparent background
-    };
+    Q_ENUMS(QtDataVis3D::QDataVis::SelectionMode)
+    Q_ENUMS(QtDataVis3D::QDataVis::ShadowQuality)
+    Q_ENUMS(QtDataVis3D::QDataVis::LabelTransparency)
 
 public:
     explicit DeclarativeMaps(QQuickItem *parent = 0);
@@ -97,20 +72,20 @@ public:
                      Q3DMaps::AdjustmentDirection direction = Q3DMaps::AdjustHeight);
 
     // bar type; bars (=cubes), pyramids, cones, cylinders, balls, etc.
-    Q_INVOKABLE void setBarType(MeshStyle style, bool smooth = false);
+    Q_INVOKABLE void setBarType(QDataVis::MeshStyle style, bool smooth = false);
 
     // override bar type with own mesh
     Q_INVOKABLE void setMeshFileName(const QString &objFileName);
 
     // Select preset camera placement
-    Q_INVOKABLE void setCameraPreset(CameraPreset preset);
+    Q_INVOKABLE void setCameraPreset(QDataVis::CameraPreset preset);
 
     // Set camera rotation if you don't want to use the presets (in horizontal (180...180) and
     // vertical (0...90) angles and distance in percentage (10...500))
     Q_INVOKABLE void setCameraPosition(GLfloat horizontal, GLfloat vertical, GLint distance = 100);
 
     // Set theme (bar colors, shaders, window color, background colors, light intensity and text colors are affected)
-    Q_INVOKABLE void setTheme(ColorTheme theme);
+    Q_INVOKABLE void setTheme(QDataVis::ColorTheme theme);
 
     // Set color if you don't want to use themes. Set uniform to false if you want the (height) color to change from bottom to top
     Q_INVOKABLE void setBarColor(QColor baseColor, QColor heightColor, bool uniform = true);
@@ -123,8 +98,8 @@ public:
     Q_INVOKABLE void setImage(const QString &imageUrl);
 
     // Change selection mode; single bar, bar and row, bar and column, or all
-    void setSelectionMode(SelectionMode mode);
-    SelectionMode selectionMode();
+    void setSelectionMode(QDataVis::SelectionMode mode);
+    QDataVis::SelectionMode selectionMode();
 
     // Font size adjustment
     void setFontSize(float fontsize);
@@ -135,12 +110,12 @@ public:
     QFont font();
 
     // Label transparency adjustment
-    void setLabelTransparency(LabelTransparency transparency);
-    LabelTransparency labelTransparency();
+    void setLabelTransparency(QDataVis::LabelTransparency transparency);
+    QDataVis::LabelTransparency labelTransparency();
 
     // Adjust shadow quality
-    void setShadowQuality(ShadowQuality quality);
-    ShadowQuality shadowQuality();
+    void setShadowQuality(QDataVis::ShadowQuality quality);
+    QDataVis::ShadowQuality shadowQuality();
 
     QItemModelMapDataMapping *mapping() const;
     void setMapping(QItemModelMapDataMapping *mapping);
diff --git a/src/datavis3dqml2/declarativescatter.cpp b/src/datavis3dqml2/declarativescatter.cpp
index ad5ecd26..b896d3d9 100644
--- a/src/datavis3dqml2/declarativescatter.cpp
+++ b/src/datavis3dqml2/declarativescatter.cpp
@@ -28,8 +28,8 @@ DeclarativeScatter::DeclarativeScatter(QQuickItem *parent)
     : QQuickItem(parent),
       m_shared(0),
       m_initialisedSize(0, 0),
-      m_cameraPreset(NoPreset),
-      m_theme(ThemeDefault)
+      m_cameraPreset(QDataVis::NoPreset),
+      m_theme(QDataVis::ThemeDefault)
 {
     setFlags(QQuickItem::ItemHasContents);
     setAcceptedMouseButtons(Qt::AllButtons);
@@ -51,9 +51,9 @@ DeclarativeScatter::~DeclarativeScatter()
     delete m_shared;
 }
 
-void DeclarativeScatter::handleShadowQualityUpdate(QtDataVis3D::ShadowQuality quality)
+void DeclarativeScatter::handleShadowQualityUpdate(QDataVis::ShadowQuality quality)
 {
-    emit shadowQualityChanged(DeclarativeScatter::ShadowQuality(quality));
+    emit shadowQualityChanged(quality);
 }
 
 void DeclarativeScatter::classBegin()
@@ -123,20 +123,20 @@ QItemModelScatterDataMapping *DeclarativeScatter::mapping() const
     return static_cast<QItemModelScatterDataProxy *>(m_shared->dataProxy())->mapping();
 }
 
-void DeclarativeScatter::setObjectType(MeshStyle style)
+void DeclarativeScatter::setObjectType(QDataVis::MeshStyle style)
 {
     QString objFile = m_shared->objFile();
     bool smooth = objFile.endsWith(smoothString);
-    m_shared->setObjectType(QtDataVis3D::MeshStyle(style), smooth);
+    m_shared->setObjectType(style, smooth);
 }
 
-DeclarativeScatter::MeshStyle DeclarativeScatter::objectType()
+QDataVis::MeshStyle DeclarativeScatter::objectType()
 {
     QString objFile = m_shared->objFile();
     if (objFile.contains("/sphere"))
-        return Spheres;
+        return QDataVis::Spheres;
     else
-        return Dots;
+        return QDataVis::Dots;
 }
 
 void DeclarativeScatter::setObjectSmooth(bool smooth)
@@ -172,28 +172,28 @@ QString DeclarativeScatter::meshFileName()
     return m_shared->objFile();
 }
 
-void DeclarativeScatter::setCameraPreset(CameraPreset preset)
+void DeclarativeScatter::setCameraPreset(QDataVis::CameraPreset preset)
 {
     // TODO: Implement correctly once "improved camera api" (QTRD-2122) is implemented
     // We need to save this locally, as there are no getters for it in controller
     m_cameraPreset = preset;
-    m_shared->setCameraPreset(QtDataVis3D::CameraPreset(preset));
+    m_shared->setCameraPreset(preset);
 }
 
-DeclarativeScatter::CameraPreset DeclarativeScatter::cameraPreset()
+QDataVis::CameraPreset DeclarativeScatter::cameraPreset()
 {
     return m_cameraPreset;
 }
 
-void DeclarativeScatter::setTheme(ColorTheme theme)
+void DeclarativeScatter::setTheme(QDataVis::ColorTheme theme)
 {
     // TODO: Implement correctly once "user-modifiable themes" (QTRD-2120) is implemented
     // We need to save this locally, as there are no getters for it in controller
     m_theme = theme;
-    m_shared->setColorTheme(QtDataVis3D::ColorTheme(theme));
+    m_shared->setColorTheme(theme);
 }
 
-DeclarativeScatter::ColorTheme DeclarativeScatter::theme()
+QDataVis::ColorTheme DeclarativeScatter::theme()
 {
     return m_theme;
 }
@@ -218,14 +218,14 @@ QFont DeclarativeScatter::font()
     return m_shared->font();
 }
 
-void DeclarativeScatter::setLabelTransparency(DeclarativeScatter::LabelTransparency transparency)
+void DeclarativeScatter::setLabelTransparency(QDataVis::LabelTransparency transparency)
 {
-    m_shared->setLabelTransparency(QtDataVis3D::LabelTransparency(transparency));
+    m_shared->setLabelTransparency(transparency);
 }
 
-DeclarativeScatter::LabelTransparency DeclarativeScatter::labelTransparency()
+QDataVis::LabelTransparency DeclarativeScatter::labelTransparency()
 {
-    return DeclarativeScatter::LabelTransparency(m_shared->labelTransparency());
+    return m_shared->labelTransparency();
 }
 
 void DeclarativeScatter::setGridVisible(bool visible)
@@ -248,24 +248,24 @@ bool DeclarativeScatter::isBackgroundVisible()
     return m_shared->backgroundEnabled();
 }
 
-void DeclarativeScatter::setSelectionMode(DeclarativeScatter::SelectionMode mode)
+void DeclarativeScatter::setSelectionMode(QDataVis::SelectionMode mode)
 {
-    m_shared->setSelectionMode(QtDataVis3D::SelectionMode(mode));
+    m_shared->setSelectionMode(mode);
 }
 
-DeclarativeScatter::SelectionMode DeclarativeScatter::selectionMode()
+QDataVis::SelectionMode DeclarativeScatter::selectionMode()
 {
-    return DeclarativeScatter::SelectionMode(m_shared->selectionMode());
+    return m_shared->selectionMode();
 }
 
-void DeclarativeScatter::setShadowQuality(DeclarativeScatter::ShadowQuality quality)
+void DeclarativeScatter::setShadowQuality(QDataVis::ShadowQuality quality)
 {
-    m_shared->setShadowQuality(QtDataVis3D::ShadowQuality(quality));
+    m_shared->setShadowQuality(quality);
 }
 
-DeclarativeScatter::ShadowQuality DeclarativeScatter::shadowQuality()
+QDataVis::ShadowQuality DeclarativeScatter::shadowQuality()
 {
-    return DeclarativeScatter::ShadowQuality(m_shared->shadowQuality());
+    return m_shared->shadowQuality();
 }
 
 void DeclarativeScatter::mousePressEvent(QMouseEvent *event)
diff --git a/src/datavis3dqml2/declarativescatter_p.h b/src/datavis3dqml2/declarativescatter_p.h
index 76a8eca2..c25d9b2c 100644
--- a/src/datavis3dqml2/declarativescatter_p.h
+++ b/src/datavis3dqml2/declarativescatter_p.h
@@ -45,94 +45,24 @@ class DeclarativeScatter : public QQuickItem
     Q_OBJECT
     Q_PROPERTY(QAbstractItemModel *data READ data WRITE setData)
     Q_PROPERTY(QItemModelScatterDataMapping *mapping READ mapping WRITE setMapping)
-    Q_PROPERTY(SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
-    Q_PROPERTY(LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
-    Q_PROPERTY(ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality)
-    Q_PROPERTY(MeshStyle objectType READ objectType WRITE setObjectType)
-    Q_PROPERTY(CameraPreset cameraPreset READ cameraPreset WRITE setCameraPreset)
-    Q_PROPERTY(ColorTheme theme READ theme WRITE setTheme)
+    Q_PROPERTY(QtDataVis3D::QDataVis::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
+    Q_PROPERTY(QtDataVis3D::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
+    Q_PROPERTY(QtDataVis3D::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality)
+    Q_PROPERTY(QtDataVis3D::QDataVis::MeshStyle objectType READ objectType WRITE setObjectType)
+    Q_PROPERTY(QtDataVis3D::QDataVis::CameraPreset cameraPreset READ cameraPreset WRITE setCameraPreset)
+    Q_PROPERTY(QtDataVis3D::QDataVis::ColorTheme theme READ theme WRITE setTheme)
     Q_PROPERTY(bool objectSmooth READ objectSmooth WRITE setObjectSmooth)
     Q_PROPERTY(QString meshFileName READ meshFileName WRITE setMeshFileName)
     Q_PROPERTY(QFont font READ font WRITE setFont)
     Q_PROPERTY(float fontSize READ fontSize WRITE setFontSize)
     Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible)
     Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible)
-    Q_ENUMS(SelectionMode)
-    Q_ENUMS(ShadowQuality)
-    Q_ENUMS(LabelTransparency)
-    Q_ENUMS(MeshStyle)
-    Q_ENUMS(CameraPreset)
-    Q_ENUMS(ColorTheme)
-
-public:
-    // Duplicated here to be able to use the same enums
-    enum SelectionMode {
-        ModeNone = 0,
-        ModeItem,
-        ModeItemAndRow,
-        ModeItemAndColumn,
-        ModeItemRowAndColumn,
-        ModeZoomRow,
-        ModeZoomColumn
-    };
-
-    enum ShadowQuality {
-        ShadowNone = 0,
-        ShadowLow = 1,
-        ShadowMedium = 3,
-        ShadowHigh = 5
-    };
-
-    enum LabelTransparency {
-        TransparencyNone = 0,       // Full solid, using colors from theme
-        TransparencyFromTheme,      // Use colors and transparencies from theme
-        TransparencyNoBackground    // Draw just text on transparent background
-    };
-
-    enum MeshStyle {
-        Spheres = 5,
-        Dots
-    };
-
-    enum CameraPreset {
-        NoPreset = -1,
-        PresetFrontLow = 0,
-        PresetFront,
-        PresetFrontHigh,
-        PresetLeftLow,
-        PresetLeft,
-        PresetLeftHigh,
-        PresetRightLow,
-        PresetRight,
-        PresetRightHigh,
-        PresetBehindLow,
-        PresetBehind,
-        PresetBehindHigh,
-        PresetIsometricLeft,
-        PresetIsometricLeftHigh,
-        PresetIsometricRight,
-        PresetIsometricRightHigh,
-        PresetDirectlyAbove,
-        PresetDirectlyAboveCW45,
-        PresetDirectlyAboveCCW45,
-        PresetFrontBelow,           // These work only for graphs including negative values.
-        PresetLeftBelow,            // They act as Preset...Low for positive-only values.
-        PresetRightBelow,
-        PresetBehindBelow,
-        PresetDirectlyBelow
-    };
-
-    enum ColorTheme {
-        ThemeDefault = -1,
-        ThemeSystem = 0,
-        ThemeBlueCerulean,
-        ThemeBlueIcy,
-        ThemeBlueNcs,
-        ThemeBrownSand,
-        ThemeDark,
-        ThemeHighContrast,
-        ThemeLight
-    };
+    Q_ENUMS(QtDataVis3D::QDataVis::SelectionMode)
+    Q_ENUMS(QtDataVis3D::QDataVis::ShadowQuality)
+    Q_ENUMS(QtDataVis3D::QDataVis::LabelTransparency)
+    Q_ENUMS(QtDataVis3D::QDataVis::MeshStyle)
+    Q_ENUMS(QtDataVis3D::QDataVis::CameraPreset)
+    Q_ENUMS(QtDataVis3D::QDataVis::ColorTheme)
 
 public:
     explicit DeclarativeScatter(QQuickItem *parent = 0);
@@ -158,8 +88,8 @@ public:
     void setMapping(QItemModelScatterDataMapping *mapping);
 
     // Object type
-    void setObjectType(MeshStyle style);
-    MeshStyle objectType();
+    void setObjectType(QDataVis::MeshStyle style);
+    QDataVis::MeshStyle objectType();
 
     // Object smoothing
     void setObjectSmooth(bool smooth);
@@ -170,17 +100,17 @@ public:
     QString meshFileName();
 
     // Select preset camera placement
-    void setCameraPreset(CameraPreset preset);
-    CameraPreset cameraPreset();
+    void setCameraPreset(QDataVis::CameraPreset preset);
+    QDataVis::CameraPreset cameraPreset();
 
     // Set theme (object colors, shaders, window color, background colors, light intensity and text
     // colors are affected)
-    void setTheme(ColorTheme theme);
-    ColorTheme theme();
+    void setTheme(QDataVis::ColorTheme theme);
+    QDataVis::ColorTheme theme();
 
     // Change selection mode
-    void setSelectionMode(SelectionMode mode);
-    SelectionMode selectionMode();
+    void setSelectionMode(QDataVis::SelectionMode mode);
+    QDataVis::SelectionMode selectionMode();
 
     // Font size adjustment
     void setFontSize(float fontsize);
@@ -191,8 +121,8 @@ public:
     QFont font();
 
     // Label transparency adjustment
-    void setLabelTransparency(LabelTransparency transparency);
-    LabelTransparency labelTransparency();
+    void setLabelTransparency(QDataVis::LabelTransparency transparency);
+    QDataVis::LabelTransparency labelTransparency();
 
     // Enable or disable background grid
     void setGridVisible(bool visible);
@@ -203,16 +133,16 @@ public:
     bool isBackgroundVisible();
 
     // Adjust shadow quality
-    void setShadowQuality(ShadowQuality quality);
-    ShadowQuality shadowQuality();
+    void setShadowQuality(QDataVis::ShadowQuality quality);
+    QDataVis::ShadowQuality shadowQuality();
 
 public slots:
     // Used to detect when shadow quality changes autonomously due to e.g. resizing.
-    void handleShadowQualityUpdate(QtDataVis3D::ShadowQuality quality);
+    void handleShadowQualityUpdate(QDataVis::ShadowQuality quality);
 
 signals:
     // Signals shadow quality changes.
-    void shadowQualityChanged(DeclarativeScatter::ShadowQuality quality);
+    void shadowQualityChanged(QDataVis::ShadowQuality quality);
 
 protected:
     Scatter3DController *m_shared;
@@ -225,8 +155,8 @@ protected:
 
 private:
     QSize m_initialisedSize;
-    CameraPreset m_cameraPreset;
-    ColorTheme m_theme;
+    QDataVis::CameraPreset m_cameraPreset;
+    QDataVis::ColorTheme m_theme;
 };
 
 QT_DATAVIS3D_END_NAMESPACE