diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-09-23 06:13:23 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-09-23 08:04:47 +0300 |
| commit | 611dfce313e6b1998b8d7afc49d63beac90b42e9 (patch) | |
| tree | 347f07b62df67e71612277400ed0b07308c68b13 /src/datavisualizationqml2/declarativesurface.cpp | |
| parent | d57aabe85e6b4012f93348884df16262889906d8 (diff) | |
Removed old themes
Task-number: QTRD-2319
Change-Id: I90e6add03fdca157fec6aa2398488982ab05d104
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualizationqml2/declarativesurface.cpp')
| -rw-r--r-- | src/datavisualizationqml2/declarativesurface.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
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) |