diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-24 10:25:01 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-25 10:11:51 +0200 |
commit | 3c7d4de151d0d87b687644381c5d8aaef06f21b2 (patch) | |
tree | 12c688048acac5f817b68dfbef088544a8ae946a /src/datavisualization/axis | |
parent | fcb44309e4cd228245d310bdbd622e7a2ff98283 (diff) |
Use QList instead of QVector
Task-number: QTBUG-84469
Change-Id: I4dc064b70adb054ca4add2dd662e7227255ff970
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/datavisualization/axis')
4 files changed, 12 insertions, 12 deletions
diff --git a/src/datavisualization/axis/qlogvalue3daxisformatter.cpp b/src/datavisualization/axis/qlogvalue3daxisformatter.cpp index 3e044ed5..77ea37c1 100644 --- a/src/datavisualization/axis/qlogvalue3daxisformatter.cpp +++ b/src/datavisualization/axis/qlogvalue3daxisformatter.cpp @@ -399,7 +399,7 @@ void QLogValue3DAxisFormatterPrivate::recalculate() // Since the logarithm has the same curvature across whole axis range, we can just calculate // subgrid positions for the first segment and replicate them to other segments. - QVector<float> actualSubSegmentSteps(subGridCount); + QList<float> actualSubSegmentSteps(subGridCount); for (int i = 0; i < subGridCount; i++) { float currentSubPosition = positionAt(m_min + ((i + 1) * subSegmentStep)); diff --git a/src/datavisualization/axis/qvalue3daxisformatter.cpp b/src/datavisualization/axis/qvalue3daxisformatter.cpp index 4bc3e7e3..68a73a1d 100644 --- a/src/datavisualization/axis/qvalue3daxisformatter.cpp +++ b/src/datavisualization/axis/qvalue3daxisformatter.cpp @@ -242,7 +242,7 @@ QValue3DAxis *QValue3DAxisFormatter::axis() const * * \sa QValue3DAxis::segmentCount, recalculate() */ -QVector<float> &QValue3DAxisFormatter::gridPositions() const +QList<float> &QValue3DAxisFormatter::gridPositions() const { return d_ptr->m_gridPositions; } @@ -257,7 +257,7 @@ QVector<float> &QValue3DAxisFormatter::gridPositions() const * * \sa QValue3DAxis::segmentCount, QValue3DAxis::subSegmentCount, recalculate() */ -QVector<float> &QValue3DAxisFormatter::subGridPositions() const +QList<float> &QValue3DAxisFormatter::subGridPositions() const { return d_ptr->m_subGridPositions; } @@ -273,7 +273,7 @@ QVector<float> &QValue3DAxisFormatter::subGridPositions() const * * \sa QValue3DAxis::segmentCount, QAbstract3DAxis::labels, recalculate() */ -QVector<float> &QValue3DAxisFormatter::labelPositions() const +QList<float> &QValue3DAxisFormatter::labelPositions() const { return d_ptr->m_labelPositions; } diff --git a/src/datavisualization/axis/qvalue3daxisformatter.h b/src/datavisualization/axis/qvalue3daxisformatter.h index 2567721f..e4efd14e 100644 --- a/src/datavisualization/axis/qvalue3daxisformatter.h +++ b/src/datavisualization/axis/qvalue3daxisformatter.h @@ -31,11 +31,11 @@ #define QVALUE3DAXISFORMATTER_H #include <QtDataVisualization/qdatavisualizationglobal.h> +#include <QtCore/QList> +#include <QtCore/QLocale> #include <QtCore/QObject> #include <QtCore/QScopedPointer> -#include <QtCore/QVector> #include <QtCore/QStringList> -#include <QtCore/QLocale> QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -67,9 +67,9 @@ protected: void markDirty(bool labelsChange = false); QValue3DAxis *axis() const; - QVector<float> &gridPositions() const; - QVector<float> &subGridPositions() const; - QVector<float> &labelPositions() const; + QList<float> &gridPositions() const; + QList<float> &subGridPositions() const; + QList<float> &labelPositions() const; QStringList &labelStrings() const; void setLocale(const QLocale &locale); diff --git a/src/datavisualization/axis/qvalue3daxisformatter_p.h b/src/datavisualization/axis/qvalue3daxisformatter_p.h index 6d2538d7..d6abdb1b 100644 --- a/src/datavisualization/axis/qvalue3daxisformatter_p.h +++ b/src/datavisualization/axis/qvalue3daxisformatter_p.h @@ -81,9 +81,9 @@ protected: float m_max; float m_rangeNormalizer; - QVector<float> m_gridPositions; - QVector<float> m_subGridPositions; - QVector<float> m_labelPositions; + QList<float> m_gridPositions; + QList<float> m_subGridPositions; + QList<float> m_labelPositions; QStringList m_labelStrings; QValue3DAxis *m_axis; |