Refactored LabelTransparency and ShadowQuality

Task-number: QTRD-2362

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

3 files changed, 8 insertions, 8 deletions

diff --git a/tests/scattertest/main.cpp b/tests/scattertest/main.cpp
index 933ae58e..35ba228d 100644
--- a/tests/scattertest/main.cpp
+++ b/tests/scattertest/main.cpp
@@ -184,7 +184,7 @@ int main(int argc, char **argv)
     QObject::connect(themeButton, &QPushButton::clicked, modifier,
                      &ScatterDataModifier::changeTheme);
     QObject::connect(labelButton, &QPushButton::clicked, modifier,
-                     &ScatterDataModifier::changeTransparency);
+                     &ScatterDataModifier::changeStyle);
 
     QObject::connect(shadowQuality, SIGNAL(currentIndexChanged(int)), modifier,
                      SLOT(changeShadowQuality(int)));
diff --git a/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp
index 7c45a336..a0b56753 100644
--- a/tests/scattertest/scatterchart.cpp
+++ b/tests/scattertest/scatterchart.cpp
@@ -36,7 +36,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
     m_chart->setFont(font);
     m_chart->setObjectType(QDataVis::Spheres, true);
     m_chart->setTheme(QDataVis::ThemeStoneMoss);
-    m_chart->setShadowQuality(QDataVis::ShadowHigh);
+    m_chart->setShadowQuality(QDataVis::ShadowQualityHigh);
     m_chart->setCameraPreset(QDataVis::PresetFront);
     m_chart->setAxisX(new Q3DValueAxis);
     m_chart->setAxisY(new Q3DValueAxis);
@@ -133,14 +133,14 @@ void ScatterDataModifier::changeTheme()
         theme = QDataVis::ThemeQt;
 }
 
-void ScatterDataModifier::changeTransparency()
+void ScatterDataModifier::changeLabelStyle()
 {
-    static int transparency = QDataVis::TransparencyNone;
+    static int style = QDataVis::LabelStyleOpaque;
 
-    m_chart->setLabelTransparency((QDataVis::LabelTransparency)transparency);
+    m_chart->setLabelStyle((QDataVis::LabelStyle)style);
 
-    if (++transparency > QDataVis::TransparencyNoBackground)
-        transparency = QDataVis::TransparencyNone;
+    if (++style > QDataVis::LabelStyleTransparent)
+        style = QDataVis::LabelStyleOpaque;
 }
 
 void ScatterDataModifier::changeFont(const QFont &font)
diff --git a/tests/scattertest/scatterchart.h b/tests/scattertest/scatterchart.h
index eef94ac4..7132e7ce 100644
--- a/tests/scattertest/scatterchart.h
+++ b/tests/scattertest/scatterchart.h
@@ -38,7 +38,7 @@ public:
     void changeStyle();
     void changePresetCamera();
     void changeTheme();
-    void changeTransparency();
+    void changeLabelStyle();
     void changeFont(const QFont &font);
     void changeFontSize(int fontsize);
     void setBackgroundEnabled(int enabled);