diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-12-20 10:56:59 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-07 08:10:13 +0200 |
| commit | aa842c39480aa5b95f704c97b8b3acc821144883 (patch) | |
| tree | 8a1e90e1fe1d6d85054286e655cb2e1722d758eb /src/datavisualization/engine/q3dbars.h | |
| parent | 91a94a743b4cfd30ef77aa73837050d44620469b (diff) | |
Fix theme ownership
Theme ownership now uses similar model as axis and inputhandler
ownership: Graph can own multiple themes, but only one is active
at the time.
Task-number: QTRD-2623
Change-Id: I7134384df6f8cc465cc28fbebb454b7d2e254f83
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/q3dbars.h')
| -rw-r--r-- | src/datavisualization/engine/q3dbars.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/datavisualization/engine/q3dbars.h b/src/datavisualization/engine/q3dbars.h index add3b11b..fac9558f 100644 --- a/src/datavisualization/engine/q3dbars.h +++ b/src/datavisualization/engine/q3dbars.h @@ -21,7 +21,6 @@ #include <QtDataVisualization/qdatavisualizationenums.h> #include <QtDataVisualization/q3dwindow.h> -#include <QtDataVisualization/q3dtheme.h> #include <QFont> #include <QLinearGradient> @@ -42,7 +41,6 @@ class QT_DATAVISUALIZATION_EXPORT Q3DBars : public Q3DWindow Q_PROPERTY(float barThickness READ barThickness WRITE setBarThickness NOTIFY barThicknessChanged) Q_PROPERTY(QSizeF barSpacing READ barSpacing WRITE setBarSpacing NOTIFY barSpacingChanged) Q_PROPERTY(bool barSpacingRelative READ isBarSpacingRelative WRITE setBarSpacingRelative NOTIFY barSpacingRelativeChanged) - Q_PROPERTY(Q3DTheme* theme READ theme WRITE setTheme NOTIFY themeChanged) Q_PROPERTY(Q3DScene* scene READ scene) public: @@ -53,9 +51,6 @@ public: void removeSeries(QBar3DSeries *series); QList<QBar3DSeries *> seriesList(); - void setTheme(Q3DTheme *theme); - Q3DTheme *theme() const; - void setBarThickness(float thicknessRatio); float barThickness(); @@ -89,7 +84,6 @@ signals: void barThicknessChanged(float thicknessRatio); void barSpacingChanged(QSizeF spacing); void barSpacingRelativeChanged(bool relative); - void themeChanged(Q3DTheme *theme); protected: |