Refactored SelectionMode

Task-number: QTRD-2362

Change-Id: I8d0c54d7a7d40fa063763427764aa32b4a3ed6a9
Change-Id: I8d0c54d7a7d40fa063763427764aa32b4a3ed6a9
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

23 files changed, 93 insertions, 91 deletions

diff --git a/examples/barchart/main.cpp b/examples/barchart/main.cpp
index acebed33..0820a920 100644
--- a/examples/barchart/main.cpp
+++ b/examples/barchart/main.cpp
@@ -85,7 +85,7 @@ ChartDataGenerator::ChartDataGenerator(Q3DBars *barchart, QTableWidget *tableWid
     m_tableWidget->setColumnCount(m_columnCount);
 
     // Set selection mode to full
-    m_chart->setSelectionMode(QDataVis::ModeItemRowAndColumn);
+    m_chart->setSelectionMode(QDataVis::SelectionModeItemRowAndColumn);
 
     // Hide axis labels by explicitly setting one empty string as label list
     m_chart->rowAxis()->setCategoryLabels(QStringList(QString()));
@@ -94,7 +94,7 @@ ChartDataGenerator::ChartDataGenerator(Q3DBars *barchart, QTableWidget *tableWid
     m_chart->activeDataProxy()->setItemLabelFormat(QStringLiteral("@valueLabel"));
 #else
     // Set selection mode to zoom row
-    m_chart->setSelectionMode(QDataVis::ModeSliceRow);
+    m_chart->setSelectionMode(QDataVis::SelectionModeSliceRow);
     m_chart->setFont(QFont("Impact", 20));
 #endif
 
diff --git a/examples/qmlbarchart/qml/qmlbarchart/main.qml b/examples/qmlbarchart/qml/qmlbarchart/main.qml
index 1bd413b5..a07a98c8 100644
--- a/examples/qmlbarchart/qml/qmlbarchart/main.qml
+++ b/examples/qmlbarchart/qml/qmlbarchart/main.qml
@@ -46,7 +46,7 @@ Item {
             width: dataView.width
             height: dataView.height
             shadowQuality: Bars3D.ShadowQualityMedium
-            selectionMode: Bars3D.ModeItem
+            selectionMode: Bars3D.SelectionModeItem
             font.pointSize: 35
             theme: Bars3D.ThemeRetro
             labelStyle: Bars3D.LabelStyleFromTheme
diff --git a/examples/qmlscatter/qml/qmlscatter/main.qml b/examples/qmlscatter/qml/qmlscatter/main.qml
index fba582ef..c4fbe516 100644
--- a/examples/qmlscatter/qml/qmlscatter/main.qml
+++ b/examples/qmlscatter/qml/qmlscatter/main.qml
@@ -43,7 +43,7 @@ Item {
             dataProxy: chartData.proxy
             theme: Scatter3D.ThemeIsabelle
             shadowQuality: Scatter3D.ShadowQualitySoftLow
-            selectionMode: Scatter3D.ModeItem
+            selectionMode: Scatter3D.SelectionModeItem
             itemLabelFormat: "X:@xLabel Y:@yLabel Z:@zLabel"
             axisX.segmentCount: 3
             axisX.subSegmentCount: 2
diff --git a/examples/rainfall/rainfallchart.cpp b/examples/rainfall/rainfallchart.cpp
index 24e45c7a..a454b79a 100644
--- a/examples/rainfall/rainfallchart.cpp
+++ b/examples/rainfall/rainfallchart.cpp
@@ -66,7 +66,7 @@ RainfallChart::RainfallChart(Q3DBars *rainfall)
     m_chart->setFont(QFont("Century Gothic", 30));
 
     // Set selection mode to bar and column
-    m_chart->setSelectionMode(QDataVis::ModeSliceColumn);
+    m_chart->setSelectionMode(QDataVis::SelectionModeSliceColumn);
 
     // Set theme
     m_chart->setTheme(QDataVis::ThemeArmyBlue);
diff --git a/examples/surfacechart/chartmodifier.cpp b/examples/surfacechart/chartmodifier.cpp
index efd6c49f..b0115fd3 100644
--- a/examples/surfacechart/chartmodifier.cpp
+++ b/examples/surfacechart/chartmodifier.cpp
@@ -350,20 +350,20 @@ void ChartModifier::changeSelectionMode(int mode)
 {
     switch (mode) {
     case 0:
-        qDebug() << "QDataVis::ModeNone";
-        m_chart->setSelectionMode(QDataVis::ModeNone);
+        qDebug() << "QDataVis::SelectionModeNone";
+        m_chart->setSelectionMode(QDataVis::SelectionModeNone);
         break;
     case 1:
-        qDebug() << "QDataVis::ModeItem";
-        m_chart->setSelectionMode(QDataVis::ModeItem);
+        qDebug() << "QDataVis::SelectionModeItem";
+        m_chart->setSelectionMode(QDataVis::SelectionModeItem);
         break;
     case 2:
-        qDebug() << "QDataVis::ModeSliceRow";
-        m_chart->setSelectionMode(QDataVis::ModeSliceRow);
+        qDebug() << "QDataVis::SelectionModeSliceRow";
+        m_chart->setSelectionMode(QDataVis::SelectionModeSliceRow);
         break;
     case 3:
-        qDebug() << "QDataVis::ModeSliceColumn";
-        m_chart->setSelectionMode(QDataVis::ModeSliceColumn);
+        qDebug() << "QDataVis::SelectionModeSliceColumn";
+        m_chart->setSelectionMode(QDataVis::SelectionModeSliceColumn);
         break;
     default:
         qDebug() << __FUNCTION__ << " Unsupported selection mode.";
diff --git a/examples/surfacechart/main.cpp b/examples/surfacechart/main.cpp
index 5bf60263..256f4e2d 100644
--- a/examples/surfacechart/main.cpp
+++ b/examples/surfacechart/main.cpp
@@ -167,10 +167,10 @@ int main(int argc, char *argv[])
 //    shadowQuality->addItem(QStringLiteral("High Soft"));
 //    shadowQuality->setCurrentIndex(3);
     QComboBox *selectionMode = new QComboBox(widget);
-    selectionMode->addItem(QStringLiteral("ModeNone"));
-    selectionMode->addItem(QStringLiteral("ModeItem"));
-    selectionMode->addItem(QStringLiteral("ModeSliceRow"));
-    selectionMode->addItem(QStringLiteral("ModeSliceColumn"));
+    selectionMode->addItem(QStringLiteral("SelectionModeNone"));
+    selectionMode->addItem(QStringLiteral("SelectionModeItem"));
+    selectionMode->addItem(QStringLiteral("SelectionModeSliceRow"));
+    selectionMode->addItem(QStringLiteral("SelectionModeSliceColumn"));
     selectionMode->setCurrentIndex(1);
 
     // Add controls to the layout
diff --git a/examples/widget/chart.cpp b/examples/widget/chart.cpp
index 6c0bedce..c9145a36 100644
--- a/examples/widget/chart.cpp
+++ b/examples/widget/chart.cpp
@@ -69,7 +69,7 @@ ChartModifier::ChartModifier(Q3DBars *barchart)
 
     m_chart->setFont(QFont("Times Roman", 20));
 
-    m_chart->setSelectionMode(QDataVis::ModeItem);
+    m_chart->setSelectionMode(QDataVis::SelectionModeItem);
 
     resetTemperatureData();
 }
diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp
index d5a45beb..13bc8801 100644
--- a/src/datavisualization/engine/abstract3dcontroller.cpp
+++ b/src/datavisualization/engine/abstract3dcontroller.cpp
@@ -39,7 +39,7 @@ Abstract3DController::Abstract3DController(QRect boundRect, QObject *parent) :
     m_verticalRotation(15.0f),
     m_theme(),
     m_font(QFont(QStringLiteral("Arial"))),
-    m_selectionMode(QDataVis::ModeItem),
+    m_selectionMode(QDataVis::SelectionModeItem),
     m_shadowQuality(QDataVis::ShadowQualityMedium),
     m_labelStyle(QDataVis::LabelStyleTransparent),
     m_isBackgroundEnabled(true),
diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp
index 6c180cc6..e1094813 100644
--- a/src/datavisualization/engine/abstract3drenderer.cpp
+++ b/src/datavisualization/engine/abstract3drenderer.cpp
@@ -37,7 +37,7 @@ Abstract3DRenderer::Abstract3DRenderer(Abstract3DController *controller)
       m_cachedBoundingRect(QRect(0,0,0,0)),
       m_cachedShadowQuality(QDataVis::ShadowQualityMedium),
       m_autoScaleAdjustment(1.0f),
-      m_cachedSelectionMode(QDataVis::ModeNone),
+      m_cachedSelectionMode(QDataVis::SelectionModeNone),
       m_cachedIsGridEnabled(false),
       m_cachedIsBackgroundEnabled(false),
       m_cachedScene(new Q3DScene())
diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp
index ed178aa1..8274675d 100644
--- a/src/datavisualization/engine/bars3drenderer.cpp
+++ b/src/datavisualization/engine/bars3drenderer.cpp
@@ -302,7 +302,7 @@ void Bars3DRenderer::drawSlicedScene(const LabelItem &xLabel,
         QMatrix4x4 itModelMatrix;
 
         GLfloat barPosY = negativesComp * item->translation().y() - m_yAdjustment / 2.0f + 0.2f; // we need some room for labels underneath; add +0.2f
-        if (QDataVis::ModeSliceRow == m_cachedSelectionMode)
+        if (QDataVis::SelectionModeSliceRow == m_cachedSelectionMode)
             barPosX = item->translation().x();
         else
             barPosX = -(item->translation().z() - zComp); // flip z; frontmost bar to the left
@@ -316,7 +316,7 @@ void Bars3DRenderer::drawSlicedScene(const LabelItem &xLabel,
         QVector3D baseColor;
         if (m_selection.x() == item->position().x() && m_selection.y() == item->position().y())
             baseColor = Utils::vectorFromColor(m_cachedTheme.m_highlightBarColor);
-        else if (QDataVis::ModeSliceRow == m_cachedSelectionMode)
+        else if (QDataVis::SelectionModeSliceRow == m_cachedSelectionMode)
             baseColor = Utils::vectorFromColor(m_cachedTheme.m_highlightRowColor);
         else
             baseColor = Utils::vectorFromColor(m_cachedTheme.m_highlightColumnColor);
@@ -327,7 +327,7 @@ void Bars3DRenderer::drawSlicedScene(const LabelItem &xLabel,
         QVector3D barColor;
         if (m_selection.x() == item->position().x() && m_selection.y() == item->position().y())
             barColor = Utils::vectorFromColor(m_cachedTheme.m_highlightBarColor);
-        else if (QDataVis::ModeSliceRow == m_cachedSelectionMode)
+        else if (QDataVis::SelectionModeSliceRow == m_cachedSelectionMode)
             barColor = Utils::vectorFromColor(m_cachedTheme.m_highlightRowColor);
         else
             barColor = Utils::vectorFromColor(m_cachedTheme.m_highlightColumnColor);
@@ -365,7 +365,7 @@ void Bars3DRenderer::drawSlicedScene(const LabelItem &xLabel,
     // Draw labels for axes
     BarRenderItem *dummyItem(0);
     const LabelItem &sliceSelectionLabel = *m_sliceTitleItem;
-    if (QDataVis::ModeSliceRow == m_cachedSelectionMode) {
+    if (QDataVis::SelectionModeSliceRow == m_cachedSelectionMode) {
         if (m_sliceTitleItem) {
             m_drawer->drawLabel(*dummyItem, sliceSelectionLabel, viewMatrix, projectionMatrix,
                                 QVector3D(0.0f, m_autoScaleAdjustment, zComp),
@@ -640,7 +640,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
 #endif
 
     // Skip selection mode drawing if we're slicing or have no selection mode
-    if (!m_cachedIsSlicingActivated && m_cachedSelectionMode > QDataVis::ModeNone) {
+    if (!m_cachedIsSlicingActivated && m_cachedSelectionMode > QDataVis::SelectionModeNone) {
         // Bind selection shader
         m_selectionShader->bind();
 
@@ -810,7 +810,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
 
             GLfloat lightStrength = m_cachedTheme.m_lightStrength;
 
-            if (m_cachedSelectionMode > QDataVis::ModeNone) {
+            if (m_cachedSelectionMode > QDataVis::SelectionModeNone) {
                 Bars3DController::SelectionType selectionType = isSelected(row, bar);
 
                 switch (selectionType) {
@@ -824,19 +824,19 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
                         item.setTranslation(modelMatrix.column(3).toVector3D());
                         barSelectionFound = true;
                     }
-                    if (selectionDirty && m_cachedSelectionMode >= QDataVis::ModeSliceRow) {
+                    if (selectionDirty && m_cachedSelectionMode >= QDataVis::SelectionModeSliceRow) {
                         item.setTranslation(modelMatrix.column(3).toVector3D());
                         item.setPosition(QPoint(row, bar));
                         m_sliceSelection->append(&item);
                         barSelectionFound = true;
-                        if (m_cachedSelectionMode == QDataVis::ModeSliceRow) {
+                        if (m_cachedSelectionMode == QDataVis::SelectionModeSliceRow) {
                             if (m_axisCacheX.labelItems().size() > row)
                                 m_sliceTitleItem = m_axisCacheX.labelItems().at(row);
                             if (!m_sliceCache) {
                                 // m_sliceCache is the axis for labels, while title comes from different axis.
                                 m_sliceCache = &m_axisCacheZ;
                             }
-                        } else if (m_cachedSelectionMode == QDataVis::ModeSliceColumn) {
+                        } else if (m_cachedSelectionMode == QDataVis::SelectionModeSliceColumn) {
                             if (m_axisCacheZ.labelItems().size() > bar)
                                 m_sliceTitleItem = m_axisCacheZ.labelItems().at(bar);
                             if (!m_sliceCache) {
@@ -851,7 +851,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
                     // Current bar is on the same row as the selected bar
                     barColor = Utils::vectorFromColor(m_cachedTheme.m_highlightRowColor);
                     lightStrength = m_cachedTheme.m_highlightLightStrength;
-                    if (QDataVis::ModeSliceRow == m_cachedSelectionMode) {
+                    if (QDataVis::SelectionModeSliceRow == m_cachedSelectionMode) {
                         item.setTranslation(modelMatrix.column(3).toVector3D());
                         item.setPosition(QPoint(row, bar));
                         if (selectionDirty)
@@ -863,7 +863,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
                     // Current bar is on the same column as the selected bar
                     barColor = Utils::vectorFromColor(m_cachedTheme.m_highlightColumnColor);
                     lightStrength = m_cachedTheme.m_highlightLightStrength;
-                    if (QDataVis::ModeSliceColumn == m_cachedSelectionMode) {
+                    if (QDataVis::SelectionModeSliceColumn == m_cachedSelectionMode) {
                         item.setTranslation(modelMatrix.column(3).toVector3D());
                         item.setPosition(QPoint(row, bar));
                         if (selectionDirty)
@@ -1391,7 +1391,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
                     || QDataVis::InputOnOverview == m_controller->inputState())) {
             m_cachedScene->setSlicingActive(false);
         }
-    } else if (m_cachedSelectionMode >= QDataVis::ModeSliceRow && selectionDirty) {
+    } else if (m_cachedSelectionMode >= QDataVis::SelectionModeSliceRow && selectionDirty) {
         // Activate slice mode
         m_cachedScene->setSlicingActive(true);
 
@@ -1537,9 +1537,9 @@ void Bars3DRenderer::updateSelectionMode(QDataVis::SelectionMode mode)
     Abstract3DRenderer::updateSelectionMode(mode);
 
     // Create zoom selection if there isn't one
-    if (mode >= QDataVis::ModeSliceRow && !m_sliceSelection) {
+    if (mode >= QDataVis::SelectionModeSliceRow && !m_sliceSelection) {
         m_sliceSelection = new QList<BarRenderItem *>;
-        if (mode == QDataVis::ModeSliceRow)
+        if (mode == QDataVis::SelectionModeSliceRow)
             m_sliceSelection->reserve(m_cachedRowCount);
         else
             m_sliceSelection->reserve(m_cachedColumnCount);
@@ -1700,14 +1700,14 @@ Bars3DController::SelectionType Bars3DRenderer::isSelected(GLint row, GLint bar)
     if (current == m_selection) {
         isSelectedType = Bars3DController::SelectionItem;
     }
-    else if (current.y() == m_selection.y() && (m_cachedSelectionMode == QDataVis::ModeItemAndColumn
-                                                || m_cachedSelectionMode == QDataVis::ModeItemRowAndColumn
-                                                || m_cachedSelectionMode == QDataVis::ModeSliceColumn)) {
+    else if (current.y() == m_selection.y() && (m_cachedSelectionMode == QDataVis::SelectionModeItemAndColumn
+                                                || m_cachedSelectionMode == QDataVis::SelectionModeItemRowAndColumn
+                                                || m_cachedSelectionMode == QDataVis::SelectionModeSliceColumn)) {
         isSelectedType = Bars3DController::SelectionColumn;
     }
-    else if (current.x() == m_selection.x() && (m_cachedSelectionMode == QDataVis::ModeItemAndRow
-                                                || m_cachedSelectionMode == QDataVis::ModeItemRowAndColumn
-                                                || m_cachedSelectionMode == QDataVis::ModeSliceRow)) {
+    else if (current.x() == m_selection.x() && (m_cachedSelectionMode == QDataVis::SelectionModeItemAndRow
+                                                || m_cachedSelectionMode == QDataVis::SelectionModeItemRowAndColumn
+                                                || m_cachedSelectionMode == QDataVis::SelectionModeSliceRow)) {
         isSelectedType = Bars3DController::SelectionRow;
     }
     return isSelectedType;
diff --git a/src/datavisualization/engine/drawer.cpp b/src/datavisualization/engine/drawer.cpp
index 57fa5eb4..35623c99 100644
--- a/src/datavisualization/engine/drawer.cpp
+++ b/src/datavisualization/engine/drawer.cpp
@@ -295,7 +295,7 @@ void Drawer::drawLabel(const AbstractRenderItem &item, const LabelItem &labelIte
         xPosition = item.translation().x();
         if (useDepth)
             zPosition = item.translation().z();
-        else if (QDataVis::ModeSliceColumn == mode)
+        else if (QDataVis::SelectionModeSliceColumn == mode)
             xPosition = -(item.translation().z()) + positionComp.z(); // flip first to left
     }
 
diff --git a/src/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp
index f31897c3..1a0ff961 100644
--- a/src/datavisualization/engine/q3dbars.cpp
+++ b/src/datavisualization/engine/q3dbars.cpp
@@ -316,7 +316,7 @@ QColor Q3DBars::barColor() const
  * \property Q3DBars::selectionMode
  *
  * Sets bar selection \a mode to one of \c QDataVis::SelectionMode. It is preset to
- * \c QDataVis::ModeItem by default.
+ * \c QDataVis::SelectionModeItem by default.
  */
 void Q3DBars::setSelectionMode(QDataVis::SelectionMode mode)
 {
diff --git a/src/datavisualization/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp
index f2a12a12..64df5f04 100644
--- a/src/datavisualization/engine/q3dscatter.cpp
+++ b/src/datavisualization/engine/q3dscatter.cpp
@@ -255,7 +255,7 @@ QColor Q3DScatter::objectColor() const
  * \property Q3DScatter::selectionMode
  *
  * Sets item selection \a mode to one of \c QDataVis::SelectionMode. It is preset to
- * \c QDataVis::ModeItem by default.
+ * \c QDataVis::SelectionModeItem by default.
  */
 void Q3DScatter::setSelectionMode(QDataVis::SelectionMode mode)
 {
diff --git a/src/datavisualization/engine/q3dsurface.cpp b/src/datavisualization/engine/q3dsurface.cpp
index 9fa81358..ff1e3113 100644
--- a/src/datavisualization/engine/q3dsurface.cpp
+++ b/src/datavisualization/engine/q3dsurface.cpp
@@ -284,8 +284,8 @@ bool Q3DSurface::isSmoothSurfaceEnabled() const
 /*!
  * \property Q3DSurface::selectionMode
  *
- * Sets point selection \a mode to one of \c QDataVis::SelectionMode. Surface supports ModeItem,
- * ModeSliceRow and ModeSliceColumn. It is preset to \c QDataVis::ModeItem by default.
+ * Sets point selection \a mode to one of \c QDataVis::SelectionMode. Surface supports SelectionModeItem,
+ * SelectionModeSliceRow and SelectionModeSliceColumn. It is preset to \c QDataVis::SelectionModeItem by default.
  */
 void Q3DSurface::setSelectionMode(QDataVis::SelectionMode mode)
 {
diff --git a/src/datavisualization/engine/scatter3dcontroller.cpp b/src/datavisualization/engine/scatter3dcontroller.cpp
index af494e71..126f6736 100644
--- a/src/datavisualization/engine/scatter3dcontroller.cpp
+++ b/src/datavisualization/engine/scatter3dcontroller.cpp
@@ -207,7 +207,7 @@ void Scatter3DController::setObjectType(QDataVis::MeshStyle style, bool smooth)
 
 void Scatter3DController::setSelectionMode(QDataVis::SelectionMode mode)
 {
-    if (mode > QDataVis::ModeItem) {
+    if (mode > QDataVis::SelectionModeItem) {
         qWarning("Unsupported selection mode.");
         return;
     }
diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp
index 108933f7..83e9a72f 100644
--- a/src/datavisualization/engine/scatter3drenderer.cpp
+++ b/src/datavisualization/engine/scatter3drenderer.cpp
@@ -377,7 +377,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
 #endif
 
     // Skip selection mode drawing if we have no selection mode
-    if (m_cachedSelectionMode > QDataVis::ModeNone) {
+    if (m_cachedSelectionMode > QDataVis::SelectionModeNone) {
         // Bind selection shader
         m_selectionShader->bind();
 
@@ -535,7 +535,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
 #endif
 
         GLfloat lightStrength = m_cachedTheme.m_lightStrength;
-        if (m_cachedSelectionMode > QDataVis::ModeNone && (selectedIndex == dot)) {
+        if (m_cachedSelectionMode > QDataVis::SelectionModeNone && (selectedIndex == dot)) {
             dotColor = Utils::vectorFromColor(m_cachedTheme.m_highlightBarColor);
             lightStrength = m_cachedTheme.m_highlightLightStrength;
             // Insert data to ScatterRenderItem. We have no ownership, don't delete the previous one
diff --git a/src/datavisualization/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp
index b4caf5de..a68f919e 100644
--- a/src/datavisualization/engine/surface3dcontroller.cpp
+++ b/src/datavisualization/engine/surface3dcontroller.cpp
@@ -150,8 +150,9 @@ void Surface3DController::setGradientColorAt(qreal pos, const QColor &color)
 
 void Surface3DController::setSelectionMode(QDataVis::SelectionMode mode)
 {
-    if (!(mode == QDataVis::ModeNone || mode == QDataVis::ModeItem || mode == QDataVis::ModeSliceRow
-        || mode == QDataVis::ModeSliceColumn)) {
+    if (!(mode == QDataVis::SelectionModeNone || mode == QDataVis::SelectionModeItem
+          || mode == QDataVis::SelectionModeSliceRow
+          || mode == QDataVis::SelectionModeSliceColumn)) {
         qWarning("Unsupported selection mode.");
         return;
     }
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index 539cdb19..b0472c9b 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -271,9 +271,9 @@ void Surface3DRenderer::updateSliceDataModel(int selectionId)
     m_sliceDataArray.reserve(2);
     QSurfaceDataRow *sliceRow;
 
-    if (m_cachedSelectionMode == QDataVis::ModeSliceRow) {
+    if (m_cachedSelectionMode == QDataVis::SelectionModeSliceRow) {
         sliceRow = new QSurfaceDataRow(*m_dataArray.at(row));
-    } else if (m_cachedSelectionMode == QDataVis::ModeSliceColumn) {
+    } else if (m_cachedSelectionMode == QDataVis::SelectionModeSliceColumn) {
         sliceRow = new QSurfaceDataRow();
         sliceRow->resize(m_sampleSpace.height());
         for (int i = 0; i < m_sampleSpace.height(); i++)
@@ -476,11 +476,11 @@ void Surface3DRenderer::drawSlicedScene()
     GLfloat scaleX;
     GLfloat scaleXBackground;
     GLfloat offset;
-    if (m_cachedSelectionMode == QDataVis::ModeSliceRow) {
+    if (m_cachedSelectionMode == QDataVis::SelectionModeSliceRow) {
         scaleX = m_surfaceScaleX;
         scaleXBackground = m_scaleXWithBackground;
         offset = m_surfaceOffsetX;
-    } else if (m_cachedSelectionMode == QDataVis::ModeSliceColumn) {
+    } else if (m_cachedSelectionMode == QDataVis::SelectionModeSliceColumn) {
         scaleX = m_surfaceScaleZ;
         scaleXBackground = m_scaleZWithBackground;
         offset = -m_surfaceOffsetZ;
@@ -505,7 +505,7 @@ void Surface3DRenderer::drawSlicedScene()
         MVPMatrix = projectionViewMatrix * modelMatrix;
 
         QVector3D color;
-        if (m_cachedSelectionMode == QDataVis::ModeSliceRow)
+        if (m_cachedSelectionMode == QDataVis::SelectionModeSliceRow)
             color = Utils::vectorFromColor(m_cachedTheme.m_highlightRowColor);
         else
             color = Utils::vectorFromColor(m_cachedTheme.m_highlightColumnColor);
@@ -603,7 +603,7 @@ void Surface3DRenderer::drawSlicedScene()
     int lastSegment;
     GLfloat lineStep;
     GLfloat linePos;
-    if (m_cachedSelectionMode == QDataVis::ModeSliceRow) {
+    if (m_cachedSelectionMode == QDataVis::SelectionModeSliceRow) {
         lineStep = -2.0f * aspectRatio * m_axisCacheX.subSegmentStep() / m_scaleFactor;
         lastSegment = m_axisCacheX.subSegmentCount() * m_axisCacheX.segmentCount();
         linePos = m_scaleX;
@@ -641,7 +641,7 @@ void Surface3DRenderer::drawSlicedScene()
         linePos += lineStep;
     }
 
-    if (m_cachedSelectionMode == QDataVis::ModeSliceRow)
+    if (m_cachedSelectionMode == QDataVis::SelectionModeSliceRow)
         linePos = m_scaleX;
     else
         linePos = m_scaleZ;
@@ -712,7 +712,7 @@ void Surface3DRenderer::drawSlicedScene()
 
     // X Labels to ground
     int countLabelItems;
-    if (m_cachedSelectionMode == QDataVis::ModeSliceRow) {
+    if (m_cachedSelectionMode == QDataVis::SelectionModeSliceRow) {
         posStep = 2.0f * aspectRatio * m_axisCacheX.segmentStep() / m_scaleFactor;
         labelPos = -m_scaleX;
         lastSegment = m_axisCacheX.segmentCount();
@@ -736,15 +736,15 @@ void Surface3DRenderer::drawSlicedScene()
             m_dummyRenderItem.setTranslation(labelTrans);
 
             LabelItem *axisLabelItem;
-            if (m_cachedSelectionMode == QDataVis::ModeSliceRow)
+            if (m_cachedSelectionMode == QDataVis::SelectionModeSliceRow)
                 axisLabelItem = m_axisCacheX.labelItems().at(labelNbr);
             else
                 axisLabelItem = m_axisCacheZ.labelItems().at(labelNbr);
 
             m_drawer->drawLabel(m_dummyRenderItem, *axisLabelItem, viewMatrix, projectionMatrix,
-                                positionComp, rotation, 0, QDataVis::ModeSliceRow, m_labelShader,
-                                m_labelObj, m_cachedScene->activeCamera(), false, false,
-                                Drawer::LabelBelow, Qt::AlignTop);
+                                positionComp, rotation, 0, QDataVis::SelectionModeSliceRow,
+                                m_labelShader, m_labelObj, m_cachedScene->activeCamera(),
+                                false, false, Drawer::LabelBelow, Qt::AlignTop);
         }
         labelNbr++;
         labelPos += posStep;
@@ -919,8 +919,8 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
     glEnable(GL_TEXTURE_2D);
 
     // Draw selection buffer
-    if (!m_cachedIsSlicingActivated && m_controller->inputState() == QDataVis::InputOnScene && m_surfaceObj
-        && m_cachedSelectionMode > QDataVis::ModeNone) {
+    if (!m_cachedIsSlicingActivated && m_controller->inputState() == QDataVis::InputOnScene
+            && m_surfaceObj && m_cachedSelectionMode > QDataVis::SelectionModeNone) {
         m_selectionShader->bind();
         glBindFramebuffer(GL_FRAMEBUFFER, m_selectionFrameBuffer);
         glEnable(GL_DEPTH_TEST); // Needed, otherwise the depth render buffer is not used
@@ -1625,17 +1625,18 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
     if (m_selectionModeChanged || selectionDirty) {
         if (selectionDirty)
             m_cachedSelectionId = selectionId;
-        if (m_cachedSelectionMode == QDataVis::ModeNone) {
+        if (m_cachedSelectionMode == QDataVis::SelectionModeNone) {
             m_cachedSelectionId = 0;
             m_selectionActive = false;
         }
-        if (m_cachedSelectionMode == QDataVis::ModeItem) {
+        if (m_cachedSelectionMode == QDataVis::SelectionModeItem) {
             if (m_cachedSelectionId)
                 surfacePointSelected(m_cachedSelectionId);
             else
                 m_selectionActive = false;
         }
-        if (m_cachedSelectionMode == QDataVis::ModeSliceRow || m_cachedSelectionMode == QDataVis::ModeSliceColumn) {
+        if (m_cachedSelectionMode == QDataVis::SelectionModeSliceRow
+                || m_cachedSelectionMode == QDataVis::SelectionModeSliceColumn) {
             if (m_cachedSelectionId) {
                 updateSliceDataModel(m_cachedSelectionId);
                 m_cachedScene->setSlicingActive(true);
@@ -1893,13 +1894,13 @@ void Surface3DRenderer::surfacePointSelected(int id)
         m_selectionPointer = new SelectionPointer(m_drawer);
 
     QVector3D pos;
-    if (m_cachedSelectionMode == QDataVis::ModeSliceRow) {
+    if (m_cachedSelectionMode == QDataVis::SelectionModeSliceRow) {
         pos = normalize(column, 0);
         pos *= QVector3D(m_surfaceScaleX, 1.0f, 0.0f);
         pos += QVector3D(m_surfaceOffsetX, 0.0f, 0.0f);
         m_selectionPointer->updateBoundingRect(m_sliceViewPort);
         m_selectionPointer->updateSliceData(true, m_autoScaleAdjustment);
-    } else if (m_cachedSelectionMode == QDataVis::ModeSliceColumn) {
+    } else if (m_cachedSelectionMode == QDataVis::SelectionModeSliceColumn) {
         pos = normalize(0, row);
         pos.setX(-pos.z());
         pos *= QVector3D(m_surfaceScaleZ, 1.0f, 0.0f);
diff --git a/src/datavisualization/global/qdatavisualizationenums.h b/src/datavisualization/global/qdatavisualizationenums.h
index 8bdf55d7..0115c7cc 100644
--- a/src/datavisualization/global/qdatavisualizationenums.h
+++ b/src/datavisualization/global/qdatavisualizationenums.h
@@ -96,13 +96,13 @@ public:
     };
 
     enum SelectionMode {
-        ModeNone = 0,
-        ModeItem,
-        ModeItemAndRow,
-        ModeItemAndColumn,
-        ModeItemRowAndColumn,
-        ModeSliceRow,
-        ModeSliceColumn
+        SelectionModeNone = 0,
+        SelectionModeItem,
+        SelectionModeItemAndRow,
+        SelectionModeItemAndColumn,
+        SelectionModeItemRowAndColumn,
+        SelectionModeSliceRow,
+        SelectionModeSliceColumn
     };
 
     enum ShadowQuality {
diff --git a/src/datavisualization/global/qtdatavisualizationenums.qdoc b/src/datavisualization/global/qtdatavisualizationenums.qdoc
index 80e97aff..b549bf8d 100644
--- a/src/datavisualization/global/qtdatavisualizationenums.qdoc
+++ b/src/datavisualization/global/qtdatavisualizationenums.qdoc
@@ -120,22 +120,22 @@
 
     Item selection modes.
 
-    \value ModeNone
+    \value SelectionModeNone
            Selection mode disabled.
-    \value ModeItem
+    \value SelectionModeItem
            Selection selects a single item.
-    \value ModeItemAndRow
+    \value SelectionModeItemAndRow
            Selection selects a single item and highlights the row it is on. In Q3DBars only.
-    \value ModeItemAndColumn
+    \value SelectionModeItemAndColumn
            Selection selects a single item and highlights the column it is on. In Q3DBars only.
-    \value ModeItemRowAndColumn
+    \value SelectionModeItemRowAndColumn
            Selection selects a single item and highlights the row and the column it is on. In
            Q3DBars only.
-    \value ModeSliceRow
+    \value SelectionModeSliceRow
            Selection selects a single item and displays the row it is on in a separate view. The
            original view is shrunk into upper left corner. Original view is restored by clicking
            on it. In Q3DBars only.
-    \value ModeSliceColumn
+    \value SelectionModeSliceColumn
            Selection selects a single item and displays the column it is on in a separate view. The
            original view is shrunk into upper left corner. Original view is restored by clicking
            on it. In Q3DBars only.
diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp
index d07b87f4..fa1d55e4 100644
--- a/tests/barstest/chart.cpp
+++ b/tests/barstest/chart.cpp
@@ -140,7 +140,7 @@ void ChartModifier::restart(bool dynamicData)
         m_chart->setRowAxis(m_yearAxis);
         m_chart->setColumnAxis(m_monthAxis);
 
-        m_chart->setSelectionMode(QDataVis::ModeItem);
+        m_chart->setSelectionMode(QDataVis::SelectionModeItem);
     } else {
         m_chart->setActiveDataProxy(m_genericData);
 
@@ -150,7 +150,7 @@ void ChartModifier::restart(bool dynamicData)
         m_chart->setRowAxis(m_genericRowAxis);
         m_chart->setColumnAxis(m_genericColumnAxis);
 
-        m_chart->setSelectionMode(QDataVis::ModeItem);
+        m_chart->setSelectionMode(QDataVis::SelectionModeItem);
     }
 }
 
@@ -475,8 +475,8 @@ void ChartModifier::changeSelectionMode()
 {
     static int selectionMode = m_chart->selectionMode();
 
-    if (++selectionMode > QDataVis::ModeSliceColumn)
-        selectionMode = QDataVis::ModeNone;
+    if (++selectionMode > QDataVis::SelectionModeSliceColumn)
+        selectionMode = QDataVis::SelectionModeNone;
 
     m_chart->setSelectionMode((QDataVis::SelectionMode)selectionMode);
 }
diff --git a/tests/kinectsurface/surfacedata.cpp b/tests/kinectsurface/surfacedata.cpp
index 28022a4e..d69c35ce 100644
--- a/tests/kinectsurface/surfacedata.cpp
+++ b/tests/kinectsurface/surfacedata.cpp
@@ -45,7 +45,7 @@ SurfaceData::SurfaceData(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars
     gradient.setColorAt(0.33, Qt::blue);
     gradient.setColorAt(0.67, Qt::red);
     gradient.setColorAt(1.0, Qt::yellow);
-    m_surface->setSelectionMode(QDataVis::ModeNone);
+    m_surface->setSelectionMode(QDataVis::SelectionModeNone);
     m_surface->setGridVisible(false);
     m_surface->setGradient(gradient);
     m_surface->axisY()->setMax(255);
@@ -57,7 +57,7 @@ SurfaceData::SurfaceData(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars
 
     // Initialize scatter
     m_scatter->setTheme(QDataVis::ThemeStoneMoss);
-    m_scatter->setSelectionMode(QDataVis::ModeNone);
+    m_scatter->setSelectionMode(QDataVis::SelectionModeNone);
     m_scatter->setGridVisible(false);
     m_scatter->setObjectType(QDataVis::Dots, false);
     m_scatter->setShadowQuality(QDataVis::ShadowQualitySoftLow);
@@ -71,7 +71,7 @@ SurfaceData::SurfaceData(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars
 
     // Initialize bars
     m_bars->setTheme(QDataVis::ThemeQt);
-    m_bars->setSelectionMode(QDataVis::ModeNone);
+    m_bars->setSelectionMode(QDataVis::SelectionModeNone);
     m_bars->setGridVisible(false);
     m_bars->setBarType(QDataVis::Bars, true);
 #if 1
diff --git a/tests/spectrum/spectrumapp/main.cpp b/tests/spectrum/spectrumapp/main.cpp
index 7fbd92d5..560c3a83 100644
--- a/tests/spectrum/spectrumapp/main.cpp
+++ b/tests/spectrum/spectrumapp/main.cpp
@@ -97,7 +97,7 @@ MainApp::MainApp(Q3DBars *window)
     // Set color scheme
     m_chart->setBarColor(QColor(Qt::red), false);
     // Disable selection
-    m_chart->setSelectionMode(QDataVis::ModeNone);
+    m_chart->setSelectionMode(QDataVis::SelectionModeNone);
     QObject::connect(m_engine, &Engine::changedSpectrum, this, &MainApp::spectrumChanged);
     QObject::connect(m_engine, &Engine::stateChanged, this, &MainApp::stateChanged);
     m_restartTimer->setSingleShot(true);