diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-09-04 12:46:41 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-09-04 13:04:35 +0300 |
commit | 8122450d4f17781a35ec595c846e05c4c1af394c (patch) | |
tree | 9b5711f08f419d1b9ae2393c7e8e49cdd4834eab /src/datavis3d/engine/abstract3drenderer_p.h | |
parent | 4d453a939850638fa17b44b91d10b31acde10acd (diff) |
Rename axes to avoid conflicts with Charts
+ Some doc fixes.
Task-number: QTRD-2214
Change-Id: Idecec749a76ef6a5d84857d1396f25be3ef017ca
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavis3d/engine/abstract3drenderer_p.h')
-rw-r--r-- | src/datavis3d/engine/abstract3drenderer_p.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/datavis3d/engine/abstract3drenderer_p.h b/src/datavis3d/engine/abstract3drenderer_p.h index ec057298..0da11ff1 100644 --- a/src/datavis3d/engine/abstract3drenderer_p.h +++ b/src/datavis3d/engine/abstract3drenderer_p.h @@ -112,13 +112,13 @@ public: virtual void updateShadowQuality(QDataVis::ShadowQuality quality) = 0; virtual void initShaders(const QString &vertexShader, const QString &fragmentShader) = 0; virtual void initBackgroundShaders(const QString &vertexShader, const QString &fragmentShader) = 0; - virtual void updateAxisType(QAbstractAxis::AxisOrientation orientation, QAbstractAxis::AxisType type); - virtual void updateAxisTitle(QAbstractAxis::AxisOrientation orientation, const QString &title); - virtual void updateAxisLabels(QAbstractAxis::AxisOrientation orientation, const QStringList &labels); - virtual void updateAxisRange(QAbstractAxis::AxisOrientation orientation, qreal min, qreal max); - virtual void updateAxisSegmentCount(QAbstractAxis::AxisOrientation orientation, int count); - virtual void updateAxisSubSegmentCount(QAbstractAxis::AxisOrientation orientation, int count); - virtual void updateAxisLabelFormat(QAbstractAxis::AxisOrientation orientation, const QString &format); + virtual void updateAxisType(Q3DAbstractAxis::AxisOrientation orientation, Q3DAbstractAxis::AxisType type); + virtual void updateAxisTitle(Q3DAbstractAxis::AxisOrientation orientation, const QString &title); + virtual void updateAxisLabels(Q3DAbstractAxis::AxisOrientation orientation, const QStringList &labels); + virtual void updateAxisRange(Q3DAbstractAxis::AxisOrientation orientation, qreal min, qreal max); + virtual void updateAxisSegmentCount(Q3DAbstractAxis::AxisOrientation orientation, int count); + virtual void updateAxisSubSegmentCount(Q3DAbstractAxis::AxisOrientation orientation, int count); + virtual void updateAxisLabelFormat(Q3DAbstractAxis::AxisOrientation orientation, const QString &format); protected: Abstract3DRenderer(Abstract3DController *controller); @@ -129,7 +129,7 @@ protected: virtual void handleResize(); virtual void loadMeshFile() = 0; - AxisRenderCache &axisCacheForOrientation(QAbstractAxis::AxisOrientation orientation); + AxisRenderCache &axisCacheForOrientation(Q3DAbstractAxis::AxisOrientation orientation); }; QT_DATAVIS3D_END_NAMESPACE |