Use range-for instead of foreach in examples

Task-number: QTBUG-60662
Change-Id: Ief9264e2b6670466bd74278dbd194a7be81d614f
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

13 files changed, 58 insertions, 53 deletions

diff --git a/examples/charts/barmodelmapper/customtablemodel.cpp b/examples/charts/barmodelmapper/customtablemodel.cpp
index 23b5271c..a1446386 100644
--- a/examples/charts/barmodelmapper/customtablemodel.cpp
+++ b/examples/charts/barmodelmapper/customtablemodel.cpp
@@ -89,10 +89,10 @@ QVariant CustomTableModel::data(const QModelIndex &index, int role) const
     } else if (role == Qt::EditRole) {
         return m_data[index.row()]->at(index.column());
     } 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 (const QRect &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/examples/charts/callout/view.cpp b/examples/charts/callout/view.cpp
index bdec4e67..5936befd 100644
--- a/examples/charts/callout/view.cpp
+++ b/examples/charts/callout/view.cpp
@@ -98,7 +98,8 @@ void View::resizeEvent(QResizeEvent *event)
          m_chart->resize(event->size());
          m_coordX->setPos(m_chart->size().width()/2 - 50, m_chart->size().height() - 20);
          m_coordY->setPos(m_chart->size().width()/2 + 50, m_chart->size().height() - 20);
-         foreach (Callout *callout, m_callouts)
+         const auto callouts = m_callouts;
+         for (Callout *callout : callouts)
              callout->updateGeometry();
     }
     QGraphicsView::resizeEvent(event);
diff --git a/examples/charts/chartinteractions/chart.cpp b/examples/charts/chartinteractions/chart.cpp
index a178dffc..ca63a3de 100644
--- a/examples/charts/chartinteractions/chart.cpp
+++ b/examples/charts/chartinteractions/chart.cpp
@@ -44,10 +44,11 @@ Chart::~Chart()
 
 void Chart::clickPoint(const QPointF &point)
 {
-    // Find the closes data point
+    // Find the closest data point
     m_movingPoint = QPoint();
     m_clicked = false;
-    foreach (QPointF p, m_series->points()) {
+    const auto points = m_series->points();
+    for (QPointF p : points) {
         if (distance(p, point) < distance(m_movingPoint, point)) {
             m_movingPoint = p;
             m_clicked = true;
diff --git a/examples/charts/chartthemes/themewidget.cpp b/examples/charts/chartthemes/themewidget.cpp
index 32779bb9..982c50e0 100644
--- a/examples/charts/chartthemes/themewidget.cpp
+++ b/examples/charts/chartthemes/themewidget.cpp
@@ -233,7 +233,7 @@ QChart *ThemeWidget::createBarChart(int valueCount) const
     QStackedBarSeries *series = new QStackedBarSeries(chart);
     for (int i(0); i < m_dataTable.count(); i++) {
         QBarSet *set = new QBarSet("Bar set " + QString::number(i));
-        foreach (Data data, m_dataTable[i])
+        for (const Data &data : m_dataTable[i])
             *set << data.first.y();
         series->append(set);
     }
@@ -250,9 +250,9 @@ QChart *ThemeWidget::createLineChart() const
 
     QString name("Series ");
     int nameIndex = 0;
-    foreach (DataList list, m_dataTable) {
+    for (const DataList &list : m_dataTable) {
         QLineSeries *series = new QLineSeries(chart);
-        foreach (Data data, list)
+        for (const Data &data : list)
             series->append(data.first);
         series->setName(name + QString::number(nameIndex));
         nameIndex++;
@@ -271,7 +271,7 @@ QChart *ThemeWidget::createPieChart() const
     qreal pieSize = 1.0 / m_dataTable.count();
     for (int i = 0; i < m_dataTable.count(); i++) {
         QPieSeries *series = new QPieSeries(chart);
-        foreach (Data data, m_dataTable[i]) {
+        for (const Data &data : m_dataTable[i]) {
             QPieSlice *slice = series->append(data.second, data.first.y());
             if (data == m_dataTable[i].first()) {
                 slice->setLabelVisible();
@@ -295,9 +295,9 @@ QChart *ThemeWidget::createSplineChart() const
     chart->setTitle("Spline chart");
     QString name("Series ");
     int nameIndex = 0;
-    foreach (DataList list, m_dataTable) {
+    for (const DataList &list : m_dataTable) {
         QSplineSeries *series = new QSplineSeries(chart);
-        foreach (Data data, list)
+        for (const Data &data : list)
             series->append(data.first);
         series->setName(name + QString::number(nameIndex));
         nameIndex++;
@@ -314,9 +314,9 @@ QChart *ThemeWidget::createScatterChart() const
     chart->setTitle("Scatter chart");
     QString name("Series ");
     int nameIndex = 0;
-    foreach (DataList list, m_dataTable) {
+    for (const DataList &list : m_dataTable) {
         QScatterSeries *series = new QScatterSeries(chart);
-        foreach (Data data, list)
+        for (const Data &data : list)
             series->append(data.first);
         series->setName(name + QString::number(nameIndex));
         nameIndex++;
@@ -331,8 +331,9 @@ void ThemeWidget::updateUI()
     QChart::ChartTheme theme = static_cast<QChart::ChartTheme>(
                 m_themeComboBox->itemData(m_themeComboBox->currentIndex()).toInt());
 
+    const auto charts = m_charts;
     if (m_charts.at(0)->chart()->theme() != theme) {
-        foreach (QChartView *chartView, m_charts)
+        for (QChartView *chartView : charts)
             chartView->chart()->setTheme(theme);
 
         QPalette pal = window()->palette();
@@ -365,23 +366,23 @@ void ThemeWidget::updateUI()
     }
 
     bool checked = m_antialiasCheckBox->isChecked();
-    foreach (QChartView *chart, m_charts)
+    for (QChartView *chart : charts)
         chart->setRenderHint(QPainter::Antialiasing, checked);
 
     QChart::AnimationOptions options(
                 m_animatedComboBox->itemData(m_animatedComboBox->currentIndex()).toInt());
     if (m_charts.at(0)->chart()->animationOptions() != options) {
-        foreach (QChartView *chartView, m_charts)
+        for (QChartView *chartView : charts)
             chartView->chart()->setAnimationOptions(options);
     }
 
     Qt::Alignment alignment(m_legendComboBox->itemData(m_legendComboBox->currentIndex()).toInt());
 
     if (!alignment) {
-        foreach (QChartView *chartView, m_charts)
+        for (QChartView *chartView : charts)
             chartView->chart()->legend()->hide();
     } else {
-        foreach (QChartView *chartView, m_charts) {
+        for (QChartView *chartView : charts) {
             chartView->chart()->legend()->setAlignment(alignment);
             chartView->chart()->legend()->show();
         }
diff --git a/examples/charts/donutbreakdown/donutbreakdownchart.cpp b/examples/charts/donutbreakdown/donutbreakdownchart.cpp
index cf04edeb..9bf7f71a 100644
--- a/examples/charts/donutbreakdown/donutbreakdownchart.cpp
+++ b/examples/charts/donutbreakdown/donutbreakdownchart.cpp
@@ -66,7 +66,8 @@ void DonutBreakdownChart::addBreakdownSeries(QPieSeries *breakdownSeries, QColor
     breakdownSeries->setPieSize(0.8);
     breakdownSeries->setHoleSize(0.7);
     breakdownSeries->setLabelsVisible();
-    foreach (QPieSlice *slice, breakdownSeries->slices()) {
+    const auto slices = breakdownSeries->slices();
+    for (QPieSlice *slice : slices) {
         color = color.lighter(115);
         slice->setBrush(color);
         slice->setLabelFont(font);
@@ -87,7 +88,8 @@ void DonutBreakdownChart::addBreakdownSeries(QPieSeries *breakdownSeries, QColor
 void DonutBreakdownChart::recalculateAngles()
 {
     qreal angle = 0;
-    foreach (QPieSlice *slice, m_mainSeries->slices()) {
+    const auto slices = m_mainSeries->slices();
+    for (QPieSlice *slice : slices) {
         QPieSeries *breakdownSeries = qobject_cast<MainSlice *>(slice)->breakdownSeries();
         breakdownSeries->setPieStartAngle(angle);
         angle += slice->percentage() * 360.0; // full pie is 360.0
@@ -100,8 +102,10 @@ void DonutBreakdownChart::recalculateAngles()
 void DonutBreakdownChart::updateLegendMarkers()
 {
     // go through all markers
-    foreach (QAbstractSeries *series, series()) {
-        foreach (QLegendMarker *marker, legend()->markers(series)) {
+    const auto allseries = series();
+    for (QAbstractSeries *series : allseries) {
+        const auto markers = legend()->markers(series);
+        for (QLegendMarker *marker : markers) {
             QPieLegendMarker *pieMarker = qobject_cast<QPieLegendMarker *>(marker);
             if (series == m_mainSeries) {
                 // hide markers from main series
diff --git a/examples/charts/legendmarkers/mainwidget.cpp b/examples/charts/legendmarkers/mainwidget.cpp
index 4222b960..46b2b275 100644
--- a/examples/charts/legendmarkers/mainwidget.cpp
+++ b/examples/charts/legendmarkers/mainwidget.cpp
@@ -107,7 +107,8 @@ void MainWidget::connectMarkers()
 {
 //![1]
     // Connect all markers to handler
-    foreach (QLegendMarker* marker, m_chart->legend()->markers()) {
+    const auto markers = m_chart->legend()->markers();
+    for (QLegendMarker *marker : markers) {
         // Disconnect possible existing connection to avoid multiple connections
         QObject::disconnect(marker, &QLegendMarker::clicked,
                             this, &MainWidget::handleMarkerClicked);
@@ -119,7 +120,8 @@ void MainWidget::connectMarkers()
 void MainWidget::disconnectMarkers()
 {
 //![2]
-    foreach (QLegendMarker* marker, m_chart->legend()->markers()) {
+    const auto markers = m_chart->legend()->markers();
+    for (QLegendMarker *marker : markers) {
         QObject::disconnect(marker, &QLegendMarker::clicked,
                             this, &MainWidget::handleMarkerClicked);
     }
diff --git a/examples/charts/modeldata/customtablemodel.cpp b/examples/charts/modeldata/customtablemodel.cpp
index 1bc607be..f86c7ed7 100644
--- a/examples/charts/modeldata/customtablemodel.cpp
+++ b/examples/charts/modeldata/customtablemodel.cpp
@@ -88,7 +88,7 @@ QVariant CustomTableModel::data(const QModelIndex &index, int role) const
     } else if (role == Qt::EditRole) {
         return m_data[index.row()]->at(index.column());
     } else if (role == Qt::BackgroundRole) {
-        foreach (QRect rect, m_mapping) {
+        for (const QRect &rect : m_mapping) {
             if (rect.contains(index.column(), index.row()))
                 return QColor(m_mapping.key(rect));
         }
diff --git a/examples/charts/openglseries/datasource.cpp b/examples/charts/openglseries/datasource.cpp
index 3f8ae9a3..5f554500 100644
--- a/examples/charts/openglseries/datasource.cpp
+++ b/examples/charts/openglseries/datasource.cpp
@@ -95,12 +95,6 @@ void DataSource::startUpdates(const QList<QXYSeries *> &seriesList, QLabel *fpsL
 
 void DataSource::generateData(int seriesCount, int rowCount, int colCount)
 {
-    // Remove previous data
-    foreach (QVector<QVector<QPointF> > seriesData, m_data) {
-        foreach (QVector<QPointF> row, seriesData)
-            row.clear();
-    }
-
     m_data.clear();
 
     qreal xAdjustment = 20.0 / (colCount * rowCount);
diff --git a/examples/charts/piechartdrilldown/main.cpp b/examples/charts/piechartdrilldown/main.cpp
index 3fd6ad65..8deeb0c3 100644
--- a/examples/charts/piechartdrilldown/main.cpp
+++ b/examples/charts/piechartdrilldown/main.cpp
@@ -62,11 +62,11 @@ int main(int argc, char *argv[])
         "Jane", "John", "Axel", "Mary", "Susan", "Bob"
     };
 
-    foreach (QString name, names) {
+    for (const QString &name : names) {
         QPieSeries *series = new QPieSeries(&window);
         series->setName("Sales by month - " + name);
 
-        foreach (QString month, months)
+        for (const QString &month : months)
             *series << new DrilldownSlice(qrand() % 1000, month, yearSeries);
 
         QObject::connect(series, &QPieSeries::clicked, chart, &DrilldownChart::handleSliceClicked);
diff --git a/examples/charts/polarchart/chartview.cpp b/examples/charts/polarchart/chartview.cpp
index 0a3ff9ad..1dc5cc00 100644
--- a/examples/charts/polarchart/chartview.cpp
+++ b/examples/charts/polarchart/chartview.cpp
@@ -84,31 +84,31 @@ void ChartView::switchChartType()
         newChart = new QChart();
 
     // Move series and axes from old chart to new one
-    QList<QAbstractSeries *> seriesList = oldChart->series();
-    QList<QAbstractAxis *> axisList = oldChart->axes();
+    const QList<QAbstractSeries *> seriesList = oldChart->series();
+    const QList<QAbstractAxis *> axisList = oldChart->axes();
     QList<QPair<qreal, qreal> > axisRanges;
 
-    foreach (QAbstractAxis *axis, axisList) {
+    for (QAbstractAxis *axis : axisList) {
         QValueAxis *valueAxis = static_cast<QValueAxis *>(axis);
         axisRanges.append(QPair<qreal, qreal>(valueAxis->min(), valueAxis->max()));
     }
 
-    foreach (QAbstractSeries *series, seriesList)
+    for (QAbstractSeries *series : seriesList)
         oldChart->removeSeries(series);
 
-    foreach (QAbstractAxis *axis, axisList) {
+    for (QAbstractAxis *axis : axisList) {
         oldChart->removeAxis(axis);
         newChart->addAxis(axis, axis->alignment());
     }
 
-    foreach (QAbstractSeries *series, seriesList) {
+    for (QAbstractSeries *series : seriesList) {
         newChart->addSeries(series);
-        foreach (QAbstractAxis *axis, axisList)
+        for (QAbstractAxis *axis : axisList)
             series->attachAxis(axis);
     }
 
     int count = 0;
-    foreach (QAbstractAxis *axis, axisList) {
+    for (QAbstractAxis *axis : axisList) {
         axis->setRange(axisRanges[count].first, axisRanges[count].second);
         count++;
     }
diff --git a/examples/charts/qmloscilloscope/datasource.cpp b/examples/charts/qmloscilloscope/datasource.cpp
index 3654dec0..1d67c979 100644
--- a/examples/charts/qmloscilloscope/datasource.cpp
+++ b/examples/charts/qmloscilloscope/datasource.cpp
@@ -68,8 +68,6 @@ void DataSource::update(QAbstractSeries *series)
 void DataSource::generateData(int type, int rowCount, int colCount)
 {
     // Remove previous data
-    foreach (QVector<QPointF> row, m_data)
-        row.clear();
     m_data.clear();
 
     // Append the new data depending on the type
diff --git a/examples/charts/scatterinteractions/chartview.cpp b/examples/charts/scatterinteractions/chartview.cpp
index fb4a81d2..9c2e8da3 100644
--- a/examples/charts/scatterinteractions/chartview.cpp
+++ b/examples/charts/scatterinteractions/chartview.cpp
@@ -70,7 +70,8 @@ void ChartView::handleClickedPoint(const QPointF &point)
     // Find the closest point from series 1
     QPointF closest(INT_MAX, INT_MAX);
     qreal distance(INT_MAX);
-    foreach (QPointF currentPoint, m_scatter->points()) {
+    const auto points = m_scatter->points();
+    for (const QPointF &currentPoint : points) {
         qreal currentDistance = qSqrt((currentPoint.x() - clickedPoint.x())
                                       * (currentPoint.x() - clickedPoint.x())
                                       + (currentPoint.y() - clickedPoint.y())
diff --git a/examples/charts/stackedbarchartdrilldown/main.cpp b/examples/charts/stackedbarchartdrilldown/main.cpp
index 63043dfe..c2138f36 100644
--- a/examples/charts/stackedbarchartdrilldown/main.cpp
+++ b/examples/charts/stackedbarchartdrilldown/main.cpp
@@ -49,12 +49,15 @@ int main(int argc, char *argv[])
 
 //! [2]
     // Define categories
-    QStringList months;
-    months << "May" << "Jun" << "Jul" << "Aug" << "Sep";
-    QStringList weeks;
-    weeks << "week 1" << "week 2" << "week 3" << "week 4";
-    QStringList plants;
-    plants << "Habanero" << "Lemon Drop" << "Starfish" << "Aji Amarillo";
+    const QStringList months = {
+        "May", "Jun", "Jul", "Aug", "Sep"
+    };
+    const QStringList weeks = {
+        "week 1", "week 2", "week 3", "week 4"
+    };
+    const QStringList plants = {
+        "Habanero", "Lemon Drop", "Starfish", "Aji Amarillo"
+    };
 //! [2]
 
 //! [3]
@@ -87,7 +90,7 @@ int main(int argc, char *argv[])
 
 //! [4]
     // Fill monthly and weekly series with data
-    foreach (QString plant, plants) {
+    for (const QString &plant : plants) {
         QBarSet *monthlyCrop = new QBarSet(plant);
         for (int month = 0; month < months.count(); month++) {
             QBarSet *weeklyCrop = new QBarSet(plant);