diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-02 10:26:46 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-02 10:27:15 +0300 |
| commit | 23052d3f50764e3d6a0def345d09c9a78d38857a (patch) | |
| tree | 7fe8e3c3abf4e44ea3f62dc3022b0119ab966303 /src/datavisualizationqml2 | |
| parent | defd066b46329783c10ace4e67fddc4a2a65bf4c (diff) | |
Refactored ColorTheme -> Theme
Task-number: QTRD-2362
Change-Id: I042e57a2307f7465588ff3475a659e0483a45da8
Change-Id: I042e57a2307f7465588ff3475a659e0483a45da8
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualizationqml2')
| -rw-r--r-- | src/datavisualizationqml2/abstractdeclarative.cpp | 8 | ||||
| -rw-r--r-- | src/datavisualizationqml2/abstractdeclarative_p.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp index 47f13f29..25d7e39d 100644 --- a/src/datavisualizationqml2/abstractdeclarative.cpp +++ b/src/datavisualizationqml2/abstractdeclarative.cpp @@ -46,15 +46,15 @@ QDataVis::CameraPreset AbstractDeclarative::cameraPreset() const return m_controller->cameraPreset(); } -void AbstractDeclarative::setTheme(QDataVis::ColorTheme theme) +void AbstractDeclarative::setTheme(QDataVis::Theme theme) { // TODO: Implement correctly once "user-modifiable themes" (QTRD-2120) is implemented - m_controller->setColorTheme(theme); + m_controller->setTheme(theme); } -QDataVis::ColorTheme AbstractDeclarative::theme() const +QDataVis::Theme AbstractDeclarative::theme() const { - return m_controller->theme().colorTheme(); + return m_controller->theme().theme(); } void AbstractDeclarative::setSelectionMode(QDataVis::SelectionMode mode) diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h index a7f03cc7..843e4fad 100644 --- a/src/datavisualizationqml2/abstractdeclarative_p.h +++ b/src/datavisualizationqml2/abstractdeclarative_p.h @@ -45,7 +45,7 @@ class AbstractDeclarative : public QQuickItem Q_PROPERTY(QtDataVisualization::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency) Q_PROPERTY(QtDataVisualization::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality) Q_PROPERTY(QtDataVisualization::QDataVis::CameraPreset cameraPreset READ cameraPreset WRITE setCameraPreset) - Q_PROPERTY(QtDataVisualization::QDataVis::ColorTheme theme READ theme WRITE setTheme) + Q_PROPERTY(QtDataVisualization::QDataVis::Theme theme READ theme WRITE setTheme) Q_PROPERTY(QFont font READ font WRITE setFont) Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible) Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible) @@ -53,7 +53,7 @@ class AbstractDeclarative : public QQuickItem Q_ENUMS(QtDataVisualization::QDataVis::ShadowQuality) Q_ENUMS(QtDataVisualization::QDataVis::LabelTransparency) Q_ENUMS(QtDataVisualization::QDataVis::CameraPreset) - Q_ENUMS(QtDataVisualization::QDataVis::ColorTheme) + Q_ENUMS(QtDataVisualization::QDataVis::Theme) Q_PROPERTY(QString itemLabelFormat READ itemLabelFormat WRITE setItemLabelFormat) public: @@ -65,8 +65,8 @@ public: virtual void setCameraPreset(QDataVis::CameraPreset preset); virtual QDataVis::CameraPreset cameraPreset() const; - virtual void setTheme(QDataVis::ColorTheme theme); - virtual QDataVis::ColorTheme theme() const; + virtual void setTheme(QDataVis::Theme theme); + virtual QDataVis::Theme theme() const; virtual void setSelectionMode(QDataVis::SelectionMode mode); virtual QDataVis::SelectionMode selectionMode() const; |