From 05a38c05f7760d5f5da7c4134dcc1fec6a9600b7 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 27 Apr 2020 17:12:12 +0200 Subject: tst_Gestures: fix -Wdangling-else GCC warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... and do a local code cleanup: - add override - port from foreach to C++11 ranged for loop - remove dead code (`gestureEvent` (née event) was already dereferenced when we check it for null'ness, so it cannot be nullptr, so the condition is always true). Pick-to: 5.15 Change-Id: Ica5e34fbe65c95f6573630f188582b90be15c8f7 Reviewed-by: Friedemann Kleint --- tests/auto/other/gestures/tst_gestures.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/auto/other/gestures') diff --git a/tests/auto/other/gestures/tst_gestures.cpp b/tests/auto/other/gestures/tst_gestures.cpp index c1d39d8b72..278e1d3070 100644 --- a/tests/auto/other/gestures/tst_gestures.cpp +++ b/tests/auto/other/gestures/tst_gestures.cpp @@ -1401,13 +1401,13 @@ void tst_Gestures::ungrabGesture() // a method on QWidget QSet gestures; protected: - bool event(QEvent *event) + bool event(QEvent *event) override { if (event->type() == QEvent::Gesture) { QGestureEvent *gestureEvent = static_cast(event); - if (gestureEvent) - foreach (QGesture *g, gestureEvent->gestures()) - gestures.insert(g); + const auto eventGestures = gestureEvent->gestures(); + for (QGesture *g : eventGestures) + gestures.insert(g); } return GestureWidget::event(event); } -- cgit v1.2.3