Port Q_FOREACH to ranged-for; local const containers

The loops were iterating over local containers; make them const and use
ranged-for.

In files where all foreach usages are ported, remove
"#undef QT_NO_FOREACH".

Change-Id: I48f39cd7c30dc183808c8c0e99d0e8373eb804a9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

1 files changed, 3 insertions, 4 deletions

diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp b/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp
index 5c2e4588..4938bfd5 100644
--- a/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp
+++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp
@@ -1,8 +1,6 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses
-
 #include <private/chartdatetimeaxisx_p.h>
 #include <private/chartpresenter_p.h>
 #include <QtCharts/QDateTimeAxis>
@@ -73,7 +71,8 @@ QSizeF ChartDateTimeAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint
     QSizeF sh;
 
     QSizeF base = HorizontalAxis::sizeHint(which, constraint);
-    QStringList ticksList = createDateTimeLabels(min(), max(), m_axis->tickCount(), m_axis->format());
+    const QStringList ticksList =
+            createDateTimeLabels(min(), max(), m_axis->tickCount(), m_axis->format());
     // Width of horizontal axis sizeHint indicates the maximum distance labels can extend past
     // first and last ticks. Base width is irrelevant.
     qreal width = 0;
@@ -101,7 +100,7 @@ QSizeF ChartDateTimeAxisX::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 : ticksList) {
                 QRectF rect = ChartPresenter::textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
                 labelHeight = qMax(rect.height(), labelHeight);
                 width = rect.width();