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>

8 files changed, 25 insertions, 25 deletions

diff --git a/examples/audiolevels/audiolevels.cpp b/examples/audiolevels/audiolevels.cpp
index 33a0be3b..ec63e555 100644
--- a/examples/audiolevels/audiolevels.cpp
+++ b/examples/audiolevels/audiolevels.cpp
@@ -20,7 +20,7 @@
 #include "audiolevels.h"
 
 #include <QtDataVisualization/qbardataproxy.h>
-#include <QtDataVisualization/q3dvalueaxis.h>
+#include <QtDataVisualization/qvalue3daxis.h>
 #include <QtDataVisualization/q3dscene.h>
 #include <QtDataVisualization/q3dcamera.h>
 #include <QtDataVisualization/qbar3dseries.h>
diff --git a/examples/bars/graphmodifier.cpp b/examples/bars/graphmodifier.cpp
index fddc385e..dc1aa1cc 100644
--- a/examples/bars/graphmodifier.cpp
+++ b/examples/bars/graphmodifier.cpp
@@ -17,8 +17,8 @@
 ****************************************************************************/
 
 #include "graphmodifier.h"
-#include <QtDataVisualization/q3dcategoryaxis.h>
-#include <QtDataVisualization/q3dvalueaxis.h>
+#include <QtDataVisualization/qcategory3daxis.h>
+#include <QtDataVisualization/qvalue3daxis.h>
 #include <QtDataVisualization/qbardataproxy.h>
 #include <QtDataVisualization/q3dscene.h>
 #include <QtDataVisualization/q3dcamera.h>
@@ -42,9 +42,9 @@ GraphModifier::GraphModifier(Q3DBars *bargraph)
       m_minval(-20.0f),
       m_maxval(20.0f),
       //! [1]
-      m_temperatureAxis(new Q3DValueAxis),
-      m_yearAxis(new Q3DCategoryAxis),
-      m_monthAxis(new Q3DCategoryAxis),
+      m_temperatureAxis(new QValue3DAxis),
+      m_yearAxis(new QCategory3DAxis),
+      m_monthAxis(new QCategory3DAxis),
       m_primaryData(new QBarDataProxy),
       m_secondaryData(new QBarDataProxy),
       //! [1]
diff --git a/examples/bars/graphmodifier.h b/examples/bars/graphmodifier.h
index f7c0acaf..ca56d754 100644
--- a/examples/bars/graphmodifier.h
+++ b/examples/bars/graphmodifier.h
@@ -74,9 +74,9 @@ private:
     float m_maxval;
     QStringList m_months;
     QStringList m_years;
-    Q3DValueAxis *m_temperatureAxis;
-    Q3DCategoryAxis *m_yearAxis;
-    Q3DCategoryAxis *m_monthAxis;
+    QValue3DAxis *m_temperatureAxis;
+    QCategory3DAxis *m_yearAxis;
+    QCategory3DAxis *m_monthAxis;
     QBarDataProxy *m_primaryData;
     QBarDataProxy *m_secondaryData;
     QAbstract3DSeries::Mesh m_primaryStyle;
diff --git a/examples/custominput/scatterdatamodifier.cpp b/examples/custominput/scatterdatamodifier.cpp
index acdf3e8d..3e372dec 100644
--- a/examples/custominput/scatterdatamodifier.cpp
+++ b/examples/custominput/scatterdatamodifier.cpp
@@ -19,7 +19,7 @@
 #include "scatterdatamodifier.h"
 
 #include <QtDataVisualization/QScatterDataProxy>
-#include <QtDataVisualization/Q3DValueAxis>
+#include <QtDataVisualization/QValue3DAxis>
 #include <QtDataVisualization/Q3DScene>
 #include <QtDataVisualization/Q3DCamera>
 #include <QtDataVisualization/QScatter3DSeries>
@@ -36,9 +36,9 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
     m_graph->setShadowQuality(QDataVis::ShadowQualityMedium);
     m_graph->scene()->activeCamera()->setCameraPreset(Q3DCamera::CameraPresetFront);
 
-    m_graph->setAxisX(new Q3DValueAxis);
-    m_graph->setAxisY(new Q3DValueAxis);
-    m_graph->setAxisZ(new Q3DValueAxis);
+    m_graph->setAxisX(new QValue3DAxis);
+    m_graph->setAxisY(new QValue3DAxis);
+    m_graph->setAxisZ(new QValue3DAxis);
 
     m_graph->axisX()->setRange(-10.0f, 10.0f);
     m_graph->axisY()->setRange(-5.0f, 5.0f);
diff --git a/examples/customproxy/rainfallgraph.cpp b/examples/customproxy/rainfallgraph.cpp
index 0fd91419..2e36a865 100644
--- a/examples/customproxy/rainfallgraph.cpp
+++ b/examples/customproxy/rainfallgraph.cpp
@@ -17,8 +17,8 @@
 ****************************************************************************/
 
 #include "rainfallgraph.h"
-#include <QtDataVisualization/q3dcategoryaxis.h>
-#include <QtDataVisualization/q3dvalueaxis.h>
+#include <QtDataVisualization/qcategory3daxis.h>
+#include <QtDataVisualization/qvalue3daxis.h>
 #include <QtDataVisualization/q3dscene.h>
 #include <QtDataVisualization/q3dcamera.h>
 #include <QtDataVisualization/qbar3dseries.h>
diff --git a/examples/itemmodel/main.cpp b/examples/itemmodel/main.cpp
index 8cec91ba..f7a4b737 100644
--- a/examples/itemmodel/main.cpp
+++ b/examples/itemmodel/main.cpp
@@ -17,9 +17,9 @@
 ****************************************************************************/
 
 #include <QtDataVisualization/q3dbars.h>
-#include <QtDataVisualization/q3dcategoryaxis.h>
+#include <QtDataVisualization/qcategory3daxis.h>
 #include <QtDataVisualization/qitemmodelbardataproxy.h>
-#include <QtDataVisualization/q3dvalueaxis.h>
+#include <QtDataVisualization/qvalue3daxis.h>
 #include <QtDataVisualization/q3dscene.h>
 #include <QtDataVisualization/q3dcamera.h>
 #include <QtDataVisualization/qbar3dseries.h>
diff --git a/examples/scatter/scatterdatamodifier.cpp b/examples/scatter/scatterdatamodifier.cpp
index ade34da4..bbc1e588 100644
--- a/examples/scatter/scatterdatamodifier.cpp
+++ b/examples/scatter/scatterdatamodifier.cpp
@@ -18,7 +18,7 @@
 
 #include "scatterdatamodifier.h"
 #include <QtDataVisualization/qscatterdataproxy.h>
-#include <QtDataVisualization/q3dvalueaxis.h>
+#include <QtDataVisualization/qvalue3daxis.h>
 #include <QtDataVisualization/q3dscene.h>
 #include <QtDataVisualization/q3dcamera.h>
 #include <QtDataVisualization/qscatter3dseries.h>
@@ -48,9 +48,9 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
     //! [0]
 
     //! [1]
-    m_graph->setAxisX(new Q3DValueAxis);
-    m_graph->setAxisY(new Q3DValueAxis);
-    m_graph->setAxisZ(new Q3DValueAxis);
+    m_graph->setAxisX(new QValue3DAxis);
+    m_graph->setAxisY(new QValue3DAxis);
+    m_graph->setAxisZ(new QValue3DAxis);
     //! [1]
 
     //! [2]
diff --git a/examples/surface/surfacegraph.cpp b/examples/surface/surfacegraph.cpp
index a3d2b60e..495cd63b 100644
--- a/examples/surface/surfacegraph.cpp
+++ b/examples/surface/surfacegraph.cpp
@@ -18,7 +18,7 @@
 
 #include "surfacegraph.h"
 
-#include <QtDataVisualization/Q3DValueAxis>
+#include <QtDataVisualization/QValue3DAxis>
 #include <QtDataVisualization/Q3DTheme>
 #include <QtGui/QImage>
 #include <QtCore/qmath.h>
@@ -35,9 +35,9 @@ const float sampleMax = 8.0f;
 SurfaceGraph::SurfaceGraph(Q3DSurface *surface)
     : m_graph(surface)
 {
-    m_graph->setAxisX(new Q3DValueAxis);
-    m_graph->setAxisY(new Q3DValueAxis);
-    m_graph->setAxisZ(new Q3DValueAxis);
+    m_graph->setAxisX(new QValue3DAxis);
+    m_graph->setAxisY(new QValue3DAxis);
+    m_graph->setAxisZ(new QValue3DAxis);
 
     //! [0]
     m_sqrtSinProxy = new QSurfaceDataProxy();