diff options
87 files changed, 282 insertions, 272 deletions
diff --git a/.cmake.conf b/.cmake.conf index 95b2cce3..16a327c2 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -4,3 +4,5 @@ set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_QASCONST=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_CONTEXTLESS_CONNECT=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_SINGLE_ARGUMENT_QHASH_OVERLOAD=1") +list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_ENABLE_STRICT_MODE_UP_TO=QT_VERSION_CHECK(6,11,0)") + diff --git a/src/charts/animations/boxplotanimation.cpp b/src/charts/animations/boxplotanimation.cpp index 0bb4a5ff..e5525e94 100644 --- a/src/charts/animations/boxplotanimation.cpp +++ b/src/charts/animations/boxplotanimation.cpp @@ -68,7 +68,7 @@ void BoxPlotAnimation::setAnimationStart(BoxWhiskers *box) void BoxPlotAnimation::stopAll() { - foreach (BoxWhiskers *box, m_animations.keys()) { + for (auto box : m_animations.keys()) { BoxWhiskersAnimation *animation = m_animations.value(box); animation->stopAndDestroyLater(); m_animations.remove(box); diff --git a/src/charts/animations/candlestickanimation.cpp b/src/charts/animations/candlestickanimation.cpp index 7c47e03a..b2cdd32d 100644 --- a/src/charts/animations/candlestickanimation.cpp +++ b/src/charts/animations/candlestickanimation.cpp @@ -74,7 +74,7 @@ void CandlestickAnimation::setAnimationStart(Candlestick *candlestick) void CandlestickAnimation::stopAll() { - foreach (Candlestick *candlestick, m_animations.keys()) { + for (auto candlestick : m_animations.keys()) { CandlestickBodyWicksAnimation *animation = m_animations.value(candlestick, 0); if (animation) animation->stopAndDestroyLater(); diff --git a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp index aa082b90..814da047 100644 --- a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp +++ b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp @@ -180,7 +180,7 @@ void QBarCategoryAxis::append(const QStringList &categories) int count = d->m_categories.size(); - foreach(QString category, categories) { + for (auto category : categories) { if (!d->m_categories.contains(category) && !category.isNull()) { d->m_categories.append(category); } diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp b/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp index ed09ea85..1523a811 100644 --- a/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp +++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp @@ -100,7 +100,7 @@ QSizeF ChartLogValueAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint if (labelsVisible()) { qreal labelHeight = 0.0; qreal firstWidth = -1.0; - foreach (const QString& s, ticksList) { + for (const QString &s : std::as_const(ticksList)) { QRectF rect = ChartPresenter::textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle()); labelHeight = qMax(rect.height(), labelHeight); width = rect.width(); diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp b/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp index 98140029..a4d13808 100644 --- a/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp +++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp @@ -101,7 +101,7 @@ QSizeF ChartLogValueAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint if (labelsVisible()) { qreal labelWidth = 0.0; qreal firstHeight = -1.0; - foreach (const QString& s, ticksList) { + for (const QString &s : std::as_const(ticksList)) { QRectF rect = ChartPresenter::textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle()); labelWidth = qMax(rect.width(), labelWidth); height = rect.height(); diff --git a/src/charts/barchart/qabstractbarseries.cpp b/src/charts/barchart/qabstractbarseries.cpp index 6256cfaf..aee4a1b7 100644 --- a/src/charts/barchart/qabstractbarseries.cpp +++ b/src/charts/barchart/qabstractbarseries.cpp @@ -533,7 +533,7 @@ void QAbstractBarSeries::clear() if (success) { emit barsetsRemoved(sets); emit countChanged(); - foreach (QBarSet *set, sets) + for (auto set : std::as_const(sets)) delete set; } } @@ -1008,14 +1008,14 @@ bool QAbstractBarSeriesPrivate::remove(const QList<QBarSet *> &sets) if (sets.size() == 0) return false; - 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 not in series 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.removeOne(set); QObject::disconnect(set->d_ptr.data(), &QBarSetPrivate::updatedBars, this, &QAbstractBarSeriesPrivate::updatedBars); @@ -1059,7 +1059,7 @@ void QAbstractBarSeriesPrivate::initializeAxes() { Q_Q(QAbstractBarSeries); - foreach(QAbstractAxis* axis, m_axes) { + for (auto axis : std::as_const(m_axes)) { if (axis->type() == QAbstractAxis::AxisTypeBarCategory) { switch (q->type()) { case QAbstractSeries::SeriesTypeHorizontalBar: diff --git a/src/charts/boxplotchart/boxplotchartitem.cpp b/src/charts/boxplotchart/boxplotchartitem.cpp index cf1c2473..2ecda37d 100644 --- a/src/charts/boxplotchart/boxplotchartitem.cpp +++ b/src/charts/boxplotchart/boxplotchartitem.cpp @@ -47,7 +47,7 @@ void BoxPlotChartItem::setAnimation(BoxPlotAnimation *animation) { m_animation = animation; if (m_animation) { - foreach (BoxWhiskers *item, m_boxTable.values()) + for (auto item : m_boxTable.values()) m_animation->addBox(item); handleDomainUpdated(); } @@ -114,14 +114,14 @@ void BoxPlotChartItem::handleDataStructureChanged() void BoxPlotChartItem::handleUpdatedBars() { - foreach (BoxWhiskers *item, m_boxTable.values()) { + for (auto item : m_boxTable.values()) { item->setBrush(m_series->brush()); item->setPen(m_series->pen()); item->setBoxOutlined(m_series->boxOutlineVisible()); item->setBoxWidth(m_series->boxWidth()); } // Override with QBoxSet specific settings - foreach (QBoxSet *set, m_boxTable.keys()) { + for (auto set : m_boxTable.keys()) { if (set->brush().style() != Qt::NoBrush) m_boxTable.value(set)->setBrush(set->brush()); if (set->pen().style() != Qt::NoPen) @@ -147,7 +147,7 @@ void BoxPlotChartItem::handleDomainUpdated() // snip a bit off from the whisker at the grid line m_boundingRect.setRect(0.0, -1.0, domain()->size().width(), domain()->size().height() + 1.0); - foreach (BoxWhiskers *item, m_boxTable.values()) { + for (auto item : m_boxTable.values()) { item->updateGeometry(domain()); // If the animation is set, start the animation for each BoxWhisker item @@ -158,7 +158,7 @@ void BoxPlotChartItem::handleDomainUpdated() void BoxPlotChartItem::handleLayoutChanged() { - foreach (BoxWhiskers *item, m_boxTable.values()) { + for (auto item : m_boxTable.values()) { if (m_animation) m_animation->setAnimationStart(item); diff --git a/src/charts/boxplotchart/qboxplotseries.cpp b/src/charts/boxplotchart/qboxplotseries.cpp index 6610327a..663e4f0f 100644 --- a/src/charts/boxplotchart/qboxplotseries.cpp +++ b/src/charts/boxplotchart/qboxplotseries.cpp @@ -252,7 +252,7 @@ void QBoxPlotSeries::clear() if (success) { emit boxsetsRemoved(sets); emit countChanged(); - foreach (QBoxSet *set, sets) + for (auto set : std::as_const(sets)) delete set; } } @@ -393,7 +393,7 @@ void QBoxPlotSeriesPrivate::initializeDomain() void QBoxPlotSeriesPrivate::initializeAxes() { - foreach (QAbstractAxis* axis, m_axes) { + for (auto axis : std::as_const(m_axes)) { if (axis->type() == QAbstractAxis::AxisTypeBarCategory) { if (axis->orientation() == Qt::Horizontal) populateCategories(qobject_cast<QBarCategoryAxis *>(axis)); @@ -448,7 +448,7 @@ void QBoxPlotSeriesPrivate::initializeGraphics(QGraphicsItem *parent) // Tries to find this series from the Chart's list of series and deduce the index int index = 0; - foreach (QAbstractSeries *s, serieses) { + for (auto s : std::as_const(serieses)) { if (s->type() == QAbstractSeries::SeriesTypeBoxPlot) { if (q == static_cast<QBoxPlotSeries *>(s)) { boxPlot->m_seriesIndex = index; @@ -549,7 +549,7 @@ void QBoxPlotSeriesPrivate::handleSeriesChange(QAbstractSeries *series) // Tries to find this series from the Chart's list of series and deduce the index int index = 0; - foreach (QAbstractSeries *s, serieses) { + for (auto s : std::as_const(serieses)) { if (s->type() == QAbstractSeries::SeriesTypeBoxPlot) { if (q == static_cast<QBoxPlotSeries *>(s)) { boxPlot->m_seriesIndex = index; @@ -667,7 +667,7 @@ qreal QBoxPlotSeriesPrivate::min() qreal min = m_boxSets.at(0)->at(0); - foreach (QBoxSet *set, m_boxSets) { + for (auto set : std::as_const(m_boxSets)) { for (int i = 0; i < 5; i++) { if (set->at(i) < min) min = set->at(i); @@ -684,7 +684,7 @@ qreal QBoxPlotSeriesPrivate::max() qreal max = m_boxSets.at(0)->at(0); - foreach (QBoxSet *set, m_boxSets) { + for (auto set : std::as_const(m_boxSets)) { for (int i = 0; i < 5; i++) { if (set->at(i) > max) max = set->at(i); diff --git a/src/charts/candlestickchart/candlestickchartitem.cpp b/src/charts/candlestickchart/candlestickchartitem.cpp index 995a3aa0..5dfcc246 100644 --- a/src/charts/candlestickchart/candlestickchartitem.cpp +++ b/src/charts/candlestickchart/candlestickchartitem.cpp @@ -46,7 +46,7 @@ void CandlestickChartItem::setAnimation(CandlestickAnimation *animation) m_animation = animation; if (m_animation) { - foreach (Candlestick *item, m_candlesticks.values()) + for (auto *item : m_candlesticks.values()) m_animation->addCandlestick(item); handleDomainUpdated(); @@ -75,7 +75,7 @@ void CandlestickChartItem::handleDomainUpdated() // as 0.0 would snip a bit off from the wick at the grid line. m_boundingRect.setRect(0.0, -1.0, domain()->size().width(), domain()->size().height() + 1.0); - foreach (Candlestick *item, m_candlesticks.values()) { + for (auto item : m_candlesticks.values()) { item->updateGeometry(domain()); if (m_animation) @@ -86,7 +86,7 @@ void CandlestickChartItem::handleDomainUpdated() void CandlestickChartItem::handleLayoutUpdated() { bool timestampChanged = false; - foreach (QCandlestickSet *set, m_candlesticks.keys()) { + for (auto set : m_candlesticks.keys()) { qreal oldTimestamp = m_candlesticks.value(set)->m_data.m_timestamp; qreal newTimestamp = set->timestamp(); if (Q_UNLIKELY(oldTimestamp != newTimestamp)) { @@ -98,7 +98,7 @@ void CandlestickChartItem::handleLayoutUpdated() if (timestampChanged) updateTimePeriod(); - foreach (Candlestick *item, m_candlesticks.values()) { + for (auto item : m_candlesticks.values()) { if (m_animation) m_animation->setAnimationStart(item); @@ -118,7 +118,7 @@ void CandlestickChartItem::handleLayoutUpdated() void CandlestickChartItem::handleCandlesticksUpdated() { - foreach (QCandlestickSet *set, m_candlesticks.keys()) + for (auto set : m_candlesticks.keys()) updateCandlestickAppearance(m_candlesticks.value(set), set); } @@ -153,7 +153,7 @@ void CandlestickChartItem::handleCandlestickSeriesChange() void CandlestickChartItem::handleCandlestickSetsAdd(const QList<QCandlestickSet *> &sets) { - foreach (QCandlestickSet *set, sets) { + for (auto set : sets) { Candlestick *item = m_candlesticks.value(set, 0); if (item) { qWarning() << "There is already a candlestick for this set in the hash"; @@ -186,7 +186,7 @@ void CandlestickChartItem::handleCandlestickSetsAdd(const QList<QCandlestickSet void CandlestickChartItem::handleCandlestickSetsRemove(const QList<QCandlestickSet *> &sets) { - foreach (QCandlestickSet *set, sets) { + for (auto set : sets) { Candlestick *item = m_candlesticks.value(set); m_candlesticks.remove(set); diff --git a/src/charts/candlestickchart/qcandlestickseries.cpp b/src/charts/candlestickchart/qcandlestickseries.cpp index b71a9a34..fa28b7b0 100644 --- a/src/charts/candlestickchart/qcandlestickseries.cpp +++ b/src/charts/candlestickchart/qcandlestickseries.cpp @@ -529,7 +529,7 @@ bool QCandlestickSeries::remove(const QList<QCandlestickSet *> &sets) if (success) { emit candlestickSetsRemoved(sets); emit countChanged(); - foreach (QCandlestickSet *set, sets) + for (auto set : sets) delete set; } @@ -606,7 +606,7 @@ void QCandlestickSeries::clear() if (success) { emit candlestickSetsRemoved(sets); emit countChanged(); - foreach (QCandlestickSet *set, sets) + for (auto set : std::as_const(sets)) delete set; } } @@ -941,7 +941,7 @@ void QCandlestickSeriesPrivate::initializeDomain() void QCandlestickSeriesPrivate::initializeAxes() { - foreach (QAbstractAxis* axis, m_axes) { + for (auto axis : std::as_const(m_axes)) { if (axis->type() == QAbstractAxis::AxisTypeBarCategory) { if (axis->orientation() == Qt::Horizontal) populateBarCategories(qobject_cast<QBarCategoryAxis *>(axis)); @@ -1038,14 +1038,14 @@ QAbstractAxis* QCandlestickSeriesPrivate::createDefaultAxis(Qt::Orientation orie bool QCandlestickSeriesPrivate::append(const QList<QCandlestickSet *> &sets) { - foreach (QCandlestickSet *set, sets) { + for (auto set : sets) { if ((set == 0) || m_sets.contains(set) || set->d_ptr->m_series) return false; // Fail if any of the sets is null or is already appended. if (sets.count(set) != 1) return false; // Also fail if the same set occurs more than once in the given list. } - foreach (QCandlestickSet *set, sets) { + for (auto set : sets) { m_sets.append(set); connect(set->d_func(), SIGNAL(updatedLayout()), this, SIGNAL(updatedLayout())); connect(set->d_func(), SIGNAL(updatedCandlestick()), this, SIGNAL(updatedCandlesticks())); @@ -1060,14 +1060,14 @@ bool QCandlestickSeriesPrivate::remove(const QList<QCandlestickSet *> &sets) if (sets.size() == 0) return false; - foreach (QCandlestickSet *set, sets) { + for (auto set : sets) { if ((set == 0) || (!m_sets.contains(set))) return false; // Fail if any of the sets is null or is not in series. if (sets.count(set) != 1) return false; // Also fail if the same set occurs more than once in the given list. } - foreach (QCandlestickSet *set, sets) { + for (auto set : sets) { set->d_ptr->m_series = nullptr; m_sets.removeOne(set); disconnect(set->d_func(), SIGNAL(updatedLayout()), this, SIGNAL(updatedLayout())); diff --git a/src/charts/chartdataset.cpp b/src/charts/chartdataset.cpp index b85262f2..e0f36248 100644 --- a/src/charts/chartdataset.cpp +++ b/src/charts/chartdataset.cpp @@ -72,7 +72,8 @@ void ChartDataSet::addSeries(QAbstractSeries *series) series->d_ptr->setDomain(new XYPolarDomain()); // Set the correct domain for upper and lower series too if (series->type() == QAbstractSeries::SeriesTypeArea) { - foreach (QObject *child, series->children()) { + const auto childlist = series->children(); + for (QObject *child : childlist) { if (qobject_cast<QAbstractSeries *>(child)) { QAbstractSeries *childSeries = qobject_cast<QAbstractSeries *>(child); childSeries->d_ptr->setDomain(new XYPolarDomain()); @@ -137,7 +138,7 @@ void ChartDataSet::removeSeries(QAbstractSeries *series) QList<QAbstractAxis *> axes = series->d_ptr->m_axes; - foreach (QAbstractAxis *axis, axes) { + for (auto axis : axes) { detachAxis(series, axis); } @@ -166,8 +167,8 @@ void ChartDataSet::removeAxis(QAbstractAxis *axis) QList<QAbstractSeries*> series = axis->d_ptr->m_series; - foreach(QAbstractSeries* s, series) { - detachAxis(s,axis); + for (auto s : series) { + detachAxis(s, axis); } emit axisRemoved(axis); @@ -235,10 +236,10 @@ bool ChartDataSet::attachAxis(QAbstractSeries *series,QAbstractAxis *axis) QList<AbstractDomain *> blockedDomains { domain }; if (domain != series->d_ptr->domain()) { - foreach (QAbstractAxis *axis, series->d_ptr->m_axes) { + for (auto axis : std::as_const(series->d_ptr->m_axes)) { series->d_ptr->domain()->detachAxis(axis); domain->attachAxis(axis); - foreach (QAbstractSeries *otherSeries, axis->d_ptr->m_series) { + for (auto otherSeries : std::as_const(axis->d_ptr->m_series)) { if (otherSeries != series && otherSeries->d_ptr->domain()) { if (!otherSeries->d_ptr->domain()->rangeSignalsBlocked()) { otherSeries->d_ptr->domain()->blockRangeSignals(true); @@ -252,7 +253,7 @@ bool ChartDataSet::attachAxis(QAbstractSeries *series,QAbstractAxis *axis) // Reinitialize domain based on old axes, as the series domain initialization above // has trashed the old ranges, if there were any. - for (QAbstractAxis *oldAxis : series->d_ptr->m_axes) + for (QAbstractAxis *oldAxis : std::as_const(series->d_ptr->m_axes)) oldAxis->d_ptr->initializeDomain(domain); } @@ -262,7 +263,7 @@ bool ChartDataSet::attachAxis(QAbstractSeries *series,QAbstractAxis *axis) series->d_ptr->initializeAxes(); axis->d_ptr->initializeDomain(domain); connect(axis, &QAbstractAxis::reverseChanged, this, &ChartDataSet::reverseChanged); - foreach (AbstractDomain *blockedDomain, blockedDomains) + for (auto blockedDomain : std::as_const(blockedDomains)) blockedDomain->blockRangeSignals(false); return true; @@ -318,7 +319,7 @@ void ChartDataSet::createDefaultAxes() Q_ASSERT(m_axisList.isEmpty()); // Select the required axis x and axis y types based on the types of the current series - foreach(QAbstractSeries* s, m_seriesList) { + for (auto s : std::as_const(m_seriesList)) { typeX |= s->d_ptr->defaultAxisType(Qt::Horizontal); typeY |= s->d_ptr->defaultAxisType(Qt::Vertical); } @@ -362,13 +363,13 @@ void ChartDataSet::createAxes(QAbstractAxis::AxisTypes type, Qt::Orientation ori qreal min = 0; qreal max = 0; findMinMaxForSeries(m_seriesList,orientation,min,max); - foreach(QAbstractSeries *s, m_seriesList) { + for (auto s : std::as_const(m_seriesList)) { attachAxis(s,axis); } axis->setRange(min,max); } else { // Create separate axis for each series - foreach(QAbstractSeries *s, m_seriesList) { + for (auto s : std::as_const(m_seriesList)) { QAbstractAxis *axis = s->d_ptr->createDefaultAxis(orientation); if(axis) { addAxis(axis,orientation==Qt::Horizontal?Qt::AlignBottom:Qt::AlignLeft); @@ -400,18 +401,20 @@ void ChartDataSet::findMinMaxForSeries(const QList<QAbstractSeries *> &series, void ChartDataSet::deleteAllSeries() { - foreach (QAbstractSeries *s , m_seriesList){ - removeSeries(s); - delete s; + while (!m_seriesList.isEmpty()) { + auto series = m_seriesList.last(); + removeSeries(series); + delete series; } Q_ASSERT(m_seriesList.size() == 0); } void ChartDataSet::deleteAllAxes() { - foreach (QAbstractAxis *a , m_axisList){ - removeAxis(a); - delete a; + while (!m_axisList.isEmpty()) { + auto axis = m_axisList.last(); + removeAxis(axis); + delete axis; } Q_ASSERT(m_axisList.size() == 0); } @@ -419,54 +422,54 @@ void ChartDataSet::deleteAllAxes() void ChartDataSet::zoomInDomain(const QRectF &rect) { QList<AbstractDomain*> domains; - foreach(QAbstractSeries *s, m_seriesList) { + for (auto s : std::as_const(m_seriesList)) { AbstractDomain* domain = s->d_ptr->domain(); s->d_ptr->m_domain->blockRangeSignals(true); domains<<domain; } - foreach(AbstractDomain *domain, domains) + for (auto domain : std::as_const(domains)) domain->zoomIn(rect); - foreach(AbstractDomain *domain, domains) + for (auto domain : std::as_const(domains)) domain->blockRangeSignals(false); } void ChartDataSet::zoomOutDomain(const QRectF &rect) { QList<AbstractDomain*> domains; - foreach(QAbstractSeries *s, m_seriesList) { + for (auto s : std::as_const(m_seriesList)) { AbstractDomain* domain = s->d_ptr->domain(); s->d_ptr->m_domain->blockRangeSignals(true); domains<<domain; } - foreach(AbstractDomain *domain, domains) + for (auto domain : std::as_const(domains)) domain->zoomOut(rect); - foreach(AbstractDomain *domain, domains) + for (auto domain : std::as_const(domains)) domain->blockRangeSignals(false); } void ChartDataSet::zoomResetDomain() { QList<AbstractDomain*> domains; - foreach (QAbstractSeries *s, m_seriesList) { + for (auto s : std::as_const(m_seriesList)) { AbstractDomain *domain = s->d_ptr->domain(); s->d_ptr->m_domain->blockRangeSignals(true); domains << domain; } - foreach (AbstractDomain *domain, domains) + for (auto domain : std::as_const(domains)) domain->zoomReset(); - foreach (AbstractDomain *domain, domains) + for (auto domain : std::as_const(domains)) domain->blockRangeSignals(false); } bool ChartDataSet::isZoomedDomain() { - foreach (QAbstractSeries *s, m_seriesList) { + for (auto s : std::as_const(m_seriesList)) { if (s->d_ptr->domain()->isZoomed()) return true; } @@ -476,16 +479,16 @@ bool ChartDataSet::isZoomedDomain() void ChartDataSet::scrollDomain(qreal dx, qreal dy) { QList<AbstractDomain*> domains; - foreach(QAbstractSeries *s, m_seriesList) { + for (auto s : std::as_const(m_seriesList)) { AbstractDomain* domain = s->d_ptr->domain(); s->d_ptr->m_domain->blockRangeSignals(true); domains<<domain; } - foreach(AbstractDomain *domain, domains) + for (auto domain : std::as_const(domains)) domain->move(dx, dy); - foreach(AbstractDomain *domain, domains) + for (auto domain : std::as_const(domains)) domain->blockRangeSignals(false); } diff --git a/src/charts/chartpresenter.cpp b/src/charts/chartpresenter.cpp index ad07fb68..c121ae77 100644 --- a/src/charts/chartpresenter.cpp +++ b/src/charts/chartpresenter.cpp @@ -85,7 +85,7 @@ void ChartPresenter::setGeometry(const QRectF rect) void ChartPresenter::updateGeometry(const QRectF &rect) { - foreach (ChartItem *chart, m_chartItems) { + for (auto chart : std::as_const(m_chartItems)) { chart->domain()->setSize(rect.size()); chart->setPos(rect.topLeft()); } @@ -164,12 +164,12 @@ void ChartPresenter::setAnimationOptions(QChart::AnimationOptions options) QChart::AnimationOptions oldOptions = m_options; m_options = options; if (options.testFlag(QChart::SeriesAnimations) != oldOptions.testFlag(QChart::SeriesAnimations)) { - foreach (QAbstractSeries *series, m_series) + for (auto series : std::as_const(m_series)) series->d_ptr->initializeAnimations(m_options, m_animationDuration, m_animationCurve); } if (options.testFlag(QChart::GridAxisAnimations) != oldOptions.testFlag(QChart::GridAxisAnimations)) { - foreach (QAbstractAxis *axis, m_axes) + for (auto axis : std::as_const(m_axes)) axis->d_ptr->initializeAnimations(m_options, m_animationDuration, m_animationCurve); } m_layout->invalidate(); // So that existing animations don't just stop halfway @@ -180,9 +180,9 @@ void ChartPresenter::setAnimationDuration(int msecs) { if (m_animationDuration != msecs) { m_animationDuration = msecs; - foreach (QAbstractSeries *series, m_series) + for (auto series : std::as_const(m_series)) series->d_ptr->initializeAnimations(m_options, m_animationDuration, m_animationCurve); - foreach (QAbstractAxis *axis, m_axes) + for (auto axis : std::as_const(m_axes)) axis->d_ptr->initializeAnimations(m_options, m_animationDuration, m_animationCurve); m_layout->invalidate(); // So that existing animations don't just stop halfway } @@ -192,9 +192,9 @@ void ChartPresenter::setAnimationEasingCurve(const QEasingCurve &curve) { if (m_animationCurve != curve) { m_animationCurve = curve; - foreach (QAbstractSeries *series, m_series) + for (auto series : std::as_const(m_series)) series->d_ptr->initializeAnimations(m_options, m_animationDuration, m_animationCurve); - foreach (QAbstractAxis *axis, m_axes) + for (auto axis : std::as_const(m_axes)) axis->d_ptr->initializeAnimations(m_options, m_animationDuration, m_animationCurve); m_layout->invalidate(); // So that existing animations don't just stop halfway } @@ -202,8 +202,8 @@ void ChartPresenter::setAnimationEasingCurve(const QEasingCurve &curve) void ChartPresenter::setState(State state,QPointF point) { - m_state=state; - m_statePoint=point; + m_state=state; + m_statePoint=point; } QChart::AnimationOptions ChartPresenter::animationOptions() const diff --git a/src/charts/chartthememanager.cpp b/src/charts/chartthememanager.cpp index b39804a0..c5acdcb0 100644 --- a/src/charts/chartthememanager.cpp +++ b/src/charts/chartthememanager.cpp @@ -60,9 +60,9 @@ void ChartThemeManager::setTheme(QChart::ChartTheme theme) if (!m_theme.isNull()) { decorateChart(m_chart,m_theme.data()); decorateLegend(m_chart->legend(),m_theme.data()); - foreach (QAbstractAxis* axis, m_axisList) + for (auto axis : std::as_const(m_axisList)) axis->d_ptr->initializeTheme(m_theme.data(), true); - foreach (QAbstractSeries* series, m_seriesMap.keys()) + for (auto series : m_seriesMap.keys()) series->d_ptr->initializeTheme(m_seriesMap[series], m_theme.data(), true); } } @@ -111,7 +111,7 @@ int ChartThemeManager::seriesCount(QAbstractSeries::SeriesType type) const { int count = 0; QList<QAbstractSeries *> series = m_seriesMap.keys(); - foreach(QAbstractSeries *s, series) { + for (auto s : std::as_const(series)) { if (s->type() == type) count++; } @@ -151,7 +151,7 @@ QList<QGradient> ChartThemeManager::generateSeriesGradients(const QList<QColor>& { QList<QGradient> result; // Generate gradients in HSV color space - foreach (const QColor &color, colors) { + for (const auto &color : colors) { QLinearGradient g; qreal h = color.hsvHueF(); qreal s = color.hsvSaturationF(); diff --git a/src/charts/glwidget.cpp b/src/charts/glwidget.cpp index 85319c0b..c484fec7 100644 --- a/src/charts/glwidget.cpp +++ b/src/charts/glwidget.cpp @@ -72,7 +72,7 @@ void GLWidget::cleanup() delete m_program; m_program = 0; - foreach (QOpenGLBuffer *buffer, m_seriesBufferMap.values()) + for (auto buffer : m_seriesBufferMap.values()) delete buffer; m_seriesBufferMap.clear(); @@ -89,7 +89,7 @@ void GLWidget::cleanXYSeriesResources(const QXYSeries *series) delete m_seriesBufferMap.take(series); } else { // Null series means all series were removed - foreach (QOpenGLBuffer *buffer, m_seriesBufferMap.values()) + for (auto buffer : m_seriesBufferMap.values()) delete buffer; m_seriesBufferMap.clear(); } diff --git a/src/charts/layout/polarchartlayout.cpp b/src/charts/layout/polarchartlayout.cpp index 319e4dc2..2bd32fcd 100644 --- a/src/charts/layout/polarchartlayout.cpp +++ b/src/charts/layout/polarchartlayout.cpp @@ -29,7 +29,7 @@ QRectF PolarChartLayout::calculateAxisGeometry(const QRectF &geometry, axisRadius = geometry.width() / 2.0; int titleHeight = 0; - foreach (ChartAxisElement *chartAxis, axes) { + for (auto chartAxis : axes) { if (!chartAxis->isVisible()) continue; @@ -53,7 +53,7 @@ QRectF PolarChartLayout::calculateAxisGeometry(const QRectF &geometry, axisRect.adjust(0, titleHeight, 0, titleHeight); if (update) { - foreach (ChartAxisElement *chartAxis, axes) + for (auto chartAxis : axes) chartAxis->setGeometry(axisRect, QRectF()); } diff --git a/src/charts/legend/qlegend.cpp b/src/charts/legend/qlegend.cpp index 07406614..9bd1d02e 100644 --- a/src/charts/legend/qlegend.cpp +++ b/src/charts/legend/qlegend.cpp @@ -677,7 +677,7 @@ QList<QLegendMarker*> QLegendPrivate::markers(QAbstractSeries *series) // Create filtered list QList<QLegendMarker *> markers; - foreach (QLegendMarker *marker, m_markers) { + for (auto marker : std::as_const(m_markers)) { if (marker->series() == series) { markers.append(marker); } @@ -722,7 +722,7 @@ void QLegendPrivate::handleSeriesRemoved(QAbstractSeries *series) // Find out, which markers to remove QList<QLegendMarker *> removed; - foreach (QLegendMarker *m, m_markers) { + for (auto m : std::as_const(m_markers)) { if (m->series() == series) { removed << m; } @@ -740,7 +740,7 @@ void QLegendPrivate::handleSeriesVisibleChanged() QAbstractSeries *series = qobject_cast<QAbstractSeries *> (sender()); Q_ASSERT(series); - foreach (QLegendMarker *marker, m_markers) { + for (auto marker : std::as_const(m_markers)) { if (marker->series() == series) { marker->setVisible(series->isVisible()); } @@ -872,7 +872,7 @@ void QLegendPrivate::decorateMarkers(const QList<QLegendMarker *> &markers) void QLegendPrivate::updateToolTips() { - foreach (QLegendMarker *m, m_markers) { + for (auto m : std::as_const(m_markers)) { if (m->d_ptr->m_item->displayedLabel() != m->label()) m->d_ptr->m_item->setToolTip(m->label()); else diff --git a/src/charts/piechart/piechartitem.cpp b/src/charts/piechart/piechartitem.cpp index d6da4abb..2c6426b7 100644 --- a/src/charts/piechart/piechartitem.cpp +++ b/src/charts/piechart/piechartitem.cpp @@ -92,7 +92,7 @@ void PieChartItem::cleanup() QPieSeriesPrivate::fromSeries(m_series)->disconnect(this); m_series = 0; } - foreach (QPieSlice *slice, m_sliceItems.keys()) { + for (auto slice : m_sliceItems.keys()) { slice->disconnect(this); QPieSlicePrivate::fromSlice(slice)->disconnect(this); } diff --git a/src/charts/piechart/qpieseries.cpp b/src/charts/piechart/qpieseries.cpp index 890dabe0..bd33f13f 100644 --- a/src/charts/piechart/qpieseries.cpp +++ b/src/charts/piechart/qpieseries.cpp @@ -636,15 +636,14 @@ void QPieSeries::clear() return; QList<QPieSlice *> slices = d->m_slices; - foreach (QPieSlice *s, d->m_slices) - d->m_slices.removeOne(s); + d->m_slices.clear(); d->updateDerivativeData(); emit removed(slices); emit countChanged(); - foreach (QPieSlice *s, slices) + for (auto s : std::as_const(slices)) delete s; } @@ -815,7 +814,7 @@ qreal QPieSeries::pieEndAngle() const void QPieSeries::setLabelsVisible(bool visible) { Q_D(QPieSeries); - foreach (QPieSlice *s, d->m_slices) + for (auto s : std::as_const(d->m_slices)) s->setLabelVisible(visible); } @@ -830,7 +829,7 @@ void QPieSeries::setLabelsVisible(bool visible) void QPieSeries::setLabelsPosition(QPieSlice::LabelPosition position) { Q_D(QPieSeries); - foreach (QPieSlice *s, d->m_slices) + for (auto s : std::as_const(d->m_slices)) s->setLabelPosition(position); } @@ -857,7 +856,7 @@ void QPieSeriesPrivate::updateDerivativeData() { // calculate sum of all slices qreal sum = 0; - foreach (QPieSlice *s, m_slices) + for (auto s : std::as_const(m_slices)) sum += s->value(); if (!qFuzzyCompare(m_sum, sum)) { @@ -873,7 +872,7 @@ void QPieSeriesPrivate::updateDerivativeData() qreal sliceAngle = m_pieStartAngle; qreal pieSpan = m_pieEndAngle - m_pieStartAngle; QList<QPieSlice *> changed; - foreach (QPieSlice *s, m_slices) { + for (auto s : std::as_const(m_slices)) { QPieSlicePrivate *d = QPieSlicePrivate::fromSlice(s); d->setPercentage(s->value() / m_sum); d->setStartAngle(sliceAngle); @@ -881,7 +880,6 @@ void QPieSeriesPrivate::updateDerivativeData() sliceAngle += s->angleSpan(); } - emit calculatedDataChanged(); } diff --git a/src/charts/xychart/glxyseriesdata.cpp b/src/charts/xychart/glxyseriesdata.cpp index d84f4a07..154777a7 100644 --- a/src/charts/xychart/glxyseriesdata.cpp +++ b/src/charts/xychart/glxyseriesdata.cpp @@ -137,7 +137,7 @@ void GLXYSeriesDataManager::removeSeries(const QXYSeries *series) void GLXYSeriesDataManager::cleanup() { - foreach (GLXYSeriesData *data, m_seriesDataMap.values()) + for (auto data : m_seriesDataMap.values()) delete data; m_seriesDataMap.clear(); m_mapDirty = true; @@ -209,11 +209,11 @@ void GLXYSeriesDataManager::handleAxisReverseChanged(const QList<QAbstractSeries { bool reverseX = false; bool reverseY = false; - foreach (QAbstractSeries *series, seriesList) { + for (auto series : seriesList) { if (QXYSeries *xyseries = qobject_cast<QXYSeries *>(series)) { GLXYSeriesData *data = m_seriesDataMap.value(xyseries); if (data) { - foreach (QAbstractAxis* axis, xyseries->attachedAxes()) { + for (auto axis : xyseries->attachedAxes()) { if (axis->isReverse()) { if (axis->orientation() == Qt::Horizontal) reverseX = true; diff --git a/src/charts/xychart/qxyseries.cpp b/src/charts/xychart/qxyseries.cpp index 7953465e..abd1c110 100644 --- a/src/charts/xychart/qxyseries.cpp +++ b/src/charts/xychart/qxyseries.cpp @@ -627,7 +627,7 @@ void QXYSeries::append(const QPointF &point) */ void QXYSeries::append(const QList<QPointF> &points) { - foreach (const QPointF &point , points) + for (const QPointF &point : points) append(point); } diff --git a/src/chartsqml2/declarativebarseries.cpp b/src/chartsqml2/declarativebarseries.cpp index d93e0bc2..cd0f19eb 100644 --- a/src/chartsqml2/declarativebarseries.cpp +++ b/src/chartsqml2/declarativebarseries.cpp @@ -127,7 +127,8 @@ void DeclarativeBarSeries::classBegin() void DeclarativeBarSeries::componentComplete() { - foreach (QObject *child, children()) { + const auto childlist = children(); + for (QObject *child : childlist) { if (qobject_cast<DeclarativeBarSet *>(child)) { QAbstractBarSeries::append(qobject_cast<DeclarativeBarSet *>(child)); } else if (qobject_cast<QVBarModelMapper *>(child)) { @@ -190,7 +191,8 @@ void DeclarativeStackedBarSeries::classBegin() void DeclarativeStackedBarSeries::componentComplete() { - foreach (QObject *child, children()) { + const auto childlist = children(); + for (QObject *child : childlist) { if (qobject_cast<DeclarativeBarSet *>(child)) { QAbstractBarSeries::append(qobject_cast<DeclarativeBarSet *>(child)); } else if (qobject_cast<QVBarModelMapper *>(child)) { @@ -254,7 +256,8 @@ void DeclarativePercentBarSeries::classBegin() void DeclarativePercentBarSeries::componentComplete() { - foreach (QObject *child, children()) { + const auto childlist = children(); + for (QObject *child : childlist) { if (qobject_cast<DeclarativeBarSet *>(child)) { QAbstractBarSeries::append(qobject_cast<DeclarativeBarSet *>(child)); } else if (qobject_cast<QVBarModelMapper *>(child)) { @@ -317,7 +320,8 @@ void DeclarativeHorizontalBarSeries::classBegin() void DeclarativeHorizontalBarSeries::componentComplete() { - foreach (QObject *child, children()) { + const auto childlist = children(); + for (QObject *child : childlist) { if (qobject_cast<DeclarativeBarSet *>(child)) { QAbstractBarSeries::append(qobject_cast<DeclarativeBarSet *>(child)); } else if (qobject_cast<QVBarModelMapper *>(child)) { @@ -380,7 +384,8 @@ void DeclarativeHorizontalStackedBarSeries::classBegin() void DeclarativeHorizontalStackedBarSeries::componentComplete() { - foreach (QObject *child, children()) { + const auto childlist = children(); + for (QObject *child : childlist) { if (qobject_cast<DeclarativeBarSet *>(child)) { QAbstractBarSeries::append(qobject_cast<DeclarativeBarSet *>(child)); } else if (qobject_cast<QVBarModelMapper *>(child)) { @@ -443,7 +448,8 @@ void DeclarativeHorizontalPercentBarSeries::classBegin() void DeclarativeHorizontalPercentBarSeries::componentComplete() { - foreach (QObject *child, children()) { + const auto childlist = children(); + for (QObject *child : childlist) { if (qobject_cast<DeclarativeBarSet *>(child)) { QAbstractBarSeries::append(qobject_cast<DeclarativeBarSet *>(child)); } else if (qobject_cast<QVBarModelMapper *>(child)) { diff --git a/src/chartsqml2/declarativeboxplotseries.cpp b/src/chartsqml2/declarativeboxplotseries.cpp index 6d4dbe6d..90c530fc 100644 --- a/src/chartsqml2/declarativeboxplotseries.cpp +++ b/src/chartsqml2/declarativeboxplotseries.cpp @@ -377,7 +377,8 @@ void DeclarativeBoxPlotSeries::classBegin() void DeclarativeBoxPlotSeries::componentComplete() { - foreach (QObject *child, children()) { + const auto childlist = children(); + for (QObject *child : childlist) { if (qobject_cast<DeclarativeBoxSet *>(child)) { QBoxPlotSeries::append(qobject_cast<DeclarativeBoxSet *>(child)); } else if (qobject_cast<QVBoxPlotModelMapper *>(child)) { diff --git a/src/chartsqml2/declarativecandlestickseries.cpp b/src/chartsqml2/declarativecandlestickseries.cpp index a085c246..5ec68858 100644 --- a/src/chartsqml2/declarativecandlestickseries.cpp +++ b/src/chartsqml2/declarativecandlestickseries.cpp @@ -159,7 +159,8 @@ void DeclarativeCandlestickSeries::classBegin() void DeclarativeCandlestickSeries::componentComplete() { - foreach (QObject *child, children()) { + const auto childlist = children(); + for (QObject *child : childlist) { if (qobject_cast<DeclarativeCandlestickSet *>(child)) { QCandlestickSeries::append(qobject_cast<DeclarativeCandlestickSet *>(child)); } else if (qobject_cast<QHCandlestickModelMapper *>(child)) { diff --git a/src/chartsqml2/declarativecategoryaxis.cpp b/src/chartsqml2/declarativecategoryaxis.cpp index a0a8fc33..3bcee79e 100644 --- a/src/chartsqml2/declarativecategoryaxis.cpp +++ b/src/chartsqml2/declarativecategoryaxis.cpp @@ -61,7 +61,8 @@ void DeclarativeCategoryAxis::classBegin() void DeclarativeCategoryAxis::componentComplete() { QList<QPair<QString, qreal> > ranges; - foreach (QObject *child, children()) { + const auto childlist = children(); + for (QObject *child : childlist) { if (qobject_cast<DeclarativeCategoryRange *>(child)) { DeclarativeCategoryRange *range = qobject_cast<DeclarativeCategoryRange *>(child); ranges.append(QPair<QString, qreal>(range->label(), range->endValue())); diff --git a/src/chartsqml2/declarativechart.cpp b/src/chartsqml2/declarativechart.cpp index de7ad14c..092aa61e 100644 --- a/src/chartsqml2/declarativechart.cpp +++ b/src/chartsqml2/declarativechart.cpp @@ -596,7 +596,8 @@ void DeclarativeChart::childEvent(QChildEvent *event) void DeclarativeChart::componentComplete() { - foreach (QObject *child, children()) { + const auto childlist = children(); + for (QObject *child : childlist) { if (qobject_cast<QAbstractSeries *>(child)) { // Add series to the chart QAbstractSeries *series = qobject_cast<QAbstractSeries *>(child); diff --git a/src/chartsqml2/declarativeopenglrendernode.cpp b/src/chartsqml2/declarativeopenglrendernode.cpp index 6c94b8d4..b7e1accb 100644 --- a/src/chartsqml2/declarativeopenglrendernode.cpp +++ b/src/chartsqml2/declarativeopenglrendernode.cpp @@ -400,10 +400,10 @@ void DeclarativeOpenGLRenderNode::cleanXYSeriesResources(const QXYSeries *series delete m_seriesBufferMap.take(series); delete m_xyDataMap.take(series); } else { - foreach (QOpenGLBuffer *buffer, m_seriesBufferMap.values()) + for (QOpenGLBuffer *buffer : m_seriesBufferMap.values()) delete buffer; m_seriesBufferMap.clear(); - foreach (GLXYSeriesData *data, m_xyDataMap.values()) + for (GLXYSeriesData *data : m_xyDataMap.values()) delete data; m_xyDataMap.clear(); } @@ -416,7 +416,7 @@ void DeclarativeOpenGLRenderNode::handleMouseEvents() if (m_selectionRenderNeeded) renderSelection(); } - Q_FOREACH (QMouseEvent *event, m_mouseEvents) { + for (QMouseEvent *event : m_mouseEvents) { const QXYSeries *series = findSeriesAtEvent(event); switch (event->type()) { case QEvent::MouseMove: { diff --git a/src/chartsqml2/declarativepieseries.cpp b/src/chartsqml2/declarativepieseries.cpp index 38c446a0..6f5cf791 100644 --- a/src/chartsqml2/declarativepieseries.cpp +++ b/src/chartsqml2/declarativepieseries.cpp @@ -58,7 +58,8 @@ void DeclarativePieSeries::classBegin() void DeclarativePieSeries::componentComplete() { - foreach (QObject *child, children()) { + const auto childlist = children(); + for (QObject *child : childlist) { if (qobject_cast<QPieSlice *>(child)) { QPieSeries::append(qobject_cast<QPieSlice *>(child)); } else if (qobject_cast<QVPieModelMapper *>(child)) { @@ -94,7 +95,7 @@ QPieSlice *DeclarativePieSeries::at(int index) QPieSlice *DeclarativePieSeries::find(QString label) { - foreach (QPieSlice *slice, slices()) { + for (auto slice : slices()) { if (slice->label() == label) return slice; } diff --git a/src/chartsqml2/declarativexyseries.cpp b/src/chartsqml2/declarativexyseries.cpp index a7a276ae..e712f041 100644 --- a/src/chartsqml2/declarativexyseries.cpp +++ b/src/chartsqml2/declarativexyseries.cpp @@ -27,7 +27,8 @@ void DeclarativeXySeries::componentComplete() QXYSeries *series = qobject_cast<QXYSeries *>(xySeries()); Q_ASSERT(series); - foreach (QObject *child, series->children()) { + const auto childlist = series->children(); + for (QObject *child : childlist) { if (qobject_cast<DeclarativeXYPoint *>(child)) { DeclarativeXYPoint *point = qobject_cast<DeclarativeXYPoint *>(child); series->append(point->x(), point->y()); diff --git a/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp b/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp index 885cd985..4b2a31ca 100644 --- a/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp +++ b/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp @@ -90,7 +90,7 @@ void tst_QBarCategoriesAxis::init() QStringList categories; categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; - foreach(QString category, categories) + for (auto category : std::as_const(categories)) m_baraxis->append(category); tst_QAbstractAxis::initAxes(m_baraxis, m_series); @@ -191,7 +191,7 @@ void tst_QBarCategoriesAxis::append2() QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString,QString))); QSignalSpy spy4(&axis, SIGNAL(countChanged())); - foreach(QString category, categories) + for (auto category : std::as_const(categories)) axis.append(category); QCOMPARE(spy0.size(), categories.size()); diff --git a/tests/auto/qbarseries/tst_qbarseries.cpp b/tests/auto/qbarseries/tst_qbarseries.cpp index 96874072..24de233c 100644 --- a/tests/auto/qbarseries/tst_qbarseries.cpp +++ b/tests/auto/qbarseries/tst_qbarseries.cpp @@ -93,7 +93,7 @@ void tst_QBarSeries::init() void tst_QBarSeries::cleanup() { - foreach (QBarSet* s, m_testSets) { + for (auto s : std::as_const(m_testSets)) { m_barseries_with_sets->remove(s); } m_testSets.clear(); diff --git a/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp b/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp index 333a532d..0ede6cae 100644 --- a/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp +++ b/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp @@ -86,7 +86,7 @@ void tst_QHorizontalBarSeries::init() void tst_QHorizontalBarSeries::cleanup() { - foreach (QBarSet* s, m_testSets) { + for (auto s : std::as_const(m_testSets)) { m_barseries_with_sets->remove(s); } m_testSets.clear(); diff --git a/tests/auto/qlegend/tst_qlegend.cpp b/tests/auto/qlegend/tst_qlegend.cpp index 47016d81..72fc4b2f 100644 --- a/tests/auto/qlegend/tst_qlegend.cpp +++ b/tests/auto/qlegend/tst_qlegend.cpp @@ -525,7 +525,7 @@ void tst_QLegend::markerSignals() chart->addSeries(scatter); QList<QSignalSpy *> spies; - foreach(QLegendMarker *m, legend->markers()) { + for (auto m : legend->markers()) { QSignalSpy *spy = new QSignalSpy(m, SIGNAL(hovered(bool))); spies.append(spy); } @@ -539,7 +539,7 @@ void tst_QLegend::markerSignals() for (int i = 0; i < 400; i++) QTest::mouseMove(view.viewport(), QPoint(333, i)); - foreach (QSignalSpy *spy, spies) + for (auto spy : spies) TRY_COMPARE(spy->size(), 2); qDeleteAll(spies); diff --git a/tests/auto/qml/tst_qml.cpp b/tests/auto/qml/tst_qml.cpp index 6587b482..1f4cee48 100644 --- a/tests/auto/qml/tst_qml.cpp +++ b/tests/auto/qml/tst_qml.cpp @@ -36,7 +36,7 @@ QString tst_qml::componentErrors(const QQmlComponent* component) const QStringList errors; - foreach (QQmlError const& error, component->errors()) { + for (QQmlError const &error : component->errors()) { errors << error.toString(); } diff --git a/tests/auto/qpieseries/tst_qpieseries.cpp b/tests/auto/qpieseries/tst_qpieseries.cpp index 06b02c69..eae52b8c 100644 --- a/tests/auto/qpieseries/tst_qpieseries.cpp +++ b/tests/auto/qpieseries/tst_qpieseries.cpp @@ -459,13 +459,13 @@ void tst_qpieseries::verifyCalculatedData(const QPieSeries &series, bool *ok) *ok = false; qreal sum = 0; - foreach (const QPieSlice *slice, series.slices()) + for (const auto slice : series.slices()) sum += slice->value(); QCOMPARE(series.sum(), sum); qreal startAngle = series.pieStartAngle(); qreal pieAngleSpan = series.pieEndAngle() - series.pieStartAngle(); - foreach (const QPieSlice *slice, series.slices()) { + for (const auto slice : series.slices()) { qreal ratio = slice->value() / sum; qreal sliceSpan = pieAngleSpan * ratio; QCOMPARE(slice->startAngle(), startAngle); @@ -571,7 +571,7 @@ void tst_qpieseries::hoverSignal() // check QCOMPARE(hoverSpy.size(), 8); int i = 0; - foreach (QPieSlice *s, m_series->slices()) { + for (auto s : m_series->slices()) { QCOMPARE(qvariant_cast<QPieSlice*>(hoverSpy.at(i).at(0)), s); QCOMPARE(qvariant_cast<bool>(hoverSpy.at(i).at(1)), true); i++; diff --git a/tests/auto/qxyseries/tst_qxyseries.cpp b/tests/auto/qxyseries/tst_qxyseries.cpp index 691089c2..6384867d 100644 --- a/tests/auto/qxyseries/tst_qxyseries.cpp +++ b/tests/auto/qxyseries/tst_qxyseries.cpp @@ -188,7 +188,7 @@ void tst_QXYSeries::append_raw() QCOMPARE(m_series->points(), points); // Process events between appends - foreach (const QPointF &point, otherPoints) { + for (const auto point : otherPoints) { m_series->append(point); QApplication::processEvents(); } @@ -271,7 +271,7 @@ void tst_QXYSeries::remove_raw() TRY_COMPARE(spy0.size(), 0); QCOMPARE(m_series->points(), points); - foreach (const QPointF& point,points) + for (const auto point : std::as_const(points)) m_series->remove(point); QCOMPARE(m_series->points().size(), 0); @@ -291,7 +291,7 @@ void tst_QXYSeries::remove_raw() // Process events between removes m_series->append(points); QCOMPARE(m_series->points(), points); - foreach (const QPointF &point, points) { + for (const auto point : std::as_const(points)) { m_series->remove(point); QApplication::processEvents(); } @@ -418,8 +418,8 @@ void tst_QXYSeries::replace_raw() TRY_COMPARE(pointsReplacedSpy.size(), 0); QCOMPARE(m_series->points(), points); - foreach (const QPointF& point, points) - m_series->replace(point.x(),point.y(),point.x(),0); + for (const auto point : std::as_const(points)) + m_series->replace(point.x(), point.y(), point.x(), 0); TRY_COMPARE(pointReplacedSpy.size(), points.size()); TRY_COMPARE(pointsReplacedSpy.size(), 0); @@ -535,8 +535,7 @@ void tst_QXYSeries::oper() QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF))); - foreach (const QPointF& point,points) - { + for (const auto point : std::as_const(points)) { *m_series<<point; } diff --git a/tests/manual/boxplottester/customtablemodel.cpp b/tests/manual/boxplottester/customtablemodel.cpp index 3aa87dba..77d9bdd9 100644 --- a/tests/manual/boxplottester/customtablemodel.cpp +++ b/tests/manual/boxplottester/customtablemodel.cpp @@ -100,10 +100,9 @@ QVariant CustomTableModel::data(const QModelIndex &index, int role) const } else if (role == Qt::EditRole) { return m_data[index.column()]->at(index.row()); } else if (role == Qt::BackgroundRole) { - QRect rect; - foreach (rect, m_mapping) - if (rect.contains(index.column(), index.row())) - return QColor(m_mapping.key(rect)); + for (auto rect : m_mapping) + if (rect.contains(index.column(), index.row())) + return QColor(m_mapping.key(rect)); // cell not mapped return white color return QColor(Qt::white); diff --git a/tests/manual/candlesticktester/customtablemodel.cpp b/tests/manual/candlesticktester/customtablemodel.cpp index 5d460740..71b79af1 100644 --- a/tests/manual/candlesticktester/customtablemodel.cpp +++ b/tests/manual/candlesticktester/customtablemodel.cpp @@ -69,7 +69,7 @@ QVariant CustomTableModel::data(const QModelIndex &index, int role) const case Qt::EditRole: return m_data[index.row()]->at(index.column()); case Qt::BackgroundRole: - foreach (QRect rect, m_mapping) { + for (auto rect : m_mapping) { if (rect.contains(index.column(), index.row())) return QColor(m_mapping.key(rect)); } diff --git a/tests/manual/candlesticktester/mainwidget.cpp b/tests/manual/candlesticktester/mainwidget.cpp index 4387c1f7..cc77f787 100644 --- a/tests/manual/candlesticktester/mainwidget.cpp +++ b/tests/manual/candlesticktester/mainwidget.cpp @@ -396,7 +396,7 @@ void MainWidget::addSet() return; } - foreach (QAbstractSeries *s, m_chart->series()) { + for (auto s : m_chart->series()) { QCandlestickSeries *series = qobject_cast<QCandlestickSeries *>(s); QDateTime dateTime; @@ -422,7 +422,7 @@ void MainWidget::insertSet() return; } - foreach (QAbstractSeries *s, m_chart->series()) { + for (auto s : m_chart->series()) { QCandlestickSeries *series = qobject_cast<QCandlestickSeries *>(s); QDateTime dateTime; @@ -448,7 +448,7 @@ void MainWidget::removeSet() return; } - foreach (QAbstractSeries *s, m_chart->series()) { + for (auto s : m_chart->series()) { QCandlestickSeries *series = qobject_cast<QCandlestickSeries *>(s); if (series->sets().isEmpty()) qDebug() << "Create a set first"; @@ -466,7 +466,7 @@ void MainWidget::removeAllSets() return; } - foreach (QAbstractSeries *s, m_chart->series()) { + for (auto s : m_chart->series()) { QCandlestickSeries *series = qobject_cast<QCandlestickSeries *>(s); if (series->sets().isEmpty()) qDebug() << "Create a set first"; @@ -480,7 +480,7 @@ void MainWidget::removeAllSets() void MainWidget::changeMaximumColumnWidth(double width) { m_maximumColumnWidth = width; - foreach (QAbstractSeries *s, m_chart->series()) { + for (auto s : m_chart->series()) { QCandlestickSeries *series = qobject_cast<QCandlestickSeries *>(s); series->setMaximumColumnWidth(m_maximumColumnWidth); } @@ -489,7 +489,7 @@ void MainWidget::changeMaximumColumnWidth(double width) void MainWidget::changeMinimumColumnWidth(double width) { m_minimumColumnWidth = width; - foreach (QAbstractSeries *s, m_chart->series()) { + for (auto s : m_chart->series()) { QCandlestickSeries *series = qobject_cast<QCandlestickSeries *>(s); series->setMinimumColumnWidth(m_minimumColumnWidth); } @@ -498,7 +498,7 @@ void MainWidget::changeMinimumColumnWidth(double width) void MainWidget::bodyOutlineVisibleToggled(bool visible) { m_bodyOutlineVisible = visible; - foreach (QAbstractSeries *s, m_chart->series()) { + for (auto s : m_chart->series()) { QCandlestickSeries *series = qobject_cast<QCandlestickSeries *>(s); series->setBodyOutlineVisible(m_bodyOutlineVisible); } @@ -507,7 +507,7 @@ void MainWidget::bodyOutlineVisibleToggled(bool visible) void MainWidget::capsVisibleToggled(bool visible) { m_capsVisible = visible; - foreach (QAbstractSeries *s, m_chart->series()) { + for (auto s : m_chart->series()) { QCandlestickSeries *series = qobject_cast<QCandlestickSeries *>(s); series->setCapsVisible(m_capsVisible); } @@ -516,7 +516,7 @@ void MainWidget::capsVisibleToggled(bool visible) void MainWidget::changeBodyWidth(double width) { m_bodyWidth = width; - foreach (QAbstractSeries *s, m_chart->series()) { + for (auto s : m_chart->series()) { QCandlestickSeries *series = qobject_cast<QCandlestickSeries *>(s); series->setBodyWidth(m_bodyWidth); } @@ -525,7 +525,7 @@ void MainWidget::changeBodyWidth(double width) void MainWidget::changeCapsWidth(double width) { m_capsWidth = width; - foreach (QAbstractSeries *s, m_chart->series()) { + for (auto s : m_chart->series()) { QCandlestickSeries *series = qobject_cast<QCandlestickSeries *>(s); series->setCapsWidth(m_capsWidth); } @@ -623,7 +623,7 @@ void MainWidget::changeAxisX(int axisXIndex) updateAxes(); - foreach (QAbstractSeries *series, m_chart->series()) + for (auto series : m_chart->series()) series->attachAxis(m_axisX); } @@ -642,7 +642,7 @@ void MainWidget::attachModelMapper() series->setName(QStringLiteral("SWMM")); // Series With Model Mapper CustomTableModel *model = qobject_cast<CustomTableModel *>(m_hModelMapper->model()); - foreach (QCandlestickSet *set, series->sets()) + for (auto set : series->sets()) model->addRow(set); m_hModelMapper->setFirstSetRow(0); diff --git a/tests/manual/chartdesigner/engine.cpp b/tests/manual/chartdesigner/engine.cpp index 9ecafcaf..2ddd6add 100644 --- a/tests/manual/chartdesigner/engine.cpp +++ b/tests/manual/chartdesigner/engine.cpp @@ -53,7 +53,7 @@ QList<QAbstractSeries*> Engine::addSeries(QAbstractSeries::SeriesType type) QMultiMap<int, QModelIndex> columns; - foreach (const QModelIndex& index, list) { + for (const auto index : list) { columns.insert(index.column(), index); } @@ -64,7 +64,7 @@ QList<QAbstractSeries*> Engine::addSeries(QAbstractSeries::SeriesType type) int minRow = m_count + 1; int maxRow = -1; - foreach (const QModelIndex& index, rows) { + for (const auto index : rows) { minRow = qMin(index.row(), minRow); maxRow = qMax(index.row(), maxRow); } @@ -147,7 +147,7 @@ void Engine::removeSeries(QAbstractSeries* series) { m_chart->removeSeries(series); - foreach (const QModelIndex& index, m_seriesModelIndex.value(series)) { + for (const auto index : m_seriesModelIndex.value(series)) { m_model->setData(index, QColor(Qt::white), Qt::BackgroundRole); } } @@ -252,7 +252,7 @@ void Engine::setupXYSeries(QXYSeries *xyseries, const QList<int>& columns, int c QObject::connect(xyseries,SIGNAL(clicked(QPointF)),this,SIGNAL(selected())); const QModelIndexList& list = m_selection->selectedIndexes(); QModelIndexList result; - foreach (const QModelIndex& index, list) { + for (const auto index : list) { if (index.column() ==columns.at(column)){ m_model->setData(index, xyseries->pen().color(), Qt::BackgroundRole); result << index; @@ -274,7 +274,7 @@ void Engine::setupBarSeries(QAbstractBarSeries *bar, const QList<int>& columns, bar->setName(QString("Series %1").arg(m_chart->series().count())); const QModelIndexList& list = m_selection->selectedIndexes(); - foreach (const QModelIndex& index, list) { + for (const auto index : list) { if (index.column() >= columns.at(1) && index.column()<= columns.last()) { //m_model->setData(index, bar->barSets().at(index.column())->brush().color(), Qt::BackgroundRole); } @@ -294,8 +294,8 @@ void Engine::setupPieSeries(QPieSeries *pie, const QList<int>& columns, int minR pie->setName(QString("Series %1").arg(m_chart->series().count())); const QModelIndexList& list = m_selection->selectedIndexes(); - foreach (const QModelIndex& index, list) { - // m_model->setData(index, bar->barSets()pen().color(), Qt::BackgroundRole); + for (const auto index : list) { + // m_model->setData(index, bar->barSets()pen().color(), Qt::BackgroundRole); } } @@ -321,7 +321,7 @@ void Engine::setupAreaSeries(QAreaSeries *series, const QList<int>& columns, int series->setName(QString("Series %1").arg(m_chart->series().count())); const QModelIndexList& list = m_selection->selectedIndexes(); - foreach (const QModelIndex& index, list) { + for (const auto index : list) { //if (index.column() ==columns.at(column)) // m_model->setData(index, xyseries->pen().color(), Qt::BackgroundRole); } diff --git a/tests/manual/chartdesigner/mainwindow.cpp b/tests/manual/chartdesigner/mainwindow.cpp index 93b595f1..67f441b8 100644 --- a/tests/manual/chartdesigner/mainwindow.cpp +++ b/tests/manual/chartdesigner/mainwindow.cpp @@ -219,7 +219,7 @@ void MainWindow::updateUI() QMultiMap<int, QModelIndex> columns; - foreach (const QModelIndex& index, list) { + for (const auto index : list) { columns.insert(index.column(), index); } @@ -227,7 +227,7 @@ void MainWindow::updateUI() bool seriesEnabled = false; - foreach (QAction* action, m_addSeriesMenu->actions()) { + for (auto action: m_addSeriesMenu->actions()) { switch (action->data().toInt()) { case QAbstractSeries::SeriesTypeLine: case QAbstractSeries::SeriesTypeSpline: @@ -257,24 +257,24 @@ void MainWindow::updateUI() m_removeAllAction->setEnabled(m_engine->chart()->series().count() > 0); int theme = m_engine->chart()->theme(); - foreach (QAction* action, m_themeMenu->actions()) { + for (auto action : m_themeMenu->actions()) { action->setChecked(action->data().toInt() == theme); } int animation = m_engine->chart()->animationOptions(); - foreach (QAction* action, m_animationMenu->actions()) { + for (auto action : m_animationMenu->actions()) { action->setChecked(action->data().toInt() == animation); } int zoom = m_view->rubberBand(); - foreach (QAction* action, m_zoomMenu->actions()) { + for (auto action : m_zoomMenu->actions()) { action->setChecked(action->data().toInt() == zoom); } m_legendAction->setChecked(m_engine->chart()->legend()->isVisible()); m_antialiasingAction->setChecked(m_view->renderHints().testFlag(QPainter::Antialiasing)); - foreach (QAction *action, m_seriesMenu->actions()) { + for (auto action : m_seriesMenu->actions()) { //TODO: visibility handling //if (m_series.value(action->text())) // ; @@ -309,8 +309,7 @@ void MainWindow::handleAddSeriesMenu() QAction* action = qobject_cast<QAction*>(sender()); QList<QAbstractSeries*> series = m_engine->addSeries(QAbstractSeries::SeriesType(action->data().toInt())); - foreach (QAbstractSeries* s , series) - { + for (auto s : series) { QAction *newAction = new QAction(s->name(),this); //newAction->setCheckable(true); m_series.insert(s->name(),s); @@ -322,8 +321,7 @@ void MainWindow::handleAddSeriesMenu() void MainWindow::handleRemoveAllSeriesAction() { - - foreach (QAction* action, m_seriesMenu->actions()){ + for (auto action : m_seriesMenu->actions()) { if(m_series.contains(action->text())){ m_seriesMenu->removeAction(action); m_engine->removeSeries(m_series.value(action->text())); diff --git a/tests/manual/chartviewer/charts/axis/barcategoryaxisx.cpp b/tests/manual/chartviewer/charts/axis/barcategoryaxisx.cpp index dd358168..c18dc94d 100644 --- a/tests/manual/chartviewer/charts/axis/barcategoryaxisx.cpp +++ b/tests/manual/chartviewer/charts/axis/barcategoryaxisx.cpp @@ -28,7 +28,7 @@ public: QBarCategoryAxis *barcategory = new QBarCategoryAxis(); for (int i(0); i < table.count(); i++) { QBarSet *set = new QBarSet("Bar set " + QString::number(i)); - foreach (Data data, table[i]) + for (auto data : table[i]) *set << data.first.y(); series->append(set); } diff --git a/tests/manual/chartviewer/charts/axis/barcategoryaxisxlogy.cpp b/tests/manual/chartviewer/charts/axis/barcategoryaxisxlogy.cpp index 2ac35636..057cb2a5 100644 --- a/tests/manual/chartviewer/charts/axis/barcategoryaxisxlogy.cpp +++ b/tests/manual/chartviewer/charts/axis/barcategoryaxisxlogy.cpp @@ -29,7 +29,7 @@ public: QBarCategoryAxis *barcategory = new QBarCategoryAxis(); for (int i(0); i < table.count(); i++) { QBarSet *set = new QBarSet("Bar set " + QString::number(i)); - foreach (Data data, table[i]) + for (auto data : table[i]) *set << data.first.y(); series->append(set); } diff --git a/tests/manual/chartviewer/charts/axis/barcategoryaxisy.cpp b/tests/manual/chartviewer/charts/axis/barcategoryaxisy.cpp index 70635a69..d824e95c 100644 --- a/tests/manual/chartviewer/charts/axis/barcategoryaxisy.cpp +++ b/tests/manual/chartviewer/charts/axis/barcategoryaxisy.cpp @@ -28,7 +28,7 @@ public: QBarCategoryAxis *barcategory = new QBarCategoryAxis(); for (int i(0); i < table.count(); i++) { QBarSet *set = new QBarSet("Bar set " + QString::number(i)); - foreach(Data data, table[i]) + for (auto data : table[i]) *set << data.first.y(); series->append(set); } diff --git a/tests/manual/chartviewer/charts/axis/barcategoryaxisylogx.cpp b/tests/manual/chartviewer/charts/axis/barcategoryaxisylogx.cpp index f4dfc35d..90767e13 100644 --- a/tests/manual/chartviewer/charts/axis/barcategoryaxisylogx.cpp +++ b/tests/manual/chartviewer/charts/axis/barcategoryaxisylogx.cpp @@ -29,7 +29,7 @@ public: QBarCategoryAxis *barcategory = new QBarCategoryAxis(); for (int i(0); i < table.count(); i++) { QBarSet *set = new QBarSet("Bar set " + QString::number(i)); - foreach (Data data, table[i]) + for (auto data : table[i]) *set << data.first.y(); series->append(set); } diff --git a/tests/manual/chartviewer/charts/axis/categoryaxis.cpp b/tests/manual/chartviewer/charts/axis/categoryaxis.cpp index e0c01087..90955b55 100644 --- a/tests/manual/chartviewer/charts/axis/categoryaxis.cpp +++ b/tests/manual/chartviewer/charts/axis/categoryaxis.cpp @@ -22,9 +22,9 @@ public: QString name("Series "); int nameIndex = 0; - foreach (DataList list, table) { + for (auto list : table) { QLineSeries *series = new QLineSeries(chart); - foreach (Data data, list) + for (auto data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); nameIndex++; diff --git a/tests/manual/chartviewer/charts/axis/datetimeaxisx.cpp b/tests/manual/chartviewer/charts/axis/datetimeaxisx.cpp index a7494470..cb5f60b8 100644 --- a/tests/manual/chartviewer/charts/axis/datetimeaxisx.cpp +++ b/tests/manual/chartviewer/charts/axis/datetimeaxisx.cpp @@ -29,9 +29,9 @@ public: QString name("Series "); int nameIndex = 0; - foreach (DataList list, table) { + for (auto list : table) { QLineSeries *series = new QLineSeries(chart); - foreach (Data data, list) { + for (auto data : list) { QPointF point = data.first; series->append(day * 365l * 30l + point.x() * day * 365l, point.y()); } diff --git a/tests/manual/chartviewer/charts/axis/datetimeaxisy.cpp b/tests/manual/chartviewer/charts/axis/datetimeaxisy.cpp index 170329db..b4a4e677 100644 --- a/tests/manual/chartviewer/charts/axis/datetimeaxisy.cpp +++ b/tests/manual/chartviewer/charts/axis/datetimeaxisy.cpp @@ -29,9 +29,9 @@ public: QString name("Series "); int nameIndex = 0; - foreach (DataList list, table) { + for (auto list : table) { QLineSeries *series = new QLineSeries(chart); - foreach (Data data, list) { + for (auto data : list) { QPointF point = data.first; series->append(point.x(), day * 365l * 30l + point.y() * day * 365l); } diff --git a/tests/manual/chartviewer/charts/axis/logvalueaxisx.cpp b/tests/manual/chartviewer/charts/axis/logvalueaxisx.cpp index 60a689df..1923540a 100644 --- a/tests/manual/chartviewer/charts/axis/logvalueaxisx.cpp +++ b/tests/manual/chartviewer/charts/axis/logvalueaxisx.cpp @@ -23,9 +23,9 @@ public: QString name("Series "); int nameIndex = 0; - foreach (DataList list, table) { + for (auto list : table) { QLineSeries *series = new QLineSeries(chart); - foreach (Data data, list) + for (auto data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); nameIndex++; @@ -35,7 +35,7 @@ public: chart->createDefaultAxes(); QLogValueAxis *axis = new QLogValueAxis(); axis->setBase(1.2); - foreach (QAbstractSeries *series, chart->series()) + for (auto series : chart->series()) chart->setAxisX(axis, series); return chart; diff --git a/tests/manual/chartviewer/charts/axis/logvalueaxisy.cpp b/tests/manual/chartviewer/charts/axis/logvalueaxisy.cpp index c022cc5f..7080a986 100644 --- a/tests/manual/chartviewer/charts/axis/logvalueaxisy.cpp +++ b/tests/manual/chartviewer/charts/axis/logvalueaxisy.cpp @@ -23,9 +23,9 @@ public: QString name("Series "); int nameIndex = 0; - foreach (DataList list, table) { + for (auto list : table) { QLineSeries *series = new QLineSeries(chart); - foreach (Data data, list) + for (auto data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); nameIndex++; @@ -35,7 +35,7 @@ public: chart->createDefaultAxes(); QLogValueAxis *axis = new QLogValueAxis(); axis->setBase(2); - foreach (QAbstractSeries *series, chart->series()) + for (auto series : chart->series()) chart->setAxisY(axis, series); return chart; diff --git a/tests/manual/chartviewer/charts/axis/valueaxis.cpp b/tests/manual/chartviewer/charts/axis/valueaxis.cpp index c3c53cc7..dd369593 100644 --- a/tests/manual/chartviewer/charts/axis/valueaxis.cpp +++ b/tests/manual/chartviewer/charts/axis/valueaxis.cpp @@ -23,9 +23,9 @@ public: QString name("Series "); int nameIndex = 0; - foreach (DataList list, table) { + for (auto list : table) { QLineSeries *series = new QLineSeries(chart); - foreach (Data data, list) + for (auto data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); nameIndex++; @@ -34,7 +34,7 @@ public: chart->createDefaultAxes(); QValueAxis *axis = new QValueAxis(); - foreach (QAbstractSeries *series, chart->series()) + for (auto series : chart->series()) chart->setAxisX(axis, series); return chart; diff --git a/tests/manual/chartviewer/charts/barseries/horizontalbarchart.cpp b/tests/manual/chartviewer/charts/barseries/horizontalbarchart.cpp index 39a7eadc..7d86719a 100644 --- a/tests/manual/chartviewer/charts/barseries/horizontalbarchart.cpp +++ b/tests/manual/chartviewer/charts/barseries/horizontalbarchart.cpp @@ -22,7 +22,7 @@ public: QHorizontalBarSeries *series = new QHorizontalBarSeries(chart); for (int i(0); i < table.count(); i++) { QBarSet *set = new QBarSet("Bar set " + QString::number(i)); - foreach (Data data, table[i]) + for (auto data : table[i]) *set << data.first.y(); series->append(set); } diff --git a/tests/manual/chartviewer/charts/barseries/horizontalpercentbarchart.cpp b/tests/manual/chartviewer/charts/barseries/horizontalpercentbarchart.cpp index d7857870..38b95899 100644 --- a/tests/manual/chartviewer/charts/barseries/horizontalpercentbarchart.cpp +++ b/tests/manual/chartviewer/charts/barseries/horizontalpercentbarchart.cpp @@ -22,7 +22,7 @@ public: QHorizontalPercentBarSeries *series = new QHorizontalPercentBarSeries(chart); for (int i(0); i < table.count(); i++) { QBarSet *set = new QBarSet("Bar set " + QString::number(i)); - foreach (Data data, table[i]) + for (auto data : table[i]) *set << data.first.y(); series->append(set); } diff --git a/tests/manual/chartviewer/charts/barseries/horizontalstackedbarchart.cpp b/tests/manual/chartviewer/charts/barseries/horizontalstackedbarchart.cpp index 0f4e1e7b..a6eabde0 100644 --- a/tests/manual/chartviewer/charts/barseries/horizontalstackedbarchart.cpp +++ b/tests/manual/chartviewer/charts/barseries/horizontalstackedbarchart.cpp @@ -22,7 +22,7 @@ public: QHorizontalStackedBarSeries *series = new QHorizontalStackedBarSeries(chart); for (int i(0); i < table.count(); i++) { QBarSet *set = new QBarSet("Bar set " + QString::number(i)); - foreach (Data data, table[i]) + for (auto data : table[i]) *set << data.first.y(); series->append(set); } diff --git a/tests/manual/chartviewer/charts/barseries/verticalbarchart.cpp b/tests/manual/chartviewer/charts/barseries/verticalbarchart.cpp index 9c5f0d19..f4a003c5 100644 --- a/tests/manual/chartviewer/charts/barseries/verticalbarchart.cpp +++ b/tests/manual/chartviewer/charts/barseries/verticalbarchart.cpp @@ -22,7 +22,7 @@ public: QBarSeries *series = new QBarSeries(chart); for (int i(0); i < table.count(); i++) { QBarSet *set = new QBarSet("Bar set " + QString::number(i)); - foreach (Data data, table[i]) + for (auto data : table[i]) *set << data.first.y(); series->append(set); } diff --git a/tests/manual/chartviewer/charts/barseries/verticalpercentbarchart.cpp b/tests/manual/chartviewer/charts/barseries/verticalpercentbarchart.cpp index a86b4828..8f552f20 100644 --- a/tests/manual/chartviewer/charts/barseries/verticalpercentbarchart.cpp +++ b/tests/manual/chartviewer/charts/barseries/verticalpercentbarchart.cpp @@ -22,7 +22,7 @@ public: QPercentBarSeries *series = new QPercentBarSeries(chart); for (int i(0); i < table.count(); i++) { QBarSet *set = new QBarSet("Bar set " + QString::number(i)); - foreach (Data data, table[i]) + for (auto data : table[i]) *set << data.first.y(); series->append(set); } diff --git a/tests/manual/chartviewer/charts/barseries/verticalstackedbarchart.cpp b/tests/manual/chartviewer/charts/barseries/verticalstackedbarchart.cpp index 2d0edb1d..98144e83 100644 --- a/tests/manual/chartviewer/charts/barseries/verticalstackedbarchart.cpp +++ b/tests/manual/chartviewer/charts/barseries/verticalstackedbarchart.cpp @@ -22,7 +22,7 @@ public: QStackedBarSeries *series = new QStackedBarSeries(chart); for (int i(0); i < table.count(); i++) { QBarSet *set = new QBarSet("Bar set " + QString::number(i)); - foreach (Data data, table[i]) + for (auto data : table[i]) *set << data.first.y(); series->append(set); } diff --git a/tests/manual/chartviewer/charts/domain/barlogx.cpp b/tests/manual/chartviewer/charts/domain/barlogx.cpp index e0caa440..b372d053 100644 --- a/tests/manual/chartviewer/charts/domain/barlogx.cpp +++ b/tests/manual/chartviewer/charts/domain/barlogx.cpp @@ -29,7 +29,7 @@ public: QBarCategoryAxis *barcategory = new QBarCategoryAxis(); for (int i(0); i < table.count(); i++) { QBarSet *set = new QBarSet("Bar set " + QString::number(i)); - foreach (Data data, table[i]) + for (auto data : table[i]) *set << data.first.y(); series->append(set); } diff --git a/tests/manual/chartviewer/charts/domain/barlogy.cpp b/tests/manual/chartviewer/charts/domain/barlogy.cpp index 5f1a8042..f8e08730 100644 --- a/tests/manual/chartviewer/charts/domain/barlogy.cpp +++ b/tests/manual/chartviewer/charts/domain/barlogy.cpp @@ -29,7 +29,7 @@ public: QBarCategoryAxis *barcategory = new QBarCategoryAxis(); for (int i(0); i < table.count(); i++) { QBarSet *set = new QBarSet("Bar set " + QString::number(i)); - foreach (Data data, table[i]) + for (auto data : table[i]) *set << data.first.y(); series->append(set); } diff --git a/tests/manual/chartviewer/charts/domain/barpercentlogx.cpp b/tests/manual/chartviewer/charts/domain/barpercentlogx.cpp index 460c870f..052d2d9a 100644 --- a/tests/manual/chartviewer/charts/domain/barpercentlogx.cpp +++ b/tests/manual/chartviewer/charts/domain/barpercentlogx.cpp @@ -29,7 +29,7 @@ public: QBarCategoryAxis *barcategory = new QBarCategoryAxis(); for (int i(0); i < table.count(); i++) { QBarSet *set = new QBarSet("Bar set " + QString::number(i)); - foreach (Data data, table[i]) + for (auto data : table[i]) *set << data.first.y(); series->append(set); } diff --git a/tests/manual/chartviewer/charts/domain/barpercentlogy.cpp b/tests/manual/chartviewer/charts/domain/barpercentlogy.cpp index 6a0ba03e..13b1f8a6 100644 --- a/tests/manual/chartviewer/charts/domain/barpercentlogy.cpp +++ b/tests/manual/chartviewer/charts/domain/barpercentlogy.cpp @@ -29,7 +29,7 @@ public: QBarCategoryAxis *barcategory = new QBarCategoryAxis(); for (int i(0); i < table.count(); i++) { QBarSet *set = new QBarSet("Bar set " + QString::number(i)); - foreach (Data data, table[i]) + for (auto data : table[i]) *set << data.first.y(); series->append(set); } diff --git a/tests/manual/chartviewer/charts/domain/barstackedlogx.cpp b/tests/manual/chartviewer/charts/domain/barstackedlogx.cpp index 23356a3f..9155e754 100644 --- a/tests/manual/chartviewer/charts/domain/barstackedlogx.cpp +++ b/tests/manual/chartviewer/charts/domain/barstackedlogx.cpp @@ -29,7 +29,7 @@ public: QBarCategoryAxis *barcategory = new QBarCategoryAxis(); for (int i(0); i < table.count(); i++) { QBarSet *set = new QBarSet("Bar set " + QString::number(i)); - foreach (Data data, table[i]) + for (auto data : table[i]) *set << data.first.y(); series->append(set); } diff --git a/tests/manual/chartviewer/charts/domain/barstackedlogy.cpp b/tests/manual/chartviewer/charts/domain/barstackedlogy.cpp index 943c6c16..5d26eed7 100644 --- a/tests/manual/chartviewer/charts/domain/barstackedlogy.cpp +++ b/tests/manual/chartviewer/charts/domain/barstackedlogy.cpp @@ -29,7 +29,7 @@ public: QBarCategoryAxis *barcategory = new QBarCategoryAxis(); for (int i(0); i < table.count(); i++) { QBarSet *set = new QBarSet("Bar set " + QString::number(i)); - foreach (Data data, table[i]) + for (auto data : table[i]) *set << data.first.y(); series->append(set); } diff --git a/tests/manual/chartviewer/charts/domain/linelogxlogy.cpp b/tests/manual/chartviewer/charts/domain/linelogxlogy.cpp index ff98a3b4..510c06f8 100644 --- a/tests/manual/chartviewer/charts/domain/linelogxlogy.cpp +++ b/tests/manual/chartviewer/charts/domain/linelogxlogy.cpp @@ -22,9 +22,9 @@ public: QString name("Series "); int nameIndex = 0; - foreach (DataList list, table) { + for (auto list : table) { QLineSeries *series = new QLineSeries(chart); - foreach (Data data, list) + for (auto data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); nameIndex++; @@ -35,7 +35,7 @@ public: axisX->setBase(2); QLogValueAxis *axisY= new QLogValueAxis(); axisY->setBase(2); - foreach (QAbstractSeries *series, chart->series()) { + for (auto series : chart->series()) { chart->setAxisX(axisX, series); chart->setAxisY(axisY, series); } diff --git a/tests/manual/chartviewer/charts/domain/linelogxy.cpp b/tests/manual/chartviewer/charts/domain/linelogxy.cpp index 97dfc157..40ba4311 100644 --- a/tests/manual/chartviewer/charts/domain/linelogxy.cpp +++ b/tests/manual/chartviewer/charts/domain/linelogxy.cpp @@ -23,9 +23,9 @@ public: QString name("Series "); int nameIndex = 0; - foreach (DataList list, table) { + for (auto list : table) { QLineSeries *series = new QLineSeries(chart); - foreach (Data data, list) + for (auto data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); nameIndex++; @@ -35,7 +35,7 @@ public: QLogValueAxis *axisX= new QLogValueAxis(); axisX->setBase(2); QValueAxis *axisY= new QValueAxis(); - foreach (QAbstractSeries *series, chart->series()) { + for (auto series : chart->series()) { chart->setAxisX(axisX, series); chart->setAxisY(axisY, series); } diff --git a/tests/manual/chartviewer/charts/domain/linexlogy.cpp b/tests/manual/chartviewer/charts/domain/linexlogy.cpp index 8de238fc..435939a5 100644 --- a/tests/manual/chartviewer/charts/domain/linexlogy.cpp +++ b/tests/manual/chartviewer/charts/domain/linexlogy.cpp @@ -23,9 +23,9 @@ public: QString name("Series "); int nameIndex = 0; - foreach (DataList list, table) { + for (auto list : table) { QLineSeries *series = new QLineSeries(chart); - foreach (Data data, list) + for (auto data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); nameIndex++; @@ -35,7 +35,7 @@ public: QValueAxis *axisX= new QValueAxis(); QLogValueAxis *axisY= new QLogValueAxis(); axisY->setBase(2); - foreach (QAbstractSeries *series, chart->series()) { + for (auto series : chart->series()) { chart->setAxisX(axisX, series); chart->setAxisY(axisY, series); } diff --git a/tests/manual/chartviewer/charts/domain/scatterlogxlogy.cpp b/tests/manual/chartviewer/charts/domain/scatterlogxlogy.cpp index bbb425e2..b366147d 100644 --- a/tests/manual/chartviewer/charts/domain/scatterlogxlogy.cpp +++ b/tests/manual/chartviewer/charts/domain/scatterlogxlogy.cpp @@ -22,9 +22,9 @@ public: QString name("Series "); int nameIndex = 0; - foreach (DataList list, table) { + for (auto list : table) { QScatterSeries *series = new QScatterSeries(chart); - foreach (Data data, list) + for (auto data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); nameIndex++; @@ -35,7 +35,7 @@ public: axisX->setBase(2); QLogValueAxis *axisY= new QLogValueAxis(); axisY->setBase(2); - foreach (QAbstractSeries *series, chart->series()) { + for (auto series : chart->series()) { chart->setAxisX(axisX, series); chart->setAxisY(axisY, series); } diff --git a/tests/manual/chartviewer/charts/domain/scatterlogxy.cpp b/tests/manual/chartviewer/charts/domain/scatterlogxy.cpp index b56c897b..e2421188 100644 --- a/tests/manual/chartviewer/charts/domain/scatterlogxy.cpp +++ b/tests/manual/chartviewer/charts/domain/scatterlogxy.cpp @@ -23,9 +23,9 @@ public: QString name("Series "); int nameIndex = 0; - foreach (DataList list, table) { + for (auto list : table) { QScatterSeries *series = new QScatterSeries(chart); - foreach (Data data, list) + for (auto data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); nameIndex++; @@ -35,7 +35,7 @@ public: QLogValueAxis *axisX= new QLogValueAxis(); axisX->setBase(2); QValueAxis *axisY= new QValueAxis(); - foreach (QAbstractSeries *series, chart->series()) { + for (auto series : chart->series()) { chart->setAxisX(axisX, series); chart->setAxisY(axisY, series); } diff --git a/tests/manual/chartviewer/charts/domain/scatterxlogy.cpp b/tests/manual/chartviewer/charts/domain/scatterxlogy.cpp index eca9a295..37dbe346 100644 --- a/tests/manual/chartviewer/charts/domain/scatterxlogy.cpp +++ b/tests/manual/chartviewer/charts/domain/scatterxlogy.cpp @@ -23,9 +23,9 @@ public: QString name("Series "); int nameIndex = 0; - foreach (DataList list, table) { + for (auto list : table) { QScatterSeries *series = new QScatterSeries(chart); - foreach (Data data, list) + for (auto data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); nameIndex++; @@ -35,7 +35,7 @@ public: QValueAxis *axisX= new QValueAxis(); QLogValueAxis *axisY= new QLogValueAxis(); axisY->setBase(2); - foreach (QAbstractSeries *series, chart->series()) { + for (auto series : chart->series()) { chart->setAxisX(axisX, series); chart->setAxisY(axisY, series); } diff --git a/tests/manual/chartviewer/charts/domain/splinelogxlogy.cpp b/tests/manual/chartviewer/charts/domain/splinelogxlogy.cpp index 311a4ad7..05fc06e4 100644 --- a/tests/manual/chartviewer/charts/domain/splinelogxlogy.cpp +++ b/tests/manual/chartviewer/charts/domain/splinelogxlogy.cpp @@ -22,9 +22,9 @@ public: QString name("Series "); int nameIndex = 0; - foreach (DataList list, table) { + for (auto list : table) { QSplineSeries *series = new QSplineSeries(chart); - foreach (Data data, list) + for (auto data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); nameIndex++; @@ -35,7 +35,7 @@ public: axisX->setBase(2); QLogValueAxis *axisY= new QLogValueAxis(); axisY->setBase(2); - foreach (QAbstractSeries *series, chart->series()) { + for (auto series : chart->series()) { chart->setAxisX(axisX, series); chart->setAxisY(axisY, series); } diff --git a/tests/manual/chartviewer/charts/domain/splinelogxy.cpp b/tests/manual/chartviewer/charts/domain/splinelogxy.cpp index 656fb904..dddd39b5 100644 --- a/tests/manual/chartviewer/charts/domain/splinelogxy.cpp +++ b/tests/manual/chartviewer/charts/domain/splinelogxy.cpp @@ -23,9 +23,9 @@ public: QString name("Series "); int nameIndex = 0; - foreach (DataList list, table) { + for (auto list : table) { QSplineSeries *series = new QSplineSeries(chart); - foreach (Data data, list) + for (auto data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); nameIndex++; @@ -35,7 +35,7 @@ public: QLogValueAxis *axisX= new QLogValueAxis(); axisX->setBase(2); QValueAxis *axisY= new QValueAxis(); - foreach (QAbstractSeries *series, chart->series()) { + for (auto series : chart->series()) { chart->setAxisX(axisX, series); chart->setAxisY(axisY, series); } diff --git a/tests/manual/chartviewer/charts/domain/splinexlogy.cpp b/tests/manual/chartviewer/charts/domain/splinexlogy.cpp index 7bfd2714..4dbbe89e 100644 --- a/tests/manual/chartviewer/charts/domain/splinexlogy.cpp +++ b/tests/manual/chartviewer/charts/domain/splinexlogy.cpp @@ -23,9 +23,9 @@ public: QString name("Series "); int nameIndex = 0; - foreach (DataList list, table) { + for (auto list : table) { QSplineSeries *series = new QSplineSeries(chart); - foreach (Data data, list) + for (auto data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); nameIndex++; @@ -35,7 +35,7 @@ public: QValueAxis *axisX= new QValueAxis(); QLogValueAxis *axisY= new QLogValueAxis(); axisY->setBase(2); - foreach (QAbstractSeries *series, chart->series()) { + for (auto series : chart->series()) { chart->setAxisX(axisX, series); chart->setAxisY(axisY, series); } diff --git a/tests/manual/chartviewer/charts/font/font.cpp b/tests/manual/chartviewer/charts/font/font.cpp index 555228c7..eb5719c1 100644 --- a/tests/manual/chartviewer/charts/font/font.cpp +++ b/tests/manual/chartviewer/charts/font/font.cpp @@ -21,9 +21,9 @@ public: chart->setTitle("Font size " + QString::number(m_fontSize)); QString name("Series "); int nameIndex = 0; - foreach (DataList list, table) { + for (auto list : table) { QLineSeries *series = new QLineSeries(chart); - foreach (Data data, list) + for (auto data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); nameIndex++; diff --git a/tests/manual/chartviewer/charts/multiaxis/multivalueaxis.cpp b/tests/manual/chartviewer/charts/multiaxis/multivalueaxis.cpp index 195191df..88cc3df0 100644 --- a/tests/manual/chartviewer/charts/multiaxis/multivalueaxis.cpp +++ b/tests/manual/chartviewer/charts/multiaxis/multivalueaxis.cpp @@ -35,9 +35,9 @@ public: QString name("Series"); int nameIndex = 0; - foreach (DataList list, table) { + for (auto list : table) { QLineSeries *series = new QLineSeries(chart); - foreach (Data data, list) + for (auto data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); diff --git a/tests/manual/chartviewer/charts/multiaxis/multivalueaxis2.cpp b/tests/manual/chartviewer/charts/multiaxis/multivalueaxis2.cpp index 76a7d583..40b39997 100644 --- a/tests/manual/chartviewer/charts/multiaxis/multivalueaxis2.cpp +++ b/tests/manual/chartviewer/charts/multiaxis/multivalueaxis2.cpp @@ -35,9 +35,9 @@ public: QString name("Series"); int nameIndex = 1; - foreach (DataList list, table) { + for (auto list : table) { QLineSeries *series = new QLineSeries(chart); - foreach (Data data, list) + for (auto data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); diff --git a/tests/manual/chartviewer/charts/multiaxis/multivalueaxis3.cpp b/tests/manual/chartviewer/charts/multiaxis/multivalueaxis3.cpp index 310f5dc5..3120cc12 100644 --- a/tests/manual/chartviewer/charts/multiaxis/multivalueaxis3.cpp +++ b/tests/manual/chartviewer/charts/multiaxis/multivalueaxis3.cpp @@ -35,9 +35,9 @@ public: QString name("Series"); int nameIndex = 0; - foreach (DataList list, table) { + for (auto list : table) { QLineSeries *series = new QLineSeries(chart); - foreach (Data data, list) + for (auto data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); diff --git a/tests/manual/chartviewer/charts/multiaxis/multivalueaxis4.cpp b/tests/manual/chartviewer/charts/multiaxis/multivalueaxis4.cpp index a68257d9..db4db918 100644 --- a/tests/manual/chartviewer/charts/multiaxis/multivalueaxis4.cpp +++ b/tests/manual/chartviewer/charts/multiaxis/multivalueaxis4.cpp @@ -35,9 +35,9 @@ public: QString name("Series"); int nameIndex = 1; - foreach (DataList list, table) { + for (auto list : table) { QLineSeries *series = new QLineSeries(chart); - foreach (Data data, list) + for (auto data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); diff --git a/tests/manual/chartviewer/charts/multiaxis/multivaluebaraxis.cpp b/tests/manual/chartviewer/charts/multiaxis/multivaluebaraxis.cpp index e0a4ce5b..cba943cb 100644 --- a/tests/manual/chartviewer/charts/multiaxis/multivaluebaraxis.cpp +++ b/tests/manual/chartviewer/charts/multiaxis/multivaluebaraxis.cpp @@ -42,7 +42,7 @@ public: int nameIndex = 1; for (int i(0); i < 2; i++) { QLineSeries *series = new QLineSeries(chart); - foreach (Data data, table.at(i)) + for (auto data : table.at(i)) series->append(data.first); series->setName(name + QString::number(nameIndex)); @@ -63,7 +63,7 @@ public: } QBarSet *set = new QBarSet("Bar set "); - foreach (Data data, table.at(2)) + for (auto data : table.at(2)) *set << data.first.y(); int count = set->count(); diff --git a/tests/manual/chartviewer/charts/pieseries/donutchart.cpp b/tests/manual/chartviewer/charts/pieseries/donutchart.cpp index 6d546fce..052f3a3c 100644 --- a/tests/manual/chartviewer/charts/pieseries/donutchart.cpp +++ b/tests/manual/chartviewer/charts/pieseries/donutchart.cpp @@ -20,7 +20,7 @@ public: chart->setTitle("Donut chart"); for (int i = 0, j = table.count(); i < table.count(); i++, j--) { QPieSeries *series = new QPieSeries(chart); - foreach (Data data, table[i]) { + for (auto data : table[i]) { QPieSlice *slice = series->append(data.second, data.first.y()); if (data == table[i].first()) slice->setLabelVisible(); diff --git a/tests/manual/chartviewer/charts/pieseries/piechart.cpp b/tests/manual/chartviewer/charts/pieseries/piechart.cpp index 143b3a69..3f9a3164 100644 --- a/tests/manual/chartviewer/charts/pieseries/piechart.cpp +++ b/tests/manual/chartviewer/charts/pieseries/piechart.cpp @@ -21,7 +21,7 @@ public: qreal pieSize = 1.0 / table.count(); for (int i = 0; i < table.count(); i++) { QPieSeries *series = new QPieSeries(chart); - foreach (Data data, table[i]) { + for (auto data : table[i]) { QPieSlice *slice = series->append(data.second, data.first.y()); if (data == table[i].first()) { slice->setLabelVisible(); diff --git a/tests/manual/chartviewer/charts/size/sizecharts.cpp b/tests/manual/chartviewer/charts/size/sizecharts.cpp index e18d90a0..e4a118b2 100644 --- a/tests/manual/chartviewer/charts/size/sizecharts.cpp +++ b/tests/manual/chartviewer/charts/size/sizecharts.cpp @@ -21,9 +21,9 @@ public: QChart *chart = new QChart(); QString name("Series"); int nameIndex = 0; - foreach (DataList list, table) { + for (auto list : table) { QLineSeries *series = new QLineSeries(chart); - foreach (Data data, list) + for (auto data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); nameIndex++; diff --git a/tests/manual/chartviewer/charts/xyseries/linechart.cpp b/tests/manual/chartviewer/charts/xyseries/linechart.cpp index 4ef97dca..4072c5a8 100644 --- a/tests/manual/chartviewer/charts/xyseries/linechart.cpp +++ b/tests/manual/chartviewer/charts/xyseries/linechart.cpp @@ -20,9 +20,9 @@ public: chart->setTitle("Line chart"); QString name("Series "); int nameIndex = 0; - foreach (DataList list, table) { + for (auto list : table) { QLineSeries *series = new QLineSeries(chart); - foreach (Data data, list) + for (auto data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); nameIndex++; diff --git a/tests/manual/chartviewer/charts/xyseries/scatterchart.cpp b/tests/manual/chartviewer/charts/xyseries/scatterchart.cpp index 2328c6c9..4153f627 100644 --- a/tests/manual/chartviewer/charts/xyseries/scatterchart.cpp +++ b/tests/manual/chartviewer/charts/xyseries/scatterchart.cpp @@ -20,9 +20,9 @@ public: chart->setTitle("Scatter chart"); QString name("Series "); int nameIndex = 0; - foreach (DataList list, table) { + for (auto list : table) { QScatterSeries *series = new QScatterSeries(chart); - foreach (Data data, list) + for (auto data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); nameIndex++; diff --git a/tests/manual/chartviewer/charts/xyseries/splinechart.cpp b/tests/manual/chartviewer/charts/xyseries/splinechart.cpp index b4711215..3b6fad36 100644 --- a/tests/manual/chartviewer/charts/xyseries/splinechart.cpp +++ b/tests/manual/chartviewer/charts/xyseries/splinechart.cpp @@ -20,9 +20,9 @@ public: chart->setTitle("Spline chart"); QString name("Series "); int nameIndex = 0; - foreach (DataList list, table) { + for (auto list : table) { QSplineSeries *series = new QSplineSeries(chart); - foreach (Data data, list) + for (auto data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); nameIndex++; diff --git a/tests/manual/chartviewer/grid.cpp b/tests/manual/chartviewer/grid.cpp index 6297aa20..6f3b6954 100644 --- a/tests/manual/chartviewer/grid.cpp +++ b/tests/manual/chartviewer/grid.cpp @@ -200,7 +200,7 @@ void Grid::mousePressEvent(QGraphicsSceneMouseEvent *event) m_origin = event->pos(); m_currentState = NoState; - foreach (QChart *chart, charts()) { + for (auto chart : charts()) { QRectF geometryRect = chart->geometry(); QRectF plotArea = chart->plotArea(); plotArea.translate(geometryRect.topLeft()); @@ -227,8 +227,7 @@ void Grid::mousePressEvent(QGraphicsSceneMouseEvent *event) void Grid::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { if (m_currentState != NoState) { - - foreach (QChart *chart, charts()) { + for (auto chart : charts()) { QRectF geometryRect = chart->geometry(); QRectF plotArea = chart->plotArea(); plotArea.translate(geometryRect.topLeft()); @@ -254,7 +253,7 @@ void Grid::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) if (m_currentState == ZoomState) { m_rubberBand->setVisible(false); - foreach (QChart *chart, charts()) { + for (auto chart : charts()) { QRectF geometryRect = chart->geometry(); QRectF plotArea = chart->plotArea(); plotArea.translate(geometryRect.topLeft()); @@ -272,7 +271,7 @@ void Grid::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) if (event->button() == Qt::RightButton) { if (m_currentState == ZoomState) { - foreach (QChart *chart, charts()) { + for (auto chart : charts()) { QRectF geometryRect = chart->geometry(); QRectF plotArea = chart->plotArea(); plotArea.translate(geometryRect.topLeft()); diff --git a/tests/manual/chartviewer/window.cpp b/tests/manual/chartviewer/window.cpp index 9cb49d32..e89029b2 100644 --- a/tests/manual/chartviewer/window.cpp +++ b/tests/manual/chartviewer/window.cpp @@ -230,10 +230,10 @@ QComboBox *Window::createTempleteBox() Charts::ChartList list = Charts::chartList(); QMultiMap<QString, Chart *> categoryMap; - foreach (Chart *chart, list) + for (auto chart : list) categoryMap.insert(chart->category(), chart); - foreach (const QString &category, categoryMap.uniqueKeys()) + for (const QString &category : categoryMap.uniqueKeys()) templateComboBox->addItem(category, category); return templateComboBox; @@ -332,7 +332,7 @@ void Window::checkView() void Window::checkXTick() { - foreach (QChart *chart, m_grid->charts()) { + for (auto chart : m_grid->charts()) { if (qobject_cast<QValueAxis *>(chart->axisX())) { QValueAxis *valueAxis = qobject_cast<QValueAxis *>(chart->axisX()); valueAxis->setGridLineVisible(m_gridCheckBox->isChecked()); @@ -343,7 +343,7 @@ void Window::checkXTick() void Window::checkYTick() { - foreach (QChart *chart, m_grid->charts()) { + for (auto chart : m_grid->charts()) { if (qobject_cast<QValueAxis *>(chart->axisY())) { QValueAxis *valueAxis = qobject_cast<QValueAxis *>(chart->axisY()); valueAxis->setGridLineVisible(m_gridCheckBox->isChecked()); @@ -354,7 +354,7 @@ void Window::checkYTick() void Window::checkMinorXTick() { - foreach (QChart *chart, m_grid->charts()) { + for (auto chart : m_grid->charts()) { if (qobject_cast<QValueAxis *>(chart->axisX())) { QValueAxis *valueAxis = qobject_cast<QValueAxis *>(chart->axisX()); valueAxis->setMinorGridLineVisible(m_gridCheckBox->isChecked()); @@ -366,7 +366,7 @@ void Window::checkMinorXTick() void Window::checkMinorYTick() { - foreach (QChart *chart, m_grid->charts()) { + for (auto chart : m_grid->charts()) { if (qobject_cast<QValueAxis *>(chart->axisY())) { QValueAxis *valueAxis = qobject_cast<QValueAxis *>(chart->axisY()); valueAxis->setMinorGridLineVisible(m_gridCheckBox->isChecked()); @@ -381,10 +381,10 @@ void Window::checkLegend() Qt::Alignment alignment(m_legendComboBox->itemData(m_legendComboBox->currentIndex()).toInt()); if (!alignment) { - foreach (QChart *chart, m_grid->charts()) + for (auto chart : m_grid->charts()) chart->legend()->hide(); } else { - foreach (QChart *chart, m_grid->charts()) { + for (auto chart : m_grid->charts()) { chart->legend()->setAlignment(alignment); chart->legend()->show(); } @@ -415,7 +415,7 @@ void Window::checkAnimationOptions() QList<QChart *> charts = m_grid->charts(); if (!charts.isEmpty() && charts.at(0)->animationOptions() != options) { - foreach (QChart *chart, charts) + for (auto chart : std::as_const(charts)) chart->setAnimationOptions(options); } } @@ -458,7 +458,7 @@ void Window::checkTheme() QChart::ChartTheme theme = (QChart::ChartTheme) m_themeComboBox->itemData( m_themeComboBox->currentIndex()).toInt(); - foreach (QChart *chart, m_grid->charts()) + for (auto chart : m_grid->charts()) chart->setTheme(theme); QPalette pal = window()->palette(); @@ -490,7 +490,7 @@ void Window::checkTheme() pal.setColor(QPalette::Window, QRgb(0xf0f0f0)); pal.setColor(QPalette::WindowText, QRgb(0x404044)); } - foreach (QGraphicsProxyWidget *widget, m_widgetHash) + for (auto widget : std::as_const(m_widgetHash)) widget->setPalette(pal); m_view->setBackgroundBrush(pal.color((QPalette::Window))); m_grid->setRubberPen(pal.color((QPalette::WindowText))); @@ -498,7 +498,7 @@ void Window::checkTheme() void Window::comboBoxFocused(QComboBox *combobox) { - foreach (QGraphicsProxyWidget *widget , m_widgetHash) { + for (auto widget : std::as_const(m_widgetHash)) { if (widget->widget() == combobox) widget->setZValue(2.0); else @@ -527,10 +527,10 @@ QMenu *Window::createMenu() QMenu *result = new QMenu(this); - foreach (Chart *chart, list) + for (auto chart : list) categoryMap.insert(chart->category(), chart); - foreach (const QString &category, categoryMap.uniqueKeys()) { + for (const QString &category : categoryMap.uniqueKeys()) { QMenu *menu(0); QMultiMap<QString, Chart *> subCategoryMap; if (category.isEmpty()) { @@ -540,10 +540,10 @@ QMenu *Window::createMenu() result->addMenu(menu); } - foreach (Chart *chart, categoryMap.values(category)) + for (auto chart : categoryMap.values(category)) subCategoryMap.insert(chart->subCategory(), chart); - foreach (const QString &subCategory, subCategoryMap.uniqueKeys()) { + for (const QString &subCategory : subCategoryMap.uniqueKeys()) { QMenu *subMenu(0); if (subCategory.isEmpty()) { subMenu = menu; @@ -552,7 +552,7 @@ QMenu *Window::createMenu() menu->addMenu(subMenu); } - foreach (Chart *chart, subCategoryMap.values(subCategory)) { + for (auto chart : subCategoryMap.values(subCategory)) { createMenuAction(subMenu, QIcon(), chart->name(), QVariant::fromValue(static_cast<void *>(chart))); } diff --git a/tests/manual/openglseriestest/mainwindow.cpp b/tests/manual/openglseriestest/mainwindow.cpp index 54e63eb7..c3a834e5 100644 --- a/tests/manual/openglseriestest/mainwindow.cpp +++ b/tests/manual/openglseriestest/mainwindow.cpp @@ -144,7 +144,7 @@ void MainWindow::setXAxis(MainWindow::AxisMode mode) m_chart->addAxis(m_xAxis, Qt::AlignBottom); - foreach (QAbstractSeries *series, m_seriesList) + for (auto series : std::as_const(m_seriesList)) series->attachAxis(m_xAxis); applyRanges(); @@ -183,7 +183,7 @@ void MainWindow::setYAxis(MainWindow::AxisMode mode) m_chart->addAxis(m_yAxis, Qt::AlignLeft); - foreach (QAbstractSeries *series, m_seriesList) + for (auto series : std::as_const(m_seriesList)) series->attachAxis(m_yAxis); applyRanges(); @@ -374,7 +374,7 @@ void MainWindow::countIndexChanged(int index) void MainWindow::colorIndexChanged(int index) { QColor color = QColor(ui->colorsComboBox->itemText(index).toLower()); - foreach (QXYSeries *series, m_seriesList) { + for (auto series : std::as_const(m_seriesList)) { if (series->type() == QAbstractSeries::SeriesTypeScatter) { QScatterSeries *scatterSeries = static_cast<QScatterSeries *>(series); scatterSeries->setBorderColor(color); @@ -388,7 +388,7 @@ void MainWindow::colorIndexChanged(int index) void MainWindow::widthIndexChanged(int index) { int width = ui->widthComboBox->itemText(index).toInt(); - foreach (QXYSeries *series, m_seriesList) { + for (auto series : std::as_const(m_seriesList)) { if (series->type() == QAbstractSeries::SeriesTypeScatter) { QScatterSeries *scatterSeries = static_cast<QScatterSeries *>(series); scatterSeries->setMarkerSize(width); |