From 042c38379f1600782936ff20d89f9bb668d895fd Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Sun, 8 Oct 2023 18:19:23 +0300 Subject: tst_Gestures: compile with QT_NO_FOREACH [2/2] The loops are iterating over local const containers, so use ranged-for. Remove '#undef QT_NO_FOREACH'. Task-number: QTBUG-115839 Change-Id: I252f048e3c469bf9bb34cb0756ccbd57571fd886 Reviewed-by: Volker Hilsheimer --- tests/auto/other/gestures/tst_gestures.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'tests/auto/other') diff --git a/tests/auto/other/gestures/tst_gestures.cpp b/tests/auto/other/gestures/tst_gestures.cpp index be40887be6..3b7f1c5bb1 100644 --- a/tests/auto/other/gestures/tst_gestures.cpp +++ b/tests/auto/other/gestures/tst_gestures.cpp @@ -1,8 +1,6 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses - #include #include @@ -220,8 +218,8 @@ protected: } if (eventsPtr) { QGestureEvent *e = static_cast(event); - QList gestures = e->gestures(); - foreach(QGesture *g, gestures) { + const QList gestures = e->gestures(); + for (QGesture *g : gestures) { eventsPtr->all << g->gestureType(); switch(g->state()) { case Qt::GestureStarted: @@ -746,7 +744,8 @@ public: QGestureEvent *e = static_cast(event); for (Qt::GestureType type : std::as_const(ignoredGestures)) e->ignore(e->gesture(type)); - foreach(QGesture *g, e->gestures()) { + const auto gestures = e->gestures(); + for (QGesture *g : gestures) { switch (g->state()) { case Qt::GestureStarted: if (ignoredStartedGestures.contains(g->gestureType())) @@ -772,8 +771,8 @@ public: } if (eventsPtr) { QGestureEvent *e = static_cast(event); - QList gestures = e->gestures(); - foreach(QGesture *g, gestures) { + const QList gestures = e->gestures(); + for (QGesture *g : gestures) { eventsPtr->all << g->gestureType(); switch(g->state()) { case Qt::GestureStarted: -- cgit v1.2.3