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>

9 files changed, 29 insertions, 29 deletions

diff --git a/examples/audiolevels/audiolevels.cpp b/examples/audiolevels/audiolevels.cpp
index 91b95b7d..73a71562 100644
--- a/examples/audiolevels/audiolevels.cpp
+++ b/examples/audiolevels/audiolevels.cpp
@@ -20,7 +20,7 @@
 #include "audiolevels.h"
 
 #include <QtDataVis3D/qbardataproxy.h>
-#include <QtDataVis3D/qvalueaxis.h>
+#include <QtDataVis3D/q3dvalueaxis.h>
 
 #include <QAudioDeviceInfo>
 #include <QAudioInput>
diff --git a/examples/audiolevels/doc/src/audiolevels.qdoc b/examples/audiolevels/doc/src/audiolevels.qdoc
index 612c31cd..6e19e97b 100644
--- a/examples/audiolevels/doc/src/audiolevels.qdoc
+++ b/examples/audiolevels/doc/src/audiolevels.qdoc
@@ -17,12 +17,12 @@
 ****************************************************************************/
 
 /*!
-    \example spectrum
-    \title Spectrum Example
+    \example audiolevels
+    \title Audiolevels Example
 
-    The spectrum example shows how feed dynamic data to a graph using Q3DBars.
+    The audiolevels example shows how feed dynamic data to a graph using Q3DBars.
 
-    \image spectrum-example.png
+    \image audiolevels-example.png
 
     TODO
 */
diff --git a/examples/barchart/main.cpp b/examples/barchart/main.cpp
index 026e0af8..e102561c 100644
--- a/examples/barchart/main.cpp
+++ b/examples/barchart/main.cpp
@@ -17,9 +17,9 @@
 ****************************************************************************/
 
 #include <QtDataVis3D/q3dbars.h>
-#include <QtDataVis3D/qcategoryaxis.h>
+#include <QtDataVis3D/q3dcategoryaxis.h>
 #include <QtDataVis3D/qitemmodelbardataproxy.h>
-#include <QtDataVis3D/qvalueaxis.h>
+#include <QtDataVis3D/q3dvalueaxis.h>
 
 #include <QApplication>
 #include <QVBoxLayout>
diff --git a/examples/qmlbarchart/qml/qmlbarchart/axes.qml b/examples/qmlbarchart/qml/qmlbarchart/axes.qml
index 8b97c52e..588e27ca 100644
--- a/examples/qmlbarchart/qml/qmlbarchart/axes.qml
+++ b/examples/qmlbarchart/qml/qmlbarchart/axes.qml
@@ -25,23 +25,23 @@ Item {
     property alias expenses: expensesAxis
     property alias income: incomeAxis
 
-    CategoryAxis {
+    CategoryAxis3D {
         id: rowAxis
         categoryLabels: ["2000", "2001", "2002", "2003"]
     }
-    CategoryAxis {
+    CategoryAxis3D {
         id: columnAxis
         categoryLabels: ["January", "February", "March", "April", "May", "June",
             "July", "August", "September", "October", "November", "December"]
     }
-    ValueAxis {
+    ValueAxis3D {
         id: incomeAxis
         min: 0
         max: 35
         labelFormat: "%.2f M\u20AC"
         title: "Monthly income"
     }
-    ValueAxis {
+    ValueAxis3D {
         id: expensesAxis
         min: 0
         max: 35
diff --git a/examples/rainfall/rainfallchart.cpp b/examples/rainfall/rainfallchart.cpp
index caba756a..15ed6b65 100644
--- a/examples/rainfall/rainfallchart.cpp
+++ b/examples/rainfall/rainfallchart.cpp
@@ -17,8 +17,8 @@
 ****************************************************************************/
 
 #include "rainfallchart.h"
-#include <QtDataVis3D/qcategoryaxis.h>
-#include <QtDataVis3D/qvalueaxis.h>
+#include <QtDataVis3D/q3dcategoryaxis.h>
+#include <QtDataVis3D/q3dvalueaxis.h>
 #include <QGuiApplication>
 #include <QFont>
 #include <QDebug>
diff --git a/examples/scatterchart/scatterchart.cpp b/examples/scatterchart/scatterchart.cpp
index bcb10e92..19b768a1 100644
--- a/examples/scatterchart/scatterchart.cpp
+++ b/examples/scatterchart/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;
 
@@ -37,9 +37,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/examples/surfacechart/chartmodifier.cpp b/examples/surfacechart/chartmodifier.cpp
index f76b3be1..bfd032f7 100644
--- a/examples/surfacechart/chartmodifier.cpp
+++ b/examples/surfacechart/chartmodifier.cpp
@@ -17,7 +17,7 @@
 ****************************************************************************/
 
 #include "chartmodifier.h"
-#include <QValueAxis>
+#include <Q3DValueAxis>
 
 #include <qmath.h>
 
@@ -30,9 +30,9 @@ ChartModifier::ChartModifier(Q3DSurface *chart)
       m_xCount(10),
       m_zCount(10)
 {
-    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);
 }
 
 ChartModifier::~ChartModifier()
diff --git a/examples/widget/chart.cpp b/examples/widget/chart.cpp
index 017961cb..d4bde7f3 100644
--- a/examples/widget/chart.cpp
+++ b/examples/widget/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>
 
@@ -35,9 +35,9 @@ ChartModifier::ChartModifier(Q3DBars *barchart)
       m_subSegments(3),
       m_minval(-20.0), // TODO Barchart Y-axis currently only properly supports zero-centered ranges
       m_maxval(20.0),
-      m_temperatureAxis(new QValueAxis),
-      m_yearAxis(new QCategoryAxis),
-      m_monthAxis(new QCategoryAxis),
+      m_temperatureAxis(new Q3DValueAxis),
+      m_yearAxis(new Q3DCategoryAxis),
+      m_monthAxis(new Q3DCategoryAxis),
       m_temperatureData(new QBarDataProxy)
 {
     m_months << "January" << "February" << "March" << "April" << "May" << "June" << "July" << "August" << "September" << "October" << "November" << "December";
diff --git a/examples/widget/chart.h b/examples/widget/chart.h
index 82745521..a29f955b 100644
--- a/examples/widget/chart.h
+++ b/examples/widget/chart.h
@@ -67,9 +67,9 @@ private:
     qreal m_maxval;
     QStringList m_months;
     QStringList m_years;
-    QValueAxis *m_temperatureAxis;
-    QCategoryAxis *m_yearAxis;
-    QCategoryAxis *m_monthAxis;
+    Q3DValueAxis *m_temperatureAxis;
+    Q3DCategoryAxis *m_yearAxis;
+    Q3DCategoryAxis *m_monthAxis;
     QBarDataProxy *m_temperatureData;
 };