From 60c6f4a51ae6d3de7f9b765f89be41e193f5c19a Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 6 Jul 2020 12:12:48 +0200 Subject: Use QList instead of QVector in statemachine Task-number: QTBUG-84469 Change-Id: I2b1399c34ebcc2237ca2662d97b54e81f11cb7af Reviewed-by: Friedemann Kleint --- examples/widgets/qnx/foreignwindows/collector.h | 4 +- src/corelib/statemachine/qabstracttransition.cpp | 2 +- src/corelib/statemachine/qabstracttransition_p.h | 3 +- src/corelib/statemachine/qstate.cpp | 2 +- src/corelib/statemachine/qstate_p.h | 2 +- src/corelib/statemachine/qstatemachine.cpp | 61 +++++++++++------------- src/corelib/statemachine/qstatemachine_p.h | 15 +++--- 7 files changed, 42 insertions(+), 47 deletions(-) diff --git a/examples/widgets/qnx/foreignwindows/collector.h b/examples/widgets/qnx/foreignwindows/collector.h index 2b1ed499ff..7c0b2e5cb6 100644 --- a/examples/widgets/qnx/foreignwindows/collector.h +++ b/examples/widgets/qnx/foreignwindows/collector.h @@ -41,8 +41,8 @@ #define COLLECTOR_H_ #include +#include #include -#include #include @@ -60,7 +60,7 @@ private: QWindow *window; QWidget *widget; }; - QVector m_collectibles; + QList m_collectibles; bool filterQnxScreenEvent(screen_event_t event); bool filterQnxScreenWindowEvent(screen_event_t event); diff --git a/src/corelib/statemachine/qabstracttransition.cpp b/src/corelib/statemachine/qabstracttransition.cpp index df70b54721..b1cbc1c516 100644 --- a/src/corelib/statemachine/qabstracttransition.cpp +++ b/src/corelib/statemachine/qabstracttransition.cpp @@ -285,7 +285,7 @@ void QAbstractTransition::setTargetStates(const QList &targets) // we can just set the new list as the targetStates. sameList = false; } else { - QVector > copy(d->targetStates); + QList> copy(d->targetStates); for (int i = 0; i < targets.size(); ++i) { sameList &= copy.removeOne(targets.at(i)); if (!sameList) diff --git a/src/corelib/statemachine/qabstracttransition_p.h b/src/corelib/statemachine/qabstracttransition_p.h index 663d777c75..435488848f 100644 --- a/src/corelib/statemachine/qabstracttransition_p.h +++ b/src/corelib/statemachine/qabstracttransition_p.h @@ -54,7 +54,6 @@ #include #include -#include #include QT_REQUIRE_CONFIG(statemachine); @@ -82,7 +81,7 @@ public: QStateMachine *machine() const; void emitTriggered(); - QVector > targetStates; + QList> targetStates; QAbstractTransition::TransitionType transitionType; #if QT_CONFIG(animation) diff --git a/src/corelib/statemachine/qstate.cpp b/src/corelib/statemachine/qstate.cpp index f641d25a96..dd92bfe7ba 100644 --- a/src/corelib/statemachine/qstate.cpp +++ b/src/corelib/statemachine/qstate.cpp @@ -322,7 +322,7 @@ void QState::addTransition(QAbstractTransition *transition) } transition->setParent(this); - const QVector > &targets = QAbstractTransitionPrivate::get(transition)->targetStates; + const QList> &targets = QAbstractTransitionPrivate::get(transition)->targetStates; for (int i = 0; i < targets.size(); ++i) { QAbstractState *t = targets.at(i).data(); if (!t) { diff --git a/src/corelib/statemachine/qstate_p.h b/src/corelib/statemachine/qstate_p.h index ec746caae1..25393a04b4 100644 --- a/src/corelib/statemachine/qstate_p.h +++ b/src/corelib/statemachine/qstate_p.h @@ -118,7 +118,7 @@ public: mutable QList transitionsList; #ifndef QT_NO_PROPERTIES - QVector propertyAssignments; + QList propertyAssignments; #endif }; diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index c1fa700959..878a968515 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -330,10 +330,10 @@ state2. (A "proper ancestor" of a state is its parent, or the parent's parent, o parent's parent, etc.))If state2 is state1's parent, or equal to state1, or a descendant of state1, this returns the empty set. */ -static QVector getProperAncestors(const QAbstractState *state, const QAbstractState *upperBound) +static QList getProperAncestors(const QAbstractState *state, const QAbstractState *upperBound) { Q_ASSERT(state != nullptr); - QVector result; + QList result; result.reserve(16); for (QState *it = state->parentState(); it && it != upperBound; it = it->parentState()) { result.append(it); @@ -527,7 +527,7 @@ QState *QStateMachinePrivate::findLCA(const QList &states, bool { if (states.isEmpty()) return nullptr; - QVector ancestors = getProperAncestors(states.at(0), rootState()->parentState()); + QList ancestors = getProperAncestors(states.at(0), rootState()->parentState()); for (int i = 0; i < ancestors.size(); ++i) { QState *anc = ancestors.at(i); if (onlyCompound && !isCompound(anc)) @@ -569,9 +569,9 @@ QList QStateMachinePrivate::selectTransitions(QEvent *even std::sort(configuration_sorted.begin(), configuration_sorted.end(), stateEntryLessThan); QList enabledTransitions; - const_cast(q)->beginSelectTransitions(event); + const_cast(q)->beginSelectTransitions(event); for (QAbstractState *state : qAsConst(configuration_sorted)) { - QVector lst = getProperAncestors(state, nullptr); + QList lst = getProperAncestors(state, nullptr); if (QState *grp = toStandardState(state)) lst.prepend(grp); bool found = false; @@ -694,7 +694,7 @@ void QStateMachinePrivate::microstep(QEvent *event, const QList > assignmentsForEnteredStates = + QHash> assignmentsForEnteredStates = computePropertyAssignments(enteredStates, pendingRestorables); if (!pendingRestorables.isEmpty()) { // Add "implicit" assignments for restored properties to the first @@ -804,8 +804,8 @@ QSet QStateMachinePrivate::computeExitSet_Unordered(QAbstractTr return statesToExit; } -void QStateMachinePrivate::exitStates(QEvent *event, const QList &statesToExit_sorted, - const QHash > &assignmentsForEnteredStates) +void QStateMachinePrivate::exitStates(QEvent *event, const QList &statesToExit_sorted, + const QHash> &assignmentsForEnteredStates) { for (int i = 0; i < statesToExit_sorted.size(); ++i) { QAbstractState *s = statesToExit_sorted.at(i); @@ -949,10 +949,10 @@ QAbstractState *QStateMachinePrivate::getTransitionDomain(QAbstractTransition *t return domain; } -void QStateMachinePrivate::enterStates(QEvent *event, const QList &exitedStates_sorted, - const QList &statesToEnter_sorted, - const QSet &statesForDefaultEntry, - QHash > &propertyAssignmentsForState +void QStateMachinePrivate::enterStates(QEvent *event, const QList &exitedStates_sorted, + const QList &statesToEnter_sorted, + const QSet &statesForDefaultEntry, + QHash> &propertyAssignmentsForState #if QT_CONFIG(animation) , const QList &selectedAnimations #endif @@ -975,9 +975,8 @@ void QStateMachinePrivate::enterStates(QEvent *event, const QList assignments = propertyAssignmentsForState.value(s); - for (int i = 0; i < assignments.size(); ++i) { - const QPropertyAssignment &assn = assignments.at(i); + const auto assignments = propertyAssignmentsForState.value(s); + for (const auto &assn : assignments) { if (globalRestorePolicy == QState::RestoreProperties) { if (assn.explicitlySet) { if (!hasRestorable(s, assn.object, assn.propertyName)) { @@ -1370,9 +1369,9 @@ void QStateMachinePrivate::unregisterRestorables(const QList & } } -QVector QStateMachinePrivate::restorablesToPropertyList(const QHash &restorables) const +QList QStateMachinePrivate::restorablesToPropertyList(const QHash &restorables) const { - QVector result; + QList result; QHash::const_iterator it; for (it = restorables.constBegin(); it != restorables.constEnd(); ++it) { const RestorableId &id = it.key(); @@ -1427,16 +1426,16 @@ QHash QStateMachinePrivate::comput properties that should not be restored because they are assigned by an entered state). */ -QHash > QStateMachinePrivate::computePropertyAssignments( +QHash> QStateMachinePrivate::computePropertyAssignments( const QList &statesToEnter_sorted, QHash &pendingRestorables) const { - QHash > assignmentsForState; + QHash> assignmentsForState; for (int i = 0; i < statesToEnter_sorted.size(); ++i) { QState *s = toStandardState(statesToEnter_sorted.at(i)); if (!s) continue; - QVector &assignments = QStatePrivate::get(s)->propertyAssignments; + QList &assignments = QStatePrivate::get(s)->propertyAssignments; for (int j = 0; j < assignments.size(); ++j) { const QPropertyAssignment &assn = assignments.at(j); if (assn.objectDeleted()) { @@ -1617,7 +1616,7 @@ QList QStateMachinePrivate::selectAnimations(const QList > &assignmentsForEnteredStates) + const QHash> &assignmentsForEnteredStates) { Q_Q(QStateMachine); QList animations = animationsForState.take(state); @@ -1642,9 +1641,8 @@ void QStateMachinePrivate::terminateActiveAnimations(QAbstractState *state, // If there is no property assignment that sets this property, // set the property to its target value. bool found = false; - QHash >::const_iterator it; - for (it = assignmentsForEnteredStates.constBegin(); it != assignmentsForEnteredStates.constEnd(); ++it) { - const QVector &assignments = it.value(); + for (auto it = assignmentsForEnteredStates.constBegin(); it != assignmentsForEnteredStates.constEnd(); ++it) { + const QList &assignments = it.value(); for (int j = 0; j < assignments.size(); ++j) { if (assignments.at(j).hasTarget(assn.object, assn.propertyName)) { found = true; @@ -1662,16 +1660,15 @@ void QStateMachinePrivate::terminateActiveAnimations(QAbstractState *state, void QStateMachinePrivate::initializeAnimations(QAbstractState *state, const QList &selectedAnimations, const QList &exitedStates_sorted, - QHash > &assignmentsForEnteredStates) + QHash> &assignmentsForEnteredStates) { Q_Q(QStateMachine); if (!assignmentsForEnteredStates.contains(state)) return; - QVector &assignments = assignmentsForEnteredStates[state]; + QList &assignments = assignmentsForEnteredStates[state]; for (int i = 0; i < selectedAnimations.size(); ++i) { QAbstractAnimation *anim = selectedAnimations.at(i); - QVector::iterator it; - for (it = assignments.begin(); it != assignments.end(); ) { + for (auto it = assignments.begin(); it != assignments.end(); ) { const QPropertyAssignment &assn = *it; const auto ret = initializeAnimation(anim, assn); if (!ret.handledAnimations.isEmpty()) { @@ -1831,10 +1828,10 @@ void QStateMachinePrivate::_q_start() QSet statesForDefaultEntry; QList enteredStates = computeEntrySet(transitions, statesForDefaultEntry, &calculationCache); QHash pendingRestorables; - QHash > assignmentsForEnteredStates = + QHash> assignmentsForEnteredStates = computePropertyAssignments(enteredStates, pendingRestorables); #if QT_CONFIG(animation) - QList selectedAnimations = selectAnimations(transitions); + QList selectedAnimations = selectAnimations(transitions); #endif // enterStates() will set stopProcessingReason to Finished if a final // state is entered. @@ -2285,7 +2282,7 @@ void QStateMachinePrivate::registerSignalTransition(QSignalTransition *transitio --signalIndex; connectionsMutex.lock(); - QVector &connectedSignalIndexes = connections[sender]; + QList &connectedSignalIndexes = connections[sender]; if (connectedSignalIndexes.size() <= signalIndex) connectedSignalIndexes.resize(signalIndex+1); if (connectedSignalIndexes.at(signalIndex) == 0) { @@ -2323,7 +2320,7 @@ void QStateMachinePrivate::unregisterSignalTransition(QSignalTransition *transit QSignalTransitionPrivate::get(transition)->signalIndex = -1; connectionsMutex.lock(); - QVector &connectedSignalIndexes = connections[sender]; + QList &connectedSignalIndexes = connections[sender]; Q_ASSERT(connectedSignalIndexes.size() > signalIndex); Q_ASSERT(connectedSignalIndexes.at(signalIndex) != 0); if (--connectedSignalIndexes[signalIndex] == 0) { diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h index 7018926bd3..d73313570a 100644 --- a/src/corelib/statemachine/qstatemachine_p.h +++ b/src/corelib/statemachine/qstatemachine_p.h @@ -60,7 +60,6 @@ #include #include #include -#include #include QT_REQUIRE_CONFIG(statemachine); @@ -143,7 +142,7 @@ public: virtual void endMacrostep(bool didChange); virtual void exitInterpreter(); virtual void exitStates(QEvent *event, const QList &statesToExit_sorted, - const QHash > &assignmentsForEnteredStates); + const QHash> &assignmentsForEnteredStates); QList computeExitSet(const QList &enabledTransitions, CalculationCache *cache); QSet computeExitSet_Unordered(const QList &enabledTransitions, CalculationCache *cache); QSet computeExitSet_Unordered(QAbstractTransition *t, CalculationCache *cache); @@ -151,7 +150,7 @@ public: virtual void enterStates(QEvent *event, const QList &exitedStates_sorted, const QList &statesToEnter_sorted, const QSet &statesForDefaultEntry, - QHash > &propertyAssignmentsForState + QHash> &propertyAssignmentsForState #if QT_CONFIG(animation) , const QList &selectedAnimations #endif @@ -236,9 +235,9 @@ public: const QVariant &value); void unregisterRestorables(const QList &states, QObject *object, const QByteArray &propertyName); - QVector restorablesToPropertyList(const QHash &restorables) const; + QList restorablesToPropertyList(const QHash &restorables) const; QHash computePendingRestorables(const QList &statesToExit_sorted) const; - QHash > computePropertyAssignments( + QHash> computePropertyAssignments( const QList &statesToEnter_sorted, QHash &pendingRestorables) const; #endif @@ -290,15 +289,15 @@ public: QList selectAnimations(const QList &transitionList) const; void terminateActiveAnimations(QAbstractState *state, - const QHash > &assignmentsForEnteredStates); + const QHash> &assignmentsForEnteredStates); void initializeAnimations(QAbstractState *state, const QList &selectedAnimations, const QList &exitedStates_sorted, - QHash > &assignmentsForEnteredStates); + QHash> &assignmentsForEnteredStates); #endif // animation QSignalEventGenerator *signalEventGenerator; - QHash > connections; + QHash> connections; QMutex connectionsMutex; #if QT_CONFIG(qeventtransition) QHash > qobjectEvents; -- cgit v1.2.3