summaryrefslogtreecommitdiffstats
path: root/tests/barstest/chart.cpp
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2013-09-04 12:46:41 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2013-09-04 13:04:35 +0300
commit8122450d4f17781a35ec595c846e05c4c1af394c (patch)
tree9b5711f08f419d1b9ae2393c7e8e49cdd4834eab /tests/barstest/chart.cpp
parent4d453a939850638fa17b44b91d10b31acde10acd (diff)
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>
Diffstat (limited to 'tests/barstest/chart.cpp')
-rw-r--r--tests/barstest/chart.cpp18
1 files changed, 9 insertions, 9 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)