diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-07 13:11:34 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-07 14:38:40 +0200 |
commit | 467e729eabece018cd42eeee0160f932983561b0 (patch) | |
tree | 4c42a1d7cfc9fe6a5cbb298a52d9b9faa29cee95 /src/datavisualizationqml2/declarativebars_p.h | |
parent | f8f57fe64c29408a8d3c41c536639e08f84747e4 (diff) |
Rename axis classes
Moved the '3D' in axis class names so that the classes would be
in line with other '3D' classes.
Task-number: QTRD-2674
Change-Id: Ie4f8a10babe3bf1b0b30b366863f55ed02ec66ba
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualizationqml2/declarativebars_p.h')
-rw-r--r-- | src/datavisualizationqml2/declarativebars_p.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h index 29d9dc91..3d748bce 100644 --- a/src/datavisualizationqml2/declarativebars_p.h +++ b/src/datavisualizationqml2/declarativebars_p.h @@ -33,8 +33,8 @@ #include "abstractdeclarative_p.h" #include "bars3dcontroller_p.h" #include "declarativebars_p.h" -#include "q3dvalueaxis.h" -#include "q3dcategoryaxis.h" +#include "qvalue3daxis.h" +#include "qcategory3daxis.h" #include "qbardataproxy.h" #include "qbar3dseries.h" @@ -48,9 +48,9 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE class DeclarativeBars : public AbstractDeclarative { Q_OBJECT - Q_PROPERTY(Q3DCategoryAxis *rowAxis READ rowAxis WRITE setRowAxis NOTIFY rowAxisChanged) - Q_PROPERTY(Q3DValueAxis *valueAxis READ valueAxis WRITE setValueAxis NOTIFY valueAxisChanged) - Q_PROPERTY(Q3DCategoryAxis *columnAxis READ columnAxis WRITE setColumnAxis NOTIFY columnAxisChanged) + Q_PROPERTY(QCategory3DAxis *rowAxis READ rowAxis WRITE setRowAxis NOTIFY rowAxisChanged) + Q_PROPERTY(QValue3DAxis *valueAxis READ valueAxis WRITE setValueAxis NOTIFY valueAxisChanged) + Q_PROPERTY(QCategory3DAxis *columnAxis READ columnAxis WRITE setColumnAxis NOTIFY columnAxisChanged) 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) @@ -61,12 +61,12 @@ public: explicit DeclarativeBars(QQuickItem *parent = 0); ~DeclarativeBars(); - Q3DCategoryAxis *rowAxis() const; - void setRowAxis(Q3DCategoryAxis *axis); - Q3DValueAxis *valueAxis() const; - void setValueAxis(Q3DValueAxis *axis); - Q3DCategoryAxis *columnAxis() const; - void setColumnAxis(Q3DCategoryAxis *axis); + QCategory3DAxis *rowAxis() const; + void setRowAxis(QCategory3DAxis *axis); + QValue3DAxis *valueAxis() const; + void setValueAxis(QValue3DAxis *axis); + QCategory3DAxis *columnAxis() const; + void setColumnAxis(QCategory3DAxis *axis); void setBarThickness(float thicknessRatio); float barThickness() const; @@ -86,9 +86,9 @@ public: Q_INVOKABLE void removeSeries(QBar3DSeries *series); signals: - void rowAxisChanged(Q3DCategoryAxis *axis); - void valueAxisChanged(Q3DValueAxis *axis); - void columnAxisChanged(Q3DCategoryAxis *axis); + void rowAxisChanged(QCategory3DAxis *axis); + void valueAxisChanged(QValue3DAxis *axis); + void columnAxisChanged(QCategory3DAxis *axis); void barThicknessChanged(float thicknessRatio); void barSpacingChanged(QSizeF spacing); void barSpacingRelativeChanged(bool relative); |