diff options
| -rw-r--r-- | src/corelib/statemachine/qstatemachine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index 31b079af0c..20d5ed890b 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -624,7 +624,7 @@ void QStateMachinePrivate::removeConflictingTransitions(QList<QAbstractTransitio foreach (QAbstractTransition *t1, enabledTransitions) { bool t1Preempted = false; - QSet<QAbstractState*> exitSetT1 = computeExitSet_Unordered(t1, cache); + const QSet<QAbstractState*> exitSetT1 = computeExitSet_Unordered(t1, cache); QList<QAbstractTransition*>::iterator t2It = filteredTransitions.begin(); while (t2It != filteredTransitions.end()) { QAbstractTransition *t2 = *t2It; @@ -636,7 +636,7 @@ void QStateMachinePrivate::removeConflictingTransitions(QList<QAbstractTransitio } QSet<QAbstractState*> exitSetT2 = computeExitSet_Unordered(t2, cache); - if (exitSetT1.intersect(exitSetT2).isEmpty()) { + if (!exitSetT1.intersects(exitSetT2)) { // No conflict, no cry. Next patient please. ++t2It; } else { |