diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-07 13:11:34 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-07 14:38:40 +0200 |
| commit | 467e729eabece018cd42eeee0160f932983561b0 (patch) | |
| tree | 4c42a1d7cfc9fe6a5cbb298a52d9b9faa29cee95 /tests/barstest | |
| parent | f8f57fe64c29408a8d3c41c536639e08f84747e4 (diff) | |
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>
Diffstat (limited to 'tests/barstest')
| -rw-r--r-- | tests/barstest/chart.cpp | 18 | ||||
| -rw-r--r-- | tests/barstest/chart.h | 16 |
2 files changed, 17 insertions, 17 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; |