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>

4 files changed, 22 insertions, 22 deletions

diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp
index 106fd2d6..2f21801f 100644
--- a/tests/barstest/chart.cpp
+++ b/tests/barstest/chart.cpp
@@ -17,8 +17,8 @@
 ****************************************************************************/
 
 #include "chart.h"
-#include <QtDataVis3D/qcategoryaxis.h>
-#include <QtDataVis3D/qvalueaxis.h>
+#include <QtDataVis3D/q3dcategoryaxis.h>
+#include <QtDataVis3D/q3dvalueaxis.h>
 #include <QtDataVis3D/qbardataproxy.h>
 #include <QTime>
 
@@ -42,13 +42,13 @@ ChartModifier::ChartModifier(Q3DBars *barchart)
       m_minval(-20.0), // TODO Barchart Y-axis currently only properly supports zero-centered ranges
       m_maxval(20.0),
       m_selectedBarPos(-1, -1),
-      m_autoAdjustingAxis(new QValueAxis),
-      m_fixedRangeAxis(new QValueAxis),
-      m_temperatureAxis(new QValueAxis),
-      m_yearAxis(new QCategoryAxis),
-      m_monthAxis(new QCategoryAxis),
-      m_genericRowAxis(new QCategoryAxis),
-      m_genericColumnAxis(new QCategoryAxis),
+      m_autoAdjustingAxis(new Q3DValueAxis),
+      m_fixedRangeAxis(new Q3DValueAxis),
+      m_temperatureAxis(new Q3DValueAxis),
+      m_yearAxis(new Q3DCategoryAxis),
+      m_monthAxis(new Q3DCategoryAxis),
+      m_genericRowAxis(new Q3DCategoryAxis),
+      m_genericColumnAxis(new Q3DCategoryAxis),
       m_temperatureData(new QBarDataProxy),
       m_genericData(new QBarDataProxy),
       m_currentAxis(m_fixedRangeAxis)
diff --git a/tests/barstest/chart.h b/tests/barstest/chart.h
index 3319df06..7210d606 100644
--- a/tests/barstest/chart.h
+++ b/tests/barstest/chart.h
@@ -93,16 +93,16 @@ private:
     QStringList m_months;
     QStringList m_years;
     QPoint m_selectedBarPos;
-    QValueAxis *m_autoAdjustingAxis;
-    QValueAxis *m_fixedRangeAxis;
-    QValueAxis *m_temperatureAxis;
-    QCategoryAxis *m_yearAxis;
-    QCategoryAxis *m_monthAxis;
-    QCategoryAxis *m_genericRowAxis;
-    QCategoryAxis *m_genericColumnAxis;
+    Q3DValueAxis *m_autoAdjustingAxis;
+    Q3DValueAxis *m_fixedRangeAxis;
+    Q3DValueAxis *m_temperatureAxis;
+    Q3DCategoryAxis *m_yearAxis;
+    Q3DCategoryAxis *m_monthAxis;
+    Q3DCategoryAxis *m_genericRowAxis;
+    Q3DCategoryAxis *m_genericColumnAxis;
     QBarDataProxy *m_temperatureData;
     QBarDataProxy *m_genericData;
-    QValueAxis *m_currentAxis;
+    Q3DValueAxis *m_currentAxis;
 };
 
 #endif
diff --git a/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp
index aab230f2..0542374b 100644
--- a/tests/scattertest/scatterchart.cpp
+++ b/tests/scattertest/scatterchart.cpp
@@ -18,7 +18,7 @@
 
 #include "scatterchart.h"
 #include <QtDataVis3D/qscatterdataproxy.h>
-#include <QtDataVis3D/qvalueaxis.h>
+#include <QtDataVis3D/q3dvalueaxis.h>
 #include <qmath.h>
 using namespace QtDataVis3D;
 
@@ -38,9 +38,9 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
     m_chart->setTheme(QDataVis::ThemeBrownSand);
     m_chart->setShadowQuality(QDataVis::ShadowHigh);
     m_chart->setCameraPreset(QDataVis::PresetFront);
-    m_chart->setAxisX(new QValueAxis);
-    m_chart->setAxisY(new QValueAxis);
-    m_chart->setAxisZ(new QValueAxis);
+    m_chart->setAxisX(new Q3DValueAxis);
+    m_chart->setAxisY(new Q3DValueAxis);
+    m_chart->setAxisZ(new Q3DValueAxis);
 
     QScatterDataProxy *proxy = new QScatterDataProxy;
     proxy->setItemLabelFormat("@xTitle: @xLabel @yTitle: @yLabel @zTitle: @zLabel");
diff --git a/tests/spectrum/spectrumapp/main.cpp b/tests/spectrum/spectrumapp/main.cpp
index 32076b88..89051da4 100644
--- a/tests/spectrum/spectrumapp/main.cpp
+++ b/tests/spectrum/spectrumapp/main.cpp
@@ -21,7 +21,7 @@
 
 #include <QtDataVis3D/q3dbars.h>
 #include <QtDataVis3D/qbardataproxy.h>
-#include <QtDataVis3D/qvalueaxis.h>
+#include <QtDataVis3D/q3dvalueaxis.h>
 
 #include <QGuiApplication>
 #include <QAudio>