From 1f2c23a7ca1699b345578aeb52fbd97b612e079a Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Date: Fri, 7 Dec 2018 12:00:48 +0100
Subject: Cleanup Widgets examples - foreach

Cleanup the Widget examples - replace foreach with range-based for loop
in subdirectory tools, touch and tutorials

Change-Id: I008d23b5993a18a3332fe9f5e5bca68cb0561066
Reviewed-by: Luca Beldi <v.ronin@yahoo.it>
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
---
 examples/widgets/touch/dials/main.cpp               | 4 ++--
 examples/widgets/touch/fingerpaint/mainwindow.cpp   | 6 +++---
 examples/widgets/touch/fingerpaint/scribblearea.cpp | 6 +++---
 examples/widgets/touch/pinchzoom/mouse.cpp          | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'examples/widgets/touch')

diff --git a/examples/widgets/touch/dials/main.cpp b/examples/widgets/touch/dials/main.cpp
index 071f485de3..059dfdc716 100644
--- a/examples/widgets/touch/dials/main.cpp
+++ b/examples/widgets/touch/dials/main.cpp
@@ -60,8 +60,8 @@ int main(int argc, char **argv)
     QWidget window;
     Ui::Dials dialsUi;
     dialsUi.setupUi(&window);
-    QList<QAbstractSlider *> sliders = window.findChildren<QAbstractSlider *>();
-    foreach (QAbstractSlider *slider, sliders)
+    const QList<QAbstractSlider *> sliders = window.findChildren<QAbstractSlider *>();
+    for (QAbstractSlider *slider : sliders)
         slider->setAttribute(Qt::WA_AcceptTouchEvents);
     window.showMaximized();
     return app.exec();
diff --git a/examples/widgets/touch/fingerpaint/mainwindow.cpp b/examples/widgets/touch/fingerpaint/mainwindow.cpp
index b0d91d25bf..2f7ec38d1a 100644
--- a/examples/widgets/touch/fingerpaint/mainwindow.cpp
+++ b/examples/widgets/touch/fingerpaint/mainwindow.cpp
@@ -129,7 +129,8 @@ void MainWindow::createActions()
     openAct->setShortcut(tr("Ctrl+O"));
     connect(openAct, &QAction::triggered, this, &MainWindow::open);
 
-    foreach (QByteArray format, QImageWriter::supportedImageFormats()) {
+    const QList<QByteArray> imageFormats = QImageWriter::supportedImageFormats();
+    for (const QByteArray &format : imageFormats) {
         QString text = tr("%1...").arg(QString(format).toUpper());
 
         QAction *action = new QAction(text, this);
@@ -163,8 +164,7 @@ void MainWindow::createMenus()
 //! [15] //! [16]
 {
     saveAsMenu = new QMenu(tr("&Save As"), this);
-    foreach (QAction *action, saveAsActs)
-        saveAsMenu->addAction(action);
+    saveAsMenu->addActions(saveAsActs);
 
     fileMenu = new QMenu(tr("&File"), this);
     fileMenu->addAction(openAct);
diff --git a/examples/widgets/touch/fingerpaint/scribblearea.cpp b/examples/widgets/touch/fingerpaint/scribblearea.cpp
index aa4e60c934..0b0c4476d9 100644
--- a/examples/widgets/touch/fingerpaint/scribblearea.cpp
+++ b/examples/widgets/touch/fingerpaint/scribblearea.cpp
@@ -195,9 +195,9 @@ bool ScribbleArea::event(QEvent *event)
     case QEvent::TouchUpdate:
     case QEvent::TouchEnd:
     {
-        QTouchEvent *touch = static_cast<QTouchEvent *>(event);
-        QList<QTouchEvent::TouchPoint> touchPoints = static_cast<QTouchEvent *>(event)->touchPoints();
-        foreach (const QTouchEvent::TouchPoint &touchPoint, touchPoints) {
+        const QTouchEvent *touch = static_cast<QTouchEvent *>(event);
+        const QList<QTouchEvent::TouchPoint> touchPoints = static_cast<QTouchEvent *>(event)->touchPoints();
+        for (const QTouchEvent::TouchPoint &touchPoint : touchPoints) {
             switch (touchPoint.state()) {
             case Qt::TouchPointStationary:
             case Qt::TouchPointReleased:
diff --git a/examples/widgets/touch/pinchzoom/mouse.cpp b/examples/widgets/touch/pinchzoom/mouse.cpp
index 1e6814be13..1dfd7d749c 100644
--- a/examples/widgets/touch/pinchzoom/mouse.cpp
+++ b/examples/widgets/touch/pinchzoom/mouse.cpp
@@ -163,7 +163,7 @@ void Mouse::timerEvent(QTimerEvent *)
                                                        << mapToScene(0, 0)
                                                        << mapToScene(-30, -50)
                                                        << mapToScene(30, -50));
-    foreach (QGraphicsItem *item, dangerMice) {
+    for (QGraphicsItem *item : dangerMice) {
         if (item == this)
             continue;
 
-- 
cgit v1.2.3