From 8122450d4f17781a35ec595c846e05c4c1af394c Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Wed, 4 Sep 2013 12:46:41 +0300 Subject: Rename axes to avoid conflicts with Charts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + Some doc fixes. Task-number: QTRD-2214 Change-Id: Idecec749a76ef6a5d84857d1396f25be3ef017ca Reviewed-by: Tomi Korpipää --- src/datavis3dqml2/declarativescatter.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/datavis3dqml2/declarativescatter.cpp') 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(m_shared->activeDataProxy())->activeMapping(); } -QValueAxis *DeclarativeScatter::axisX() const +Q3DValueAxis *DeclarativeScatter::axisX() const { - return static_cast(m_shared->axisX()); + return static_cast(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(m_shared->axisY()); + return static_cast(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(m_shared->axisZ()); + return static_cast(m_shared->axisZ()); } -void DeclarativeScatter::setAxisZ(QValueAxis *axis) +void DeclarativeScatter::setAxisZ(Q3DValueAxis *axis) { m_shared->setAxisZ(axis); } -- cgit v1.2.3