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>

1 files changed, 17 insertions, 17 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;
 }