summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/barstest/chart.cpp18
-rw-r--r--tests/barstest/chart.h16
-rw-r--r--tests/kinectsurface/surfacedata.cpp2
-rw-r--r--tests/multigraphs/data.cpp2
-rw-r--r--tests/scattertest/scatterchart.cpp14
-rw-r--r--tests/spectrum/spectrumapp/main.cpp4
-rw-r--r--tests/surfacetest/graphmodifier.cpp8
7 files changed, 32 insertions, 32 deletions
diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp
index 73f0074c..24fe1b52 100644
--- a/tests/barstest/chart.cpp
+++ b/tests/barstest/chart.cpp
@@ -17,8 +17,8 @@
****************************************************************************/
#include "chart.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>
@@ -45,13 +45,13 @@ GraphModifier::GraphModifier(Q3DBars *barchart, QColorDialog *colorDialog)
m_minval(-16.0f),
m_maxval(20.0f),
m_selectedBar(-1, -1),
- 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_autoAdjustingAxis(new QValue3DAxis),
+ m_fixedRangeAxis(new QValue3DAxis),
+ m_temperatureAxis(new QValue3DAxis),
+ m_yearAxis(new QCategory3DAxis),
+ m_monthAxis(new QCategory3DAxis),
+ m_genericRowAxis(new QCategory3DAxis),
+ m_genericColumnAxis(new QCategory3DAxis),
m_temperatureData(new QBar3DSeries),
m_temperatureData2(new QBar3DSeries),
m_genericData(new QBar3DSeries),
diff --git a/tests/barstest/chart.h b/tests/barstest/chart.h
index 77b10093..c75e5024 100644
--- a/tests/barstest/chart.h
+++ b/tests/barstest/chart.h
@@ -110,13 +110,13 @@ private:
QStringList m_months;
QStringList m_years;
QPoint m_selectedBar;
- Q3DValueAxis *m_autoAdjustingAxis;
- Q3DValueAxis *m_fixedRangeAxis;
- Q3DValueAxis *m_temperatureAxis;
- Q3DCategoryAxis *m_yearAxis;
- Q3DCategoryAxis *m_monthAxis;
- Q3DCategoryAxis *m_genericRowAxis;
- Q3DCategoryAxis *m_genericColumnAxis;
+ QValue3DAxis *m_autoAdjustingAxis;
+ QValue3DAxis *m_fixedRangeAxis;
+ QValue3DAxis *m_temperatureAxis;
+ QCategory3DAxis *m_yearAxis;
+ QCategory3DAxis *m_monthAxis;
+ QCategory3DAxis *m_genericRowAxis;
+ QCategory3DAxis *m_genericColumnAxis;
QBar3DSeries *m_temperatureData;
QBar3DSeries *m_temperatureData2;
QBar3DSeries *m_genericData;
@@ -125,7 +125,7 @@ private:
QBar3DSeries *m_dummyData3;
QBar3DSeries *m_dummyData4;
QBar3DSeries *m_dummyData5;
- Q3DValueAxis *m_currentAxis;
+ QValue3DAxis *m_currentAxis;
bool m_negativeValuesOn;
bool m_useNullInputHandler;
QAbstract3DInputHandler *m_defaultInputHandler;
diff --git a/tests/kinectsurface/surfacedata.cpp b/tests/kinectsurface/surfacedata.cpp
index fe94519a..c0fb4a04 100644
--- a/tests/kinectsurface/surfacedata.cpp
+++ b/tests/kinectsurface/surfacedata.cpp
@@ -20,7 +20,7 @@
#include "surfacedata.h"
#include "QKinectWrapper.h"
-#include <QtDataVisualization/Q3DValueAxis>
+#include <QtDataVisualization/QValue3DAxis>
#include <QScrollBar>
#include <QSize>
#include <QImage>
diff --git a/tests/multigraphs/data.cpp b/tests/multigraphs/data.cpp
index 7ba5685f..9e8a5196 100644
--- a/tests/multigraphs/data.cpp
+++ b/tests/multigraphs/data.cpp
@@ -19,7 +19,7 @@
#define NOMINMAX
#include "data.h"
-#include <QtDataVisualization/Q3DValueAxis>
+#include <QtDataVisualization/QValue3DAxis>
#include <QtDataVisualization/Q3DCamera>
#include <QtDataVisualization/QBar3DSeries>
#include <QtDataVisualization/QScatter3DSeries>
diff --git a/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp
index 2277ca3f..58add6ec 100644
--- a/tests/scattertest/scatterchart.cpp
+++ b/tests/scattertest/scatterchart.cpp
@@ -19,7 +19,7 @@
#include "scatterchart.h"
#include <QtDataVisualization/qscatterdataproxy.h>
#include <QtDataVisualization/qscatter3dseries.h>
-#include <QtDataVisualization/q3dvalueaxis.h>
+#include <QtDataVisualization/qvalue3daxis.h>
#include <QtDataVisualization/q3dscene.h>
#include <QtDataVisualization/q3dcamera.h>
#include <QtDataVisualization/q3dtheme.h>
@@ -43,9 +43,9 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
m_chart->activeTheme()->setFont(font);
m_chart->setShadowQuality(QDataVis::ShadowQualityNone);
m_chart->scene()->activeCamera()->setCameraPreset(Q3DCamera::CameraPresetFront);
- m_chart->setAxisX(new Q3DValueAxis);
- m_chart->setAxisY(new Q3DValueAxis);
- m_chart->setAxisZ(new Q3DValueAxis);
+ m_chart->setAxisX(new QValue3DAxis);
+ m_chart->setAxisY(new QValue3DAxis);
+ m_chart->setAxisZ(new QValue3DAxis);
createAndAddSeries();
createAndAddSeries();
@@ -217,9 +217,9 @@ void ScatterDataModifier::resetAxes()
m_chart->releaseAxis(m_chart->axisY());
m_chart->releaseAxis(m_chart->axisZ());
- m_chart->setAxisX(new Q3DValueAxis);
- m_chart->setAxisY(new Q3DValueAxis);
- m_chart->setAxisZ(new Q3DValueAxis);
+ m_chart->setAxisX(new QValue3DAxis);
+ m_chart->setAxisY(new QValue3DAxis);
+ m_chart->setAxisZ(new QValue3DAxis);
m_chart->axisX()->setSegmentCount(5);
m_chart->axisY()->setSegmentCount(5);
m_chart->axisZ()->setSegmentCount(5);
diff --git a/tests/spectrum/spectrumapp/main.cpp b/tests/spectrum/spectrumapp/main.cpp
index 92965c1c..c4fe111d 100644
--- a/tests/spectrum/spectrumapp/main.cpp
+++ b/tests/spectrum/spectrumapp/main.cpp
@@ -21,8 +21,8 @@
#include <QtDataVisualization/q3dbars.h>
#include <QtDataVisualization/qbardataproxy.h>
-#include <QtDataVisualization/q3dvalueaxis.h>
-#include <QtDataVisualization/q3dcategoryaxis.h>
+#include <QtDataVisualization/qvalue3daxis.h>
+#include <QtDataVisualization/qcategory3daxis.h>
#include <QtDataVisualization/q3dscene.h>
#include <QtDataVisualization/q3dcamera.h>
#include <QtDataVisualization/qbar3dseries.h>
diff --git a/tests/surfacetest/graphmodifier.cpp b/tests/surfacetest/graphmodifier.cpp
index be96a696..bd44c1dc 100644
--- a/tests/surfacetest/graphmodifier.cpp
+++ b/tests/surfacetest/graphmodifier.cpp
@@ -17,7 +17,7 @@
****************************************************************************/
#include "graphmodifier.h"
-#include <QtDataVisualization/Q3DValueAxis>
+#include <QtDataVisualization/QValue3DAxis>
#include <QtDataVisualization/QSurfaceDataProxy>
#include <QtDataVisualization/QSurface3DSeries>
#include <QtDataVisualization/Q3DTheme>
@@ -55,9 +55,9 @@ GraphModifier::GraphModifier(Q3DSurface *graph)
m_theSeries(new QSurface3DSeries),
m_drawMode(QSurface3DSeries::DrawSurfaceAndWireframe)
{
- 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(m_minX, m_minX + m_rangeX);
m_graph->axisZ()->setRange(m_minZ, m_minZ + m_rangeZ);
m_graph->addSeries(m_theSeries);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 07:34:25 +0000