diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-09-04 12:46:41 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-09-04 13:04:35 +0300 |
| commit | 8122450d4f17781a35ec595c846e05c4c1af394c (patch) | |
| tree | 9b5711f08f419d1b9ae2393c7e8e49cdd4834eab /examples/widget | |
| parent | 4d453a939850638fa17b44b91d10b31acde10acd (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 'examples/widget')
| -rw-r--r-- | examples/widget/chart.cpp | 10 | ||||
| -rw-r--r-- | examples/widget/chart.h | 6 |
2 files changed, 8 insertions, 8 deletions
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; }; |