Removed old themes

Task-number: QTRD-2319

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

6 files changed, 9 insertions, 23 deletions

diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp
index dd575d35..c757c804 100644
--- a/src/datavisualizationqml2/declarativebars.cpp
+++ b/src/datavisualizationqml2/declarativebars.cpp
@@ -20,6 +20,7 @@
 #include "declarativebarsrenderer_p.h"
 #include "q3dvalueaxis.h"
 #include "qitemmodelbardataproxy.h"
+#include "theme_p.h"
 
 QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
@@ -28,8 +29,7 @@ const QString smoothString(QStringLiteral("Smooth"));
 DeclarativeBars::DeclarativeBars(QQuickItem *parent)
     : QQuickItem(parent),
       m_shared(0),
-      m_initialisedSize(0, 0),
-      m_theme(QDataVis::ThemeDefault)
+      m_initialisedSize(0, 0)
 {
     setFlags(QQuickItem::ItemHasContents);
     setAcceptedMouseButtons(Qt::AllButtons);
@@ -224,14 +224,12 @@ QDataVis::CameraPreset DeclarativeBars::cameraPreset()
 void DeclarativeBars::setTheme(QDataVis::ColorTheme theme)
 {
     // TODO: Implement correctly once "user-modifiable themes" (QTRD-2120) is implemented
-    // We need to save this locally, as there are no getters for it in controller
-    m_theme = theme;
     m_shared->setColorTheme(theme);
 }
 
 QDataVis::ColorTheme DeclarativeBars::theme()
 {
-    return m_theme;
+    return m_shared->theme().colorTheme();
 }
 
 void DeclarativeBars::setFont(const QFont &font)
diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h
index b2e64eae..78223773 100644
--- a/src/datavisualizationqml2/declarativebars_p.h
+++ b/src/datavisualizationqml2/declarativebars_p.h
@@ -182,7 +182,6 @@ protected:
 
 private:
     QSize m_initialisedSize;
-    QDataVis::ColorTheme m_theme;
 };
 
 QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavisualizationqml2/declarativescatter.cpp b/src/datavisualizationqml2/declarativescatter.cpp
index 3c3b1371..34a11024 100644
--- a/src/datavisualizationqml2/declarativescatter.cpp
+++ b/src/datavisualizationqml2/declarativescatter.cpp
@@ -19,6 +19,7 @@
 #include "declarativescatter_p.h"
 #include "declarativescatterrenderer_p.h"
 #include "qitemmodelscatterdataproxy.h"
+#include "theme_p.h"
 
 QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
@@ -27,8 +28,7 @@ const QString smoothString(QStringLiteral("Smooth"));
 DeclarativeScatter::DeclarativeScatter(QQuickItem *parent)
     : QQuickItem(parent),
       m_shared(0),
-      m_initialisedSize(0, 0),
-      m_theme(QDataVis::ThemeDefault)
+      m_initialisedSize(0, 0)
 {
     setFlags(QQuickItem::ItemHasContents);
     setAcceptedMouseButtons(Qt::AllButtons);
@@ -189,19 +189,12 @@ QDataVis::CameraPreset DeclarativeScatter::cameraPreset()
 
 void DeclarativeScatter::setTheme(QDataVis::ColorTheme theme)
 {
-    // TODO: Implement correctly once "user-modifiable themes" (QTRD-2120) is implemented
-    // We need to save this locally, as there are no getters for it in controller
-    m_theme = theme;
     m_shared->setColorTheme(theme);
-
-    // TODO: Investigate why the beforeSynchronizing() signal requires update and is not sent automatically when this value changes,
-    // but is sent wen e.g. enable/disable background changes.
-    update();
 }
 
 QDataVis::ColorTheme DeclarativeScatter::theme()
 {
-    return m_theme;
+    return m_shared->theme().colorTheme();
 }
 
 void DeclarativeScatter::setFont(const QFont &font)
diff --git a/src/datavisualizationqml2/declarativescatter_p.h b/src/datavisualizationqml2/declarativescatter_p.h
index 6c70a146..4541df8e 100644
--- a/src/datavisualizationqml2/declarativescatter_p.h
+++ b/src/datavisualizationqml2/declarativescatter_p.h
@@ -157,7 +157,6 @@ protected:
 
 private:
     QSize m_initialisedSize;
-    QDataVis::ColorTheme m_theme;
 };
 
 QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp
index d238c9ad..551f6dbc 100644
--- a/src/datavisualizationqml2/declarativesurface.cpp
+++ b/src/datavisualizationqml2/declarativesurface.cpp
@@ -20,14 +20,14 @@
 #include "declarativesurfacerenderer_p.h"
 #include "q3dvalueaxis.h"
 #include "qitemmodelsurfacedataproxy.h"
+#include "theme_p.h"
 
 QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 DeclarativeSurface::DeclarativeSurface(QQuickItem *parent)
     : QQuickItem(parent),
       m_shared(0),
-      m_initialisedSize(0, 0),
-      m_theme(QDataVis::ThemeDefault)
+      m_initialisedSize(0, 0)
 {
     setFlags(QQuickItem::ItemHasContents);
     setAcceptedMouseButtons(Qt::AllButtons);
@@ -137,14 +137,12 @@ void DeclarativeSurface::setAxisZ(Q3DValueAxis *axis)
 void DeclarativeSurface::setTheme(QDataVis::ColorTheme theme)
 {
     // TODO: Implement correctly once "user-modifiable themes" (QTRD-2120) is implemented
-    // We need to save this locally, as there are no getters for it in controller
-    m_theme = theme;
     m_shared->setColorTheme(theme);
 }
 
 QDataVis::ColorTheme DeclarativeSurface::theme()
 {
-    return m_theme;
+    return m_shared->theme().colorTheme();
 }
 
 void DeclarativeSurface::setFont(const QFont &font)
diff --git a/src/datavisualizationqml2/declarativesurface_p.h b/src/datavisualizationqml2/declarativesurface_p.h
index cc20449d..7884483b 100644
--- a/src/datavisualizationqml2/declarativesurface_p.h
+++ b/src/datavisualizationqml2/declarativesurface_p.h
@@ -147,7 +147,6 @@ protected:
 
 private:
     QSize m_initialisedSize;
-    QDataVis::ColorTheme m_theme;
 };
 
 QT_DATAVISUALIZATION_END_NAMESPACE