diff options
author | Ahmad Samir <a.samirh78@gmail.com> | 2023-08-11 01:22:02 +0300 |
---|---|---|
committer | Ahmad Samir <a.samirh78@gmail.com> | 2023-10-13 00:54:50 +0300 |
commit | cce946b3aad812634f7a680f38b6a7bcd424252f (patch) | |
tree | 7c8994b14bfa355990a479a68ae2685e78d99f5c /src/widgets/kernel/qgesturemanager.cpp | |
parent | a7d9ad9617754b68237a5b3aa52085e6c5502a8f (diff) |
QGestureManager: port FOREACH to ranged-for, local const QSets [4/6]
Those QSetS are local to the function, make them const, proving that the
loop bodies didn't change them, and the copy Q_FOREACH took wasn't
needed.
Task-number: QTBUG-115803
Change-Id: Iec2fc31fc060c59760a84dc45baf8fa16f62eb6d
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/widgets/kernel/qgesturemanager.cpp')
-rw-r--r-- | src/widgets/kernel/qgesturemanager.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/widgets/kernel/qgesturemanager.cpp b/src/widgets/kernel/qgesturemanager.cpp index d1a013914f..dc7a4bcb52 100644 --- a/src/widgets/kernel/qgesturemanager.cpp +++ b/src/widgets/kernel/qgesturemanager.cpp @@ -282,18 +282,18 @@ bool QGestureManager::filterEventThroughContexts(const QMultiMap<QObject *, } if (!triggeredGestures.isEmpty() || !finishedGestures.isEmpty() || !newMaybeGestures.isEmpty() || !notGestures.isEmpty()) { - QSet<QGesture *> startedGestures = triggeredGestures - m_activeGestures; + const QSet<QGesture *> startedGestures = triggeredGestures - m_activeGestures; triggeredGestures &= m_activeGestures; // check if a running gesture switched back to maybe state - QSet<QGesture *> activeToMaybeGestures = m_activeGestures & newMaybeGestures; + const QSet<QGesture *> activeToMaybeGestures = m_activeGestures & newMaybeGestures; // check if a maybe gesture switched to canceled - reset it but don't send an event QSet<QGesture *> maybeToCanceledGestures = m_maybeGestures & notGestures; // check if a running gesture switched back to not gesture state, // i.e. were canceled - QSet<QGesture *> canceledGestures = m_activeGestures & notGestures; + const QSet<QGesture *> canceledGestures = m_activeGestures & notGestures; // new gestures in maybe state m_maybeGestures += newMaybeGestures; @@ -311,11 +311,11 @@ bool QGestureManager::filterEventThroughContexts(const QMultiMap<QObject *, Q_ASSERT((finishedGestures & canceledGestures).isEmpty()); Q_ASSERT((canceledGestures & newMaybeGestures).isEmpty()); - QSet<QGesture *> notStarted = finishedGestures - m_activeGestures; + const QSet<QGesture *> notStarted = finishedGestures - m_activeGestures; if (!notStarted.isEmpty()) { // there are some gestures that claim to be finished, but never started. // probably those are "singleshot" gestures so we'll fake the started state. - foreach (QGesture *gesture, notStarted) + for (QGesture *gesture : notStarted) gesture->d_func()->state = Qt::GestureStarted; QSet<QGesture *> undeliveredGestures; deliverEvents(notStarted, &undeliveredGestures); @@ -330,15 +330,15 @@ bool QGestureManager::filterEventThroughContexts(const QMultiMap<QObject *, m_activeGestures -= canceledGestures; // set the proper gesture state on each gesture - foreach (QGesture *gesture, startedGestures) + for (QGesture *gesture : startedGestures) gesture->d_func()->state = Qt::GestureStarted; foreach (QGesture *gesture, triggeredGestures) gesture->d_func()->state = Qt::GestureUpdated; foreach (QGesture *gesture, finishedGestures) gesture->d_func()->state = Qt::GestureFinished; - foreach (QGesture *gesture, canceledGestures) + for (QGesture *gesture : canceledGestures) gesture->d_func()->state = Qt::GestureCanceled; - foreach (QGesture *gesture, activeToMaybeGestures) + for (QGesture *gesture : activeToMaybeGestures) gesture->d_func()->state = Qt::GestureFinished; if (!m_activeGestures.isEmpty() || !m_maybeGestures.isEmpty() || @@ -358,7 +358,7 @@ bool QGestureManager::filterEventThroughContexts(const QMultiMap<QObject *, deliverEvents(startedGestures+triggeredGestures+finishedGestures+canceledGestures, &undeliveredGestures); - foreach (QGesture *g, startedGestures) { + for (QGesture *g : startedGestures) { if (undeliveredGestures.contains(g)) continue; if (g->gestureCancelPolicy() == QGesture::CancelAllInContext) { @@ -371,9 +371,9 @@ bool QGestureManager::filterEventThroughContexts(const QMultiMap<QObject *, m_activeGestures -= undeliveredGestures; // reset gestures that ended - QSet<QGesture *> endedGestures = + const QSet<QGesture *> endedGestures = finishedGestures + canceledGestures + undeliveredGestures + maybeToCanceledGestures; - foreach (QGesture *gesture, endedGestures) { + for (QGesture *gesture : endedGestures) { recycle(gesture); m_gestureTargets.remove(gesture); } |