Refactored SelectionMode

Task-number: QTRD-2362

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

7 files changed, 18 insertions, 18 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();
 }