Move series specific visual elements to series, part 4

Colors to series

- Multiselection labels in bar slices still buggy
- Selection in bars doesn't work correctly if not all
  series have items in that grid

Task-number: QTRD-2557
Change-Id: Icd38428e5337a26b8410476104bb1f1f784cdc7f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

1 files changed, 0 insertions, 30 deletions

diff --git a/src/datavisualization/engine/q3dscatter.h b/src/datavisualization/engine/q3dscatter.h
index 96ccf69b..ad0da053 100644
--- a/src/datavisualization/engine/q3dscatter.h
+++ b/src/datavisualization/engine/q3dscatter.h
@@ -42,13 +42,6 @@ class QT_DATAVISUALIZATION_EXPORT Q3DScatter : public Q3DWindow
     Q_PROPERTY(QtDataVisualization::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality NOTIFY shadowQualityChanged)
     Q_PROPERTY(Q3DTheme* theme READ theme WRITE setTheme NOTIFY themeChanged)
     Q_PROPERTY(Q3DScene* scene READ scene)
-    Q_PROPERTY(QtDataVisualization::Q3DTheme::ColorStyle colorStyle READ colorStyle WRITE setColorStyle NOTIFY colorStyleChanged)
-    Q_PROPERTY(QColor itemColor READ itemColor WRITE setItemColor NOTIFY itemColorChanged)
-    Q_PROPERTY(QLinearGradient itemGradient READ itemGradient WRITE setItemGradient NOTIFY itemGradientChanged)
-    Q_PROPERTY(QColor singleHighlightColor READ singleHighlightColor WRITE setSingleHighlightColor NOTIFY singleHighlightColorChanged)
-    Q_PROPERTY(QLinearGradient singleHighlightGradient READ singleHighlightGradient WRITE setSingleHighlightGradient NOTIFY singleHighlightGradientChanged)
-    Q_PROPERTY(QColor multiHighlightColor READ multiHighlightColor WRITE setMultiHighlightColor NOTIFY multiHighlightColorChanged)
-    Q_PROPERTY(QLinearGradient multiHighlightGradient READ multiHighlightGradient WRITE setMultiHighlightGradient NOTIFY multiHighlightGradientChanged)
 
 public:
     explicit Q3DScatter();
@@ -72,22 +65,6 @@ public:
     void setShadowQuality(QDataVis::ShadowQuality quality);
     QDataVis::ShadowQuality shadowQuality() const;
 
-    // TODO: Move to dataset object once that is done QTRD-2121
-    void setColorStyle(Q3DTheme::ColorStyle style);
-    Q3DTheme::ColorStyle colorStyle() const;
-    void setItemColor(const QColor &color);
-    QColor itemColor() const;
-    void setItemGradient(const QLinearGradient &gradient);
-    QLinearGradient itemGradient() const;
-    void setSingleHighlightColor(const QColor &color);
-    QColor singleHighlightColor() const;
-    void setSingleHighlightGradient(const QLinearGradient &gradient);
-    QLinearGradient singleHighlightGradient() const;
-    void setMultiHighlightColor(const QColor &color);
-    QColor multiHighlightColor() const;
-    void setMultiHighlightGradient(const QLinearGradient &gradient);
-    QLinearGradient multiHighlightGradient() const;
-
     void setAxisX(Q3DValueAxis *axis);
     Q3DValueAxis *axisX() const;
     void setAxisY(Q3DValueAxis *axis);
@@ -102,13 +79,6 @@ signals:
     void selectionModeChanged(QDataVis::SelectionFlags mode);
     void shadowQualityChanged(QDataVis::ShadowQuality quality);
     void themeChanged(Q3DTheme* theme);
-    void colorStyleChanged(Q3DTheme::ColorStyle style);
-    void itemColorChanged(QColor color);
-    void itemGradientChanged(QLinearGradient gradient);
-    void singleHighlightColorChanged(QColor color);
-    void singleHighlightGradientChanged(QLinearGradient gradient);
-    void multiHighlightColorChanged(QColor color);
-    void multiHighlightGradientChanged(QLinearGradient gradient);
 
 protected:
     void mouseDoubleClickEvent(QMouseEvent *event);