summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2020-04-27 17:12:12 +0200
committerMarc Mutz <marc.mutz@kdab.com>2020-04-29 08:10:36 +0000
commit05a38c05f7760d5f5da7c4134dcc1fec6a9600b7 (patch)
treed043052dd9ffb5f2cd871e77a230436b9fc3638c
parent693c28b9fbbd6c94b6357ef3e70a6aa2e76b716f (diff)
tst_Gestures: fix -Wdangling-else GCC warning
... 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 <Friedemann.Kleint@qt.io>
-rw-r--r--tests/auto/other/gestures/tst_gestures.cpp8
1 files changed, 4 insertions, 4 deletions
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<QGesture*> gestures;
protected:
- bool event(QEvent *event)
+ bool event(QEvent *event) override
{
if (event->type() == QEvent::Gesture) {
QGestureEvent *gestureEvent = static_cast<QGestureEvent*>(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);
}