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>

1 files changed, 13 insertions, 13 deletions

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;