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>

9 files changed, 78 insertions, 78 deletions

diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp
index b9f26938..5cac1882 100644
--- a/src/datavisualizationqml2/abstractdeclarative.cpp
+++ b/src/datavisualizationqml2/abstractdeclarative.cpp
@@ -17,7 +17,7 @@
 ****************************************************************************/
 
 #include "abstractdeclarative_p.h"
-#include "q3dvalueaxis.h"
+#include "qvalue3daxis.h"
 #include <QThread>
 #include <QGuiApplication>
 #include <QSGSimpleRectNode>
diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
index 8dcdfbcc..c49f4894 100644
--- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
+++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
@@ -29,7 +29,7 @@ void Datavis3Dqml2Plugin::registerTypes(const char *uri)
                                                          QLatin1String("Trying to create uncreatable: AbstractItemModel."));
     qmlRegisterUncreatableType<QDataVis>(uri, 1, 0, "DataVis",
                                          QLatin1String("Trying to create uncreatable: DataVis."));
-    qmlRegisterUncreatableType<Q3DAbstractAxis>(uri, 1, 0, "AbstractAxis3D",
+    qmlRegisterUncreatableType<QAbstract3DAxis>(uri, 1, 0, "AbstractAxis3D",
                                                 QLatin1String("Trying to create uncreatable: AbstractAxis."));
     qmlRegisterUncreatableType<QAbstractDataProxy>(uri, 1, 0, "AbstractDataProxy",
                                                    QLatin1String("Trying to create uncreatable: AbstractDataProxy."));
@@ -60,8 +60,8 @@ void Datavis3Dqml2Plugin::registerTypes(const char *uri)
     qmlRegisterType<DeclarativeScatter>(uri, 1, 0, "Scatter3D");
     qmlRegisterType<DeclarativeSurface>(uri, 1, 0, "Surface3D");
 
-    qmlRegisterType<Q3DValueAxis>(uri, 1, 0, "ValueAxis3D");
-    qmlRegisterType<Q3DCategoryAxis>(uri, 1, 0, "CategoryAxis3D");
+    qmlRegisterType<QValue3DAxis>(uri, 1, 0, "ValueAxis3D");
+    qmlRegisterType<QCategory3DAxis>(uri, 1, 0, "CategoryAxis3D");
 
     qmlRegisterType<Q3DCamera>(uri, 1, 0, "Camera3D");
     qmlRegisterType<Q3DLight>(uri, 1, 0, "Light3D");
diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.h b/src/datavisualizationqml2/datavisualizationqml2_plugin.h
index 25c06364..3e689aec 100644
--- a/src/datavisualizationqml2/datavisualizationqml2_plugin.h
+++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.h
@@ -27,8 +27,8 @@
 #include "qitemmodelscatterdataproxy.h"
 #include "qitemmodelsurfacedataproxy.h"
 #include "qheightmapsurfacedataproxy.h"
-#include "q3dvalueaxis.h"
-#include "q3dcategoryaxis.h"
+#include "qvalue3daxis.h"
+#include "qcategory3daxis.h"
 #include "q3dobject.h"
 #include "q3dcamera.h"
 #include "q3dscene.h"
@@ -55,9 +55,9 @@ QML_DECLARE_TYPE(DeclarativeSurface)
 QML_DECLARE_TYPE(const QAbstractItemModel)
 QML_DECLARE_TYPE(QDataVis)
 
-QML_DECLARE_TYPE(Q3DAbstractAxis)
-QML_DECLARE_TYPE(Q3DCategoryAxis)
-QML_DECLARE_TYPE(Q3DValueAxis)
+QML_DECLARE_TYPE(QAbstract3DAxis)
+QML_DECLARE_TYPE(QCategory3DAxis)
+QML_DECLARE_TYPE(QValue3DAxis)
 
 QML_DECLARE_TYPE(Q3DScene)
 QML_DECLARE_TYPE(Q3DObject)
diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp
index 7eab8886..a9e4503c 100644
--- a/src/datavisualizationqml2/declarativebars.cpp
+++ b/src/datavisualizationqml2/declarativebars.cpp
@@ -17,7 +17,7 @@
 ****************************************************************************/
 
 #include "declarativebars_p.h"
-#include "q3dvalueaxis.h"
+#include "qvalue3daxis.h"
 #include "qitemmodelbardataproxy.h"
 
 QT_DATAVISUALIZATION_BEGIN_NAMESPACE
@@ -50,32 +50,32 @@ DeclarativeBars::~DeclarativeBars()
     delete m_barsController;
 }
 
-Q3DCategoryAxis *DeclarativeBars::rowAxis() const
+QCategory3DAxis *DeclarativeBars::rowAxis() const
 {
-    return static_cast<Q3DCategoryAxis *>(m_barsController->axisZ());
+    return static_cast<QCategory3DAxis *>(m_barsController->axisZ());
 }
 
-void DeclarativeBars::setRowAxis(Q3DCategoryAxis *axis)
+void DeclarativeBars::setRowAxis(QCategory3DAxis *axis)
 {
     m_barsController->setAxisZ(axis);
 }
 
-Q3DValueAxis *DeclarativeBars::valueAxis() const
+QValue3DAxis *DeclarativeBars::valueAxis() const
 {
-    return static_cast<Q3DValueAxis *>(m_barsController->axisY());
+    return static_cast<QValue3DAxis *>(m_barsController->axisY());
 }
 
-void DeclarativeBars::setValueAxis(Q3DValueAxis *axis)
+void DeclarativeBars::setValueAxis(QValue3DAxis *axis)
 {
     m_barsController->setAxisY(axis);
 }
 
-Q3DCategoryAxis *DeclarativeBars::columnAxis() const
+QCategory3DAxis *DeclarativeBars::columnAxis() const
 {
-    return static_cast<Q3DCategoryAxis *>(m_barsController->axisX());
+    return static_cast<QCategory3DAxis *>(m_barsController->axisX());
 }
 
-void DeclarativeBars::setColumnAxis(Q3DCategoryAxis *axis)
+void DeclarativeBars::setColumnAxis(QCategory3DAxis *axis)
 {
     m_barsController->setAxisX(axis);
 }
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);
diff --git a/src/datavisualizationqml2/declarativescatter.cpp b/src/datavisualizationqml2/declarativescatter.cpp
index 5aaa19b6..3f7979b6 100644
--- a/src/datavisualizationqml2/declarativescatter.cpp
+++ b/src/datavisualizationqml2/declarativescatter.cpp
@@ -49,32 +49,32 @@ DeclarativeScatter::~DeclarativeScatter()
     delete m_scatterController;
 }
 
-Q3DValueAxis *DeclarativeScatter::axisX() const
+QValue3DAxis *DeclarativeScatter::axisX() const
 {
-    return static_cast<Q3DValueAxis *>(m_scatterController->axisX());
+    return static_cast<QValue3DAxis *>(m_scatterController->axisX());
 }
 
-void DeclarativeScatter::setAxisX(Q3DValueAxis *axis)
+void DeclarativeScatter::setAxisX(QValue3DAxis *axis)
 {
     m_scatterController->setAxisX(axis);
 }
 
-Q3DValueAxis *DeclarativeScatter::axisY() const
+QValue3DAxis *DeclarativeScatter::axisY() const
 {
-    return static_cast<Q3DValueAxis *>(m_scatterController->axisY());
+    return static_cast<QValue3DAxis *>(m_scatterController->axisY());
 }
 
-void DeclarativeScatter::setAxisY(Q3DValueAxis *axis)
+void DeclarativeScatter::setAxisY(QValue3DAxis *axis)
 {
     m_scatterController->setAxisY(axis);
 }
 
-Q3DValueAxis *DeclarativeScatter::axisZ() const
+QValue3DAxis *DeclarativeScatter::axisZ() const
 {
-    return static_cast<Q3DValueAxis *>(m_scatterController->axisZ());
+    return static_cast<QValue3DAxis *>(m_scatterController->axisZ());
 }
 
-void DeclarativeScatter::setAxisZ(Q3DValueAxis *axis)
+void DeclarativeScatter::setAxisZ(QValue3DAxis *axis)
 {
     m_scatterController->setAxisZ(axis);
 }
diff --git a/src/datavisualizationqml2/declarativescatter_p.h b/src/datavisualizationqml2/declarativescatter_p.h
index b9f5a3b7..4ccf7d05 100644
--- a/src/datavisualizationqml2/declarativescatter_p.h
+++ b/src/datavisualizationqml2/declarativescatter_p.h
@@ -33,7 +33,7 @@
 #include "abstractdeclarative_p.h"
 #include "scatter3dcontroller_p.h"
 #include "declarativescatter_p.h"
-#include "q3dvalueaxis.h"
+#include "qvalue3daxis.h"
 #include "qscatterdataproxy.h"
 #include "qscatter3dseries.h"
 
@@ -46,9 +46,9 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 class DeclarativeScatter : public AbstractDeclarative
 {
     Q_OBJECT
-    Q_PROPERTY(Q3DValueAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
-    Q_PROPERTY(Q3DValueAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
-    Q_PROPERTY(Q3DValueAxis *axisZ READ axisZ WRITE setAxisZ NOTIFY axisZChanged)
+    Q_PROPERTY(QValue3DAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
+    Q_PROPERTY(QValue3DAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
+    Q_PROPERTY(QValue3DAxis *axisZ READ axisZ WRITE setAxisZ NOTIFY axisZChanged)
     Q_PROPERTY(QQmlListProperty<QScatter3DSeries> seriesList READ seriesList)
     Q_CLASSINFO("DefaultProperty", "seriesList")
 
@@ -56,12 +56,12 @@ public:
     explicit DeclarativeScatter(QQuickItem *parent = 0);
     ~DeclarativeScatter();
 
-    Q3DValueAxis *axisX() const;
-    void setAxisX(Q3DValueAxis *axis);
-    Q3DValueAxis *axisY() const;
-    void setAxisY(Q3DValueAxis *axis);
-    Q3DValueAxis *axisZ() const;
-    void setAxisZ(Q3DValueAxis *axis);
+    QValue3DAxis *axisX() const;
+    void setAxisX(QValue3DAxis *axis);
+    QValue3DAxis *axisY() const;
+    void setAxisY(QValue3DAxis *axis);
+    QValue3DAxis *axisZ() const;
+    void setAxisZ(QValue3DAxis *axis);
 
     QQmlListProperty<QScatter3DSeries> seriesList();
     static void appendSeriesFunc(QQmlListProperty<QScatter3DSeries> *list, QScatter3DSeries *series);
@@ -72,9 +72,9 @@ public:
     Q_INVOKABLE void removeSeries(QScatter3DSeries *series);
 
 signals:
-    void axisXChanged(Q3DValueAxis *axis);
-    void axisYChanged(Q3DValueAxis *axis);
-    void axisZChanged(Q3DValueAxis *axis);
+    void axisXChanged(QValue3DAxis *axis);
+    void axisYChanged(QValue3DAxis *axis);
+    void axisZChanged(QValue3DAxis *axis);
 
 protected:
     Scatter3DController *m_scatterController;
diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp
index 3ba5f923..efbec825 100644
--- a/src/datavisualizationqml2/declarativesurface.cpp
+++ b/src/datavisualizationqml2/declarativesurface.cpp
@@ -17,7 +17,7 @@
 ****************************************************************************/
 
 #include "declarativesurface_p.h"
-#include "q3dvalueaxis.h"
+#include "qvalue3daxis.h"
 #include "qitemmodelsurfacedataproxy.h"
 
 QT_DATAVISUALIZATION_BEGIN_NAMESPACE
@@ -50,32 +50,32 @@ DeclarativeSurface::~DeclarativeSurface()
     delete m_surfaceController;
 }
 
-Q3DValueAxis *DeclarativeSurface::axisX() const
+QValue3DAxis *DeclarativeSurface::axisX() const
 {
-    return static_cast<Q3DValueAxis *>(m_surfaceController->axisX());
+    return static_cast<QValue3DAxis *>(m_surfaceController->axisX());
 }
 
-void DeclarativeSurface::setAxisX(Q3DValueAxis *axis)
+void DeclarativeSurface::setAxisX(QValue3DAxis *axis)
 {
     m_surfaceController->setAxisX(axis);
 }
 
-Q3DValueAxis *DeclarativeSurface::axisY() const
+QValue3DAxis *DeclarativeSurface::axisY() const
 {
-    return static_cast<Q3DValueAxis *>(m_surfaceController->axisY());
+    return static_cast<QValue3DAxis *>(m_surfaceController->axisY());
 }
 
-void DeclarativeSurface::setAxisY(Q3DValueAxis *axis)
+void DeclarativeSurface::setAxisY(QValue3DAxis *axis)
 {
     m_surfaceController->setAxisY(axis);
 }
 
-Q3DValueAxis *DeclarativeSurface::axisZ() const
+QValue3DAxis *DeclarativeSurface::axisZ() const
 {
-    return static_cast<Q3DValueAxis *>(m_surfaceController->axisZ());
+    return static_cast<QValue3DAxis *>(m_surfaceController->axisZ());
 }
 
-void DeclarativeSurface::setAxisZ(Q3DValueAxis *axis)
+void DeclarativeSurface::setAxisZ(QValue3DAxis *axis)
 {
     m_surfaceController->setAxisZ(axis);
 }
diff --git a/src/datavisualizationqml2/declarativesurface_p.h b/src/datavisualizationqml2/declarativesurface_p.h
index 2c9c2803..15e88c91 100644
--- a/src/datavisualizationqml2/declarativesurface_p.h
+++ b/src/datavisualizationqml2/declarativesurface_p.h
@@ -33,7 +33,7 @@
 #include "abstractdeclarative_p.h"
 #include "surface3dcontroller_p.h"
 #include "declarativesurface_p.h"
-#include "q3dvalueaxis.h"
+#include "qvalue3daxis.h"
 #include "qsurfacedataproxy.h"
 #include "qsurface3dseries.h"
 
@@ -47,9 +47,9 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 class DeclarativeSurface : public AbstractDeclarative
 {
     Q_OBJECT
-    Q_PROPERTY(Q3DValueAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
-    Q_PROPERTY(Q3DValueAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
-    Q_PROPERTY(Q3DValueAxis *axisZ READ axisZ WRITE setAxisZ NOTIFY axisZChanged)
+    Q_PROPERTY(QValue3DAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
+    Q_PROPERTY(QValue3DAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
+    Q_PROPERTY(QValue3DAxis *axisZ READ axisZ WRITE setAxisZ NOTIFY axisZChanged)
     Q_PROPERTY(QQmlListProperty<QSurface3DSeries> seriesList READ seriesList)
     Q_CLASSINFO("DefaultProperty", "seriesList")
 
@@ -57,12 +57,12 @@ public:
     explicit DeclarativeSurface(QQuickItem *parent = 0);
     ~DeclarativeSurface();
 
-    Q3DValueAxis *axisX() const;
-    void setAxisX(Q3DValueAxis *axis);
-    Q3DValueAxis *axisY() const;
-    void setAxisY(Q3DValueAxis *axis);
-    Q3DValueAxis *axisZ() const;
-    void setAxisZ(Q3DValueAxis *axis);
+    QValue3DAxis *axisX() const;
+    void setAxisX(QValue3DAxis *axis);
+    QValue3DAxis *axisY() const;
+    void setAxisY(QValue3DAxis *axis);
+    QValue3DAxis *axisZ() const;
+    void setAxisZ(QValue3DAxis *axis);
 
     QQmlListProperty<QSurface3DSeries> seriesList();
     static void appendSeriesFunc(QQmlListProperty<QSurface3DSeries> *list, QSurface3DSeries *series);
@@ -73,9 +73,9 @@ public:
     Q_INVOKABLE void removeSeries(QSurface3DSeries *series);
 
 signals:
-    void axisXChanged(Q3DValueAxis *axis);
-    void axisYChanged(Q3DValueAxis *axis);
-    void axisZChanged(Q3DValueAxis *axis);
+    void axisXChanged(QValue3DAxis *axis);
+    void axisYChanged(QValue3DAxis *axis);
+    void axisZChanged(QValue3DAxis *axis);
 
 private:
     Surface3DController *m_surfaceController;