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/datavis3dqml2/declarativescatter.cpp | |
| 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/datavis3dqml2/declarativescatter.cpp')
| -rw-r--r-- | src/datavis3dqml2/declarativescatter.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/datavis3dqml2/declarativescatter.cpp b/src/datavis3dqml2/declarativescatter.cpp index 9bd568ce..c38dc9d0 100644 --- a/src/datavis3dqml2/declarativescatter.cpp +++ b/src/datavis3dqml2/declarativescatter.cpp @@ -120,32 +120,32 @@ QItemModelScatterDataMapping *DeclarativeScatter::mapping() const return static_cast<QItemModelScatterDataProxy *>(m_shared->activeDataProxy())->activeMapping(); } -QValueAxis *DeclarativeScatter::axisX() const +Q3DValueAxis *DeclarativeScatter::axisX() const { - return static_cast<QValueAxis *>(m_shared->axisX()); + return static_cast<Q3DValueAxis *>(m_shared->axisX()); } -void DeclarativeScatter::setAxisX(QValueAxis *axis) +void DeclarativeScatter::setAxisX(Q3DValueAxis *axis) { m_shared->setAxisX(axis); } -QValueAxis *DeclarativeScatter::axisY() const +Q3DValueAxis *DeclarativeScatter::axisY() const { - return static_cast<QValueAxis *>(m_shared->axisY()); + return static_cast<Q3DValueAxis *>(m_shared->axisY()); } -void DeclarativeScatter::setAxisY(QValueAxis *axis) +void DeclarativeScatter::setAxisY(Q3DValueAxis *axis) { m_shared->setAxisY(axis); } -QValueAxis *DeclarativeScatter::axisZ() const +Q3DValueAxis *DeclarativeScatter::axisZ() const { - return static_cast<QValueAxis *>(m_shared->axisZ()); + return static_cast<Q3DValueAxis *>(m_shared->axisZ()); } -void DeclarativeScatter::setAxisZ(QValueAxis *axis) +void DeclarativeScatter::setAxisZ(Q3DValueAxis *axis) { m_shared->setAxisZ(axis); } |