Refactored LabelTransparency and ShadowQuality

Task-number: QTRD-2362

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

14 files changed, 36 insertions, 36 deletions

diff --git a/examples/audiolevels/audiolevels.cpp b/examples/audiolevels/audiolevels.cpp
index 027b73d5..bfa419b4 100644
--- a/examples/audiolevels/audiolevels.cpp
+++ b/examples/audiolevels/audiolevels.cpp
@@ -41,7 +41,7 @@ AudioLevels::AudioLevels(Q3DBars *chart, QObject *parent)
     m_graph->setGridVisible(false);
     m_graph->setBackgroundVisible(false);
     m_graph->valueAxis()->setRange(0.0, 1.0);
-    m_graph->setShadowQuality(QDataVis::ShadowNone);
+    m_graph->setShadowQuality(QDataVis::ShadowQualityNone);
     m_graph->setCameraPosition(-20.0, 10.0, 10);
     m_graph->setTheme(QDataVis::ThemeIsabelle);
 
diff --git a/examples/qmlbarchart/qml/qmlbarchart/main.qml b/examples/qmlbarchart/qml/qmlbarchart/main.qml
index 9ad3f022..1bd413b5 100644
--- a/examples/qmlbarchart/qml/qmlbarchart/main.qml
+++ b/examples/qmlbarchart/qml/qmlbarchart/main.qml
@@ -45,11 +45,11 @@ Item {
             id: testChart
             width: dataView.width
             height: dataView.height
-            shadowQuality: Bars3D.ShadowMedium
+            shadowQuality: Bars3D.ShadowQualityMedium
             selectionMode: Bars3D.ModeItem
             font.pointSize: 35
             theme: Bars3D.ThemeRetro
-            labelTransparency: Bars3D.TransparencyFromTheme
+            labelStyle: Bars3D.LabelStyleFromTheme
             dataProxy: chartData.proxy
             barThickness: 0.5
             barSpacing: Qt.size(0.5, 0.5)
@@ -106,11 +106,11 @@ Item {
         height: 60
         text: "Hide Shadows"
         onClicked: {
-            if (testChart.shadowQuality == Bars3D.ShadowNone) {
-                testChart.shadowQuality = Bars3D.ShadowMedium;
+            if (testChart.shadowQuality == Bars3D.ShadowQualityNone) {
+                testChart.shadowQuality = Bars3D.ShadowQualityMedium;
                 text = "Hide Shadows"
             } else {
-                testChart.shadowQuality = Bars3D.ShadowNone;
+                testChart.shadowQuality = Bars3D.ShadowQualityNone;
                 text = "Show Shadows"
             }
         }
diff --git a/examples/qmlscatter/qml/qmlscatter/main.qml b/examples/qmlscatter/qml/qmlscatter/main.qml
index e533801b..fba582ef 100644
--- a/examples/qmlscatter/qml/qmlscatter/main.qml
+++ b/examples/qmlscatter/qml/qmlscatter/main.qml
@@ -42,7 +42,7 @@ Item {
             font.pointSize: 40
             dataProxy: chartData.proxy
             theme: Scatter3D.ThemeIsabelle
-            shadowQuality: Scatter3D.ShadowSoftLow
+            shadowQuality: Scatter3D.ShadowQualitySoftLow
             selectionMode: Scatter3D.ModeItem
             itemLabelFormat: "X:@xLabel Y:@yLabel Z:@zLabel"
             axisX.segmentCount: 3
@@ -62,11 +62,11 @@ Item {
         width: parent.width / 6
         text: "Hide Shadows"
         onClicked: {
-            if (testscatter.shadowQuality === Scatter3D.ShadowNone) {
-                testscatter.shadowQuality = Scatter3D.ShadowSoftLow;
+            if (testscatter.shadowQuality === Scatter3D.ShadowQualityNone) {
+                testscatter.shadowQuality = Scatter3D.ShadowQualitySoftLow;
                 text = "Hide Shadows";
             } else {
-                testscatter.shadowQuality = Scatter3D.ShadowNone;
+                testscatter.shadowQuality = Scatter3D.ShadowQualityNone;
                 text = "Show Shadows";
             }
         }
diff --git a/examples/qmlsurface/qml/qmlsurface/main.qml b/examples/qmlsurface/qml/qmlsurface/main.qml
index 0b22d6b6..7de2801f 100644
--- a/examples/qmlsurface/qml/qmlsurface/main.qml
+++ b/examples/qmlsurface/qml/qmlsurface/main.qml
@@ -48,7 +48,7 @@ Item {
             width: surfaceView.width
             height: surfaceView.height
             theme: Surface3D.ThemeStoneMoss
-            shadowQuality: Surface3D.ShadowMedium
+            shadowQuality: Surface3D.ShadowQualityMedium
             smoothSurfaceEnabled: true
             surfaceGridEnabled: false
             font.family: "STCaiyun"
diff --git a/examples/rainfall/rainfallchart.cpp b/examples/rainfall/rainfallchart.cpp
index 1a1e7b74..24e45c7a 100644
--- a/examples/rainfall/rainfallchart.cpp
+++ b/examples/rainfall/rainfallchart.cpp
@@ -60,7 +60,7 @@ RainfallChart::RainfallChart(Q3DBars *rainfall)
     m_chart->setBarType(QDataVis::Cylinders, false);
 
     // Set shadows to medium
-    m_chart->setShadowQuality(QDataVis::ShadowMedium);
+    m_chart->setShadowQuality(QDataVis::ShadowQualityMedium);
 
     // Set font
     m_chart->setFont(QFont("Century Gothic", 30));
diff --git a/examples/scatterchart/main.cpp b/examples/scatterchart/main.cpp
index f61c2ab4..9d66a9b9 100644
--- a/examples/scatterchart/main.cpp
+++ b/examples/scatterchart/main.cpp
@@ -120,7 +120,7 @@ int main(int argc, char **argv)
     QObject::connect(cameraButton, &QPushButton::clicked, modifier,
                      &ScatterDataModifier::changePresetCamera);
     QObject::connect(labelButton, &QPushButton::clicked, modifier,
-                     &ScatterDataModifier::changeTransparency);
+                     &ScatterDataModifier::changeLabelStyle);
 
     QObject::connect(backgroundCheckBox, &QCheckBox::stateChanged, modifier,
                      &ScatterDataModifier::setBackgroundEnabled);
diff --git a/examples/scatterchart/scatterchart.cpp b/examples/scatterchart/scatterchart.cpp
index 6d6e3eff..bd101527 100644
--- a/examples/scatterchart/scatterchart.cpp
+++ b/examples/scatterchart/scatterchart.cpp
@@ -37,7 +37,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
     m_chart->setFont(font);
     m_chart->setObjectType(QDataVis::Spheres, true);
     m_chart->setTheme(QDataVis::ThemeEbony);
-    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);
@@ -117,14 +117,14 @@ void ScatterDataModifier::changePresetCamera()
         preset = QDataVis::PresetFrontLow;
 }
 
-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/examples/scatterchart/scatterchart.h b/examples/scatterchart/scatterchart.h
index bfdcb5bc..f67a0e88 100644
--- a/examples/scatterchart/scatterchart.h
+++ b/examples/scatterchart/scatterchart.h
@@ -34,7 +34,7 @@ public:
     void addData();
     void changeStyle();
     void changePresetCamera();
-    void changeTransparency();
+    void changeLabelStyle();
     void changeFont(const QFont &font);
     void changeFontSize(int fontsize);
     void setBackgroundEnabled(int enabled);
diff --git a/examples/surfacechart/chartmodifier.cpp b/examples/surfacechart/chartmodifier.cpp
index a5c6f3fd..efd6c49f 100644
--- a/examples/surfacechart/chartmodifier.cpp
+++ b/examples/surfacechart/chartmodifier.cpp
@@ -52,7 +52,7 @@ ChartModifier::ChartModifier(Q3DSurface *chart)
     m_chart->setAxisZ(new Q3DValueAxis);
     m_chart->axisX()->setRange(m_minX, m_minX + m_rangeX);
     m_chart->axisZ()->setRange(m_minZ, m_minZ + m_rangeZ);
-    changeTransparency();
+    changeStyle();
 
     connect(&m_timer, &QTimer::timeout, this, &ChartModifier::timeout);
 }
@@ -294,14 +294,14 @@ void ChartModifier::changeFont(const QFont &font)
     m_chart->setFont(newFont);
 }
 
-void ChartModifier::changeTransparency()
+void ChartModifier::changeStyle()
 {
-    static int transparency = QDataVis::TransparencyFromTheme;
+    static int style = QDataVis::LabelStyleFromTheme;
 
-    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 ChartModifier::changeTheme(int theme)
diff --git a/examples/surfacechart/chartmodifier.h b/examples/surfacechart/chartmodifier.h
index ab27d269..083ceff7 100644
--- a/examples/surfacechart/chartmodifier.h
+++ b/examples/surfacechart/chartmodifier.h
@@ -60,7 +60,7 @@ public:
     void updateSamples();
     void gradientPressed();
     void changeFont(const QFont &font);
-    void changeTransparency();
+    void changeStyle();
 
 public slots:
     void changeShadowQuality(int quality);
diff --git a/examples/surfacechart/main.cpp b/examples/surfacechart/main.cpp
index 559165cc..5bf60263 100644
--- a/examples/surfacechart/main.cpp
+++ b/examples/surfacechart/main.cpp
@@ -235,7 +235,7 @@ int main(int argc, char *argv[])
     QObject::connect(fontList, &QFontComboBox::currentFontChanged,
                      modifier, &ChartModifier::changeFont);
     QObject::connect(labelButton, &QPushButton::clicked,
-                     modifier, &ChartModifier::changeTransparency);
+                     modifier, &ChartModifier::changeStyle);
     QObject::connect(themeList, SIGNAL(currentIndexChanged(int)),
                      modifier, SLOT(changeTheme(int)));
 //    QObject::connect(shadowQuality, SIGNAL(currentIndexChanged(int)),
diff --git a/examples/widget/chart.cpp b/examples/widget/chart.cpp
index 311d0a31..6c0bedce 100644
--- a/examples/widget/chart.cpp
+++ b/examples/widget/chart.cpp
@@ -61,7 +61,7 @@ ChartModifier::ChartModifier(Q3DBars *barchart)
     m_chart->addAxis(m_yearAxis);
     m_chart->addAxis(m_monthAxis);
 
-    m_chart->setShadowQuality(QDataVis::ShadowSoftMedium);
+    m_chart->setShadowQuality(QDataVis::ShadowQualitySoftMedium);
 
     m_temperatureData->setItemLabelFormat(QStringLiteral("@valueTitle for @colLabel @rowLabel: @valueLabel"));
 
@@ -144,14 +144,14 @@ void ChartModifier::changeTheme(int theme)
     m_chart->setTheme((QDataVis::Theme)theme);
 }
 
-void ChartModifier::changeTransparency()
+void ChartModifier::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 ChartModifier::changeSelectionMode(int selectionMode)
diff --git a/examples/widget/chart.h b/examples/widget/chart.h
index 66051ad4..51a8d5e0 100644
--- a/examples/widget/chart.h
+++ b/examples/widget/chart.h
@@ -37,7 +37,7 @@ public:
 
     void resetTemperatureData();
     void changePresetCamera();
-    void changeTransparency();
+    void changeLabelStyle();
     void changeFont(const QFont &font);
     void changeFontSize(int fontsize);
     void rotateX(int rotation);
diff --git a/examples/widget/main.cpp b/examples/widget/main.cpp
index 86ee49a3..1a1645e5 100644
--- a/examples/widget/main.cpp
+++ b/examples/widget/main.cpp
@@ -159,7 +159,7 @@ int main(int argc, char **argv)
     QObject::connect(rotationSliderY, &QSlider::valueChanged, modifier, &ChartModifier::rotateY);
 
     QObject::connect(labelButton, &QPushButton::clicked, modifier,
-                     &ChartModifier::changeTransparency);
+                     &ChartModifier::changeLabelStyle);
     QObject::connect(cameraButton, &QPushButton::clicked, modifier,
                      &ChartModifier::changePresetCamera);