diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-23 18:15:52 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-26 09:07:14 +0200 |
commit | 10b3639bf28e384cec0eba882de1e73e91462a2e (patch) | |
tree | fb637f329c3ee93885d8aeafe6e8b76a166207a9 /src/charts/barchart/qabstractbarseries.cpp | |
parent | b01f476957f31a109b5e293b596aee2fb3c07c7f (diff) |
Use QList instead of QVector
Notice the following API changes:
-void QXYSeries::replace(QVector<QPointF> points);
+void QXYSeries::replace(const QList<QPointF> &points);
-bool QAbstractBarSeries::append(QVector<QBarSet *> sets);
+bool QAbstractBarSeries::append(const QList<QBarSet *> &sets);
-void QAbstractBarSeries::barsetsAdded(QVector<QBarSet *> sets);
+void QAbstractBarSeries::barsetsAdded(const QList<QBarSet *> &sets);
-void QAbstractBarSeries::barsetsRemoved(QVector<QBarSet *> sets);
+void QAbstractBarSeries::barsetsRemoved(const QList<QBarSet *> &sets);
-bool QBoxPlotSeries::append(QVector<QBoxSet *> boxes);
+bool QBoxPlotSeries::append(const QList<QBoxSet *> &boxes);
-bool QBoxPlotSeries::append(QVector<QBoxSet *> boxes);
+bool QBoxPlotSeries::append(const QList<QBoxSet *> &boxes);
-void QBoxPlotSeries::boxsetsAdded(QVector<QBoxSet *> sets);
+void QBoxPlotSeries::boxsetsAdded(const QList<QBoxSet *> &sets);
-void QBoxPlotSeries::boxsetsRemoved(QVector<QBoxSet *> sets);
+void QBoxPlotSeries::boxsetsRemoved(const QList<QBoxSet *> &sets);
-bool QPieSeries::append(QVector<QPieSlice *> slices);
+bool QPieSeries::append(const QList<QPieSlice *> &slices);
-QPieSlice *QPieSeries::append(QString label, qreal value);
+QPieSlice *QPieSeries::append(const QString &label, qreal value);
-void QPieSeries::added(QVector<QPieSlice *> slices);
+void QPieSeries::added(const QList<QPieSlice *> &slices);
-void QPieSeries::removed(QVector<QPieSlice *> slices);
+void QPieSeries::removed(const QList<QPieSlice *> &slices);
These should be source compatible changes.
Task-number: QTBUG-84469
Change-Id: I153796e9d8244c8e22819993ef26aa91e7b71f99
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/charts/barchart/qabstractbarseries.cpp')
-rw-r--r-- | src/charts/barchart/qabstractbarseries.cpp | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/src/charts/barchart/qabstractbarseries.cpp b/src/charts/barchart/qabstractbarseries.cpp index 7379e8e1..f5b244ad 100644 --- a/src/charts/barchart/qabstractbarseries.cpp +++ b/src/charts/barchart/qabstractbarseries.cpp @@ -348,7 +348,7 @@ QT_CHARTS_BEGIN_NAMESPACE */ /*! - \fn void QAbstractBarSeries::barsetsAdded(QList<QBarSet*> sets) + \fn void QAbstractBarSeries::barsetsAdded(const QList<QBarSet *> &sets) This signal is emitted when the bar sets specified by \a sets are added to the series. \sa append(), insert() */ @@ -360,7 +360,7 @@ QT_CHARTS_BEGIN_NAMESPACE */ /*! - \fn void QAbstractBarSeries::barsetsRemoved(QList<QBarSet*> sets) + \fn void QAbstractBarSeries::barsetsRemoved(const QList<QBarSet *> &sets) This signal is emitted when the bar sets specified by \a sets are removed from the series. \sa remove() */ @@ -513,17 +513,19 @@ bool QAbstractBarSeries::take(QBarSet *set) If any of the sets appears in the list more than once, nothing is appended and this function returns \c false. */ -bool QAbstractBarSeries::append(QList<QBarSet *> sets) +bool QAbstractBarSeries::append(const QList<QBarSet *> &sets) { Q_D(QAbstractBarSeries); - bool success = d->append(sets); - if (success) { - foreach (QBarSet *set, sets) - set->setParent(this); - emit barsetsAdded(sets); - emit countChanged(); - } - return success; + if (!d->append(sets)) + return false; + + for (auto *set : sets) + set->setParent(this); + + emit barsetsAdded(sets); + emit countChanged(); + + return true; } /*! @@ -993,16 +995,16 @@ bool QAbstractBarSeriesPrivate::remove(QBarSet *set) return true; } -bool QAbstractBarSeriesPrivate::append(QList<QBarSet * > sets) +bool QAbstractBarSeriesPrivate::append(const QList<QBarSet *> &sets) { - foreach (QBarSet *set, sets) { + for (auto *set : sets) { if ((set == 0) || (m_barSets.contains(set))) return false; // Fail if any of the sets is null or is already appended. if (sets.count(set) != 1) return false; // Also fail if same set is more than once in given list. } - foreach (QBarSet *set, sets) { + for (auto *set : sets) { m_barSets.append(set); QObject::connect(set->d_ptr.data(), &QBarSetPrivate::updatedBars, this, &QAbstractBarSeriesPrivate::updatedBars); @@ -1018,7 +1020,7 @@ bool QAbstractBarSeriesPrivate::append(QList<QBarSet * > sets) return true; } -bool QAbstractBarSeriesPrivate::remove(QList<QBarSet * > sets) +bool QAbstractBarSeriesPrivate::remove(const QList<QBarSet *> &sets) { if (sets.count() == 0) return false; |