Refactored LabelTransparency and ShadowQuality

Task-number: QTRD-2362

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

2 files changed, 30 insertions, 30 deletions

diff --git a/src/datavisualization/global/qdatavisualizationenums.h b/src/datavisualization/global/qdatavisualizationenums.h
index a4bba2d3..8bdf55d7 100644
--- a/src/datavisualization/global/qdatavisualizationenums.h
+++ b/src/datavisualization/global/qdatavisualizationenums.h
@@ -33,7 +33,7 @@ class QT_DATAVISUALIZATION_EXPORT QDataVis : public QObject
     Q_ENUMS(Theme)
     Q_ENUMS(SelectionMode)
     Q_ENUMS(ShadowQuality)
-    Q_ENUMS(LabelTransparency)
+    Q_ENUMS(LabelStyle)
 
 public:
     enum InputState {
@@ -76,8 +76,8 @@ public:
         PresetDirectlyAbove,
         PresetDirectlyAboveCW45,
         PresetDirectlyAboveCCW45,
-        PresetFrontBelow,           // These work only for graphs including negative values.
-        PresetLeftBelow,            // They act as Preset...Low for positive-only values.
+        PresetFrontBelow,
+        PresetLeftBelow,
         PresetRightBelow,
         PresetBehindBelow,
         PresetDirectlyBelow
@@ -98,7 +98,7 @@ public:
     enum SelectionMode {
         ModeNone = 0,
         ModeItem,
-        ModeItemAndRow,         // From here onwards used for Q3DBars only
+        ModeItemAndRow,
         ModeItemAndColumn,
         ModeItemRowAndColumn,
         ModeSliceRow,
@@ -106,19 +106,19 @@ public:
     };
 
     enum ShadowQuality {
-        ShadowNone = 0,
-        ShadowLow,
-        ShadowMedium,
-        ShadowHigh,
-        ShadowSoftLow,
-        ShadowSoftMedium,
-        ShadowSoftHigh
+        ShadowQualityNone = 0,
+        ShadowQualityLow,
+        ShadowQualityMedium,
+        ShadowQualityHigh,
+        ShadowQualitySoftLow,
+        ShadowQualitySoftMedium,
+        ShadowQualitySoftHigh
     };
 
-    enum LabelTransparency {
-        TransparencyNone = 0,       // Full solid, using colors from theme
-        TransparencyFromTheme,      // Use colors and transparencies from theme
-        TransparencyNoBackground    // Draw just text on transparent background
+    enum LabelStyle {
+        LabelStyleOpaque = 0,
+        LabelStyleFromTheme,
+        LabelStyleTransparent
     };
 };
 }
diff --git a/src/datavisualization/global/qtdatavisualizationenums.qdoc b/src/datavisualization/global/qtdatavisualizationenums.qdoc
index d92ca7c0..80e97aff 100644
--- a/src/datavisualization/global/qtdatavisualizationenums.qdoc
+++ b/src/datavisualization/global/qtdatavisualizationenums.qdoc
@@ -146,31 +146,31 @@
 
     Quality of shadows.
 
-    \value ShadowNone
+    \value ShadowQualityNone
            Shadows are disabled.
-    \value ShadowLow
+    \value ShadowQualityLow
            Shadows are rendered in low quality.
-    \value ShadowMedium
+    \value ShadowQualityMedium
            Shadows are rendered in medium quality.
-    \value ShadowHigh
+    \value ShadowQualityHigh
            Shadows are rendered in high quality.
-    \value ShadowSoftLow
+    \value ShadowQualitySoftLow
            Shadows are rendered in low quality with softened edges.
-    \value ShadowSoftMedium
+    \value ShadowQualitySoftMedium
            Shadows are rendered in medium quality with softened edges.
-    \value ShadowSoftHigh
+    \value ShadowQualitySoftHigh
            Shadows are rendered in high quality with softened edges.
 */
 
 /*!
-    \enum QtDataVisualization::QDataVis::LabelTransparency
+    \enum QtDataVisualization::QDataVis::LabelStyle
 
-    Label transparencies.
+    Label styles.
 
-    \value TransparencyNone
-           Full solid, using colors from theme.
-    \value TransparencyFromTheme
-           Use colors and transparencies from theme.
-    \value TransparencyNoBackground
-           Draw just text on transparent background.
+    \value LabelStyleOpaque
+           Fully opaque background, using colors and borders from theme.
+    \value LabelStyleFromTheme
+           Use transparencies, colors and borders from theme.
+    \value LabelStyleTransparent
+           Fully transparent background, using text color from theme.
 */