1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use QList instead of QVector in statemachine

Browse Source 
Task-number: QTBUG-84469
Change-Id: I2b1399c34ebcc2237ca2662d97b54e81f11cb7af
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Jarek Kobus 2020-07-06 12:12:48 +02:00
parent c163ec1dbf
commit 60c6f4a51a
7 changed files with 42 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/widgets/qnx/foreignwindows/collector.h
View File

@ -41,8 +41,8 @@
#define COLLECTOR_H_ #define COLLECTOR_H_
#include <QAbstractNativeEventFilter> #include <QAbstractNativeEventFilter>
#include <QList>
#include <QWidget> #include <QWidget>
#include <QVector>
#include <screen/screen.h> #include <screen/screen.h>
@ -60,7 +60,7 @@ private:
QWindow *window; QWindow *window;
QWidget *widget; QWidget *widget;
}; };
QVector<Collectible> m_collectibles; QList<Collectible> m_collectibles;
bool filterQnxScreenEvent(screen_event_t event); bool filterQnxScreenEvent(screen_event_t event);
bool filterQnxScreenWindowEvent(screen_event_t event); bool filterQnxScreenWindowEvent(screen_event_t event);

2
src/corelib/statemachine/qabstracttransition.cpp
View File

@ -285,7 +285,7 @@ void QAbstractTransition::setTargetStates(const QList<QAbstractState*> &targets)
// we can just set the new list as the targetStates. // we can just set the new list as the targetStates.
sameList = false; sameList = false;
} else { } else {
QVector<QPointer<QAbstractState> > copy(d->targetStates); QList<QPointer<QAbstractState>> copy(d->targetStates);
for (int i = 0; i < targets.size(); ++i) { for (int i = 0; i < targets.size(); ++i) {
sameList &= copy.removeOne(targets.at(i)); sameList &= copy.removeOne(targets.at(i));
if (!sameList) if (!sameList)

3
src/corelib/statemachine/qabstracttransition_p.h
View File

@ -54,7 +54,6 @@
#include <private/qobject_p.h> #include <private/qobject_p.h>
#include <QtCore/qlist.h> #include <QtCore/qlist.h>
#include <QtCore/qvector.h>
#include <QtCore/qsharedpointer.h> #include <QtCore/qsharedpointer.h>
QT_REQUIRE_CONFIG(statemachine); QT_REQUIRE_CONFIG(statemachine);
@ -82,7 +81,7 @@ public:
QStateMachine *machine() const; QStateMachine *machine() const;
void emitTriggered(); void emitTriggered();
QVector<QPointer<QAbstractState> > targetStates; QList<QPointer<QAbstractState>> targetStates;
QAbstractTransition::TransitionType transitionType; QAbstractTransition::TransitionType transitionType;
#if QT_CONFIG(animation) #if QT_CONFIG(animation)

2
src/corelib/statemachine/qstate.cpp
View File

@ -322,7 +322,7 @@ void QState::addTransition(QAbstractTransition *transition)
} }
transition->setParent(this); transition->setParent(this);
const QVector<QPointer<QAbstractState> > &targets = QAbstractTransitionPrivate::get(transition)->targetStates; const QList<QPointer<QAbstractState>> &targets = QAbstractTransitionPrivate::get(transition)->targetStates;
for (int i = 0; i < targets.size(); ++i) { for (int i = 0; i < targets.size(); ++i) {
QAbstractState *t = targets.at(i).data(); QAbstractState *t = targets.at(i).data();
if (!t) { if (!t) {

2
src/corelib/statemachine/qstate_p.h
View File

@ -118,7 +118,7 @@ public:
mutable QList<QAbstractTransition*> transitionsList; mutable QList<QAbstractTransition*> transitionsList;
#ifndef QT_NO_PROPERTIES #ifndef QT_NO_PROPERTIES
QVector<QPropertyAssignment> propertyAssignments; QList<QPropertyAssignment> propertyAssignments;
#endif #endif
}; };

49
src/corelib/statemachine/qstatemachine.cpp
View File

@ -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, parent's parent, etc.))If state2 is state1's parent, or equal to state1, or a descendant of state1,
this returns the empty set. this returns the empty set.
*/ */
static QVector<QState*> getProperAncestors(const QAbstractState *state, const QAbstractState *upperBound) static QList<QState *> getProperAncestors(const QAbstractState *state, const QAbstractState *upperBound)
{ {
Q_ASSERT(state != nullptr); Q_ASSERT(state != nullptr);
QVector<QState*> result; QList<QState *> result;
result.reserve(16); result.reserve(16);
for (QState *it = state->parentState(); it && it != upperBound; it = it->parentState()) { for (QState *it = state->parentState(); it && it != upperBound; it = it->parentState()) {
result.append(it); result.append(it);
@ -527,7 +527,7 @@ QState *QStateMachinePrivate::findLCA(const QList<QAbstractState*> &states, bool
{ {
if (states.isEmpty()) if (states.isEmpty())
return nullptr; return nullptr;
QVector<QState*> ancestors = getProperAncestors(states.at(0), rootState()->parentState()); QList<QState *> ancestors = getProperAncestors(states.at(0), rootState()->parentState());
for (int i = 0; i < ancestors.size(); ++i) { for (int i = 0; i < ancestors.size(); ++i) {
QState *anc = ancestors.at(i); QState *anc = ancestors.at(i);
if (onlyCompound && !isCompound(anc)) if (onlyCompound && !isCompound(anc))
@ -571,7 +571,7 @@ QList<QAbstractTransition*> QStateMachinePrivate::selectTransitions(QEvent *even
QList<QAbstractTransition*> enabledTransitions; QList<QAbstractTransition*> enabledTransitions;
const_cast<QStateMachine *>(q)->beginSelectTransitions(event); const_cast<QStateMachine *>(q)->beginSelectTransitions(event);
for (QAbstractState *state : qAsConst(configuration_sorted)) { for (QAbstractState *state : qAsConst(configuration_sorted)) {
QVector<QState*> lst = getProperAncestors(state, nullptr); QList<QState *> lst = getProperAncestors(state, nullptr);
if (QState *grp = toStandardState(state)) if (QState *grp = toStandardState(state))
lst.prepend(grp); lst.prepend(grp);
bool found = false; bool found = false;
@ -694,7 +694,7 @@ void QStateMachinePrivate::microstep(QEvent *event, const QList<QAbstractTransit
qDebug() << q_func() << ": computed entry set:" << enteredStates; qDebug() << q_func() << ": computed entry set:" << enteredStates;
#endif #endif
QHash<QAbstractState*, QVector<QPropertyAssignment> > assignmentsForEnteredStates = QHash<QAbstractState *, QList<QPropertyAssignment>> assignmentsForEnteredStates =
computePropertyAssignments(enteredStates, pendingRestorables); computePropertyAssignments(enteredStates, pendingRestorables);
if (!pendingRestorables.isEmpty()) { if (!pendingRestorables.isEmpty()) {
// Add "implicit" assignments for restored properties to the first // Add "implicit" assignments for restored properties to the first
@ -805,7 +805,7 @@ QSet<QAbstractState*> QStateMachinePrivate::computeExitSet_Unordered(QAbstractTr
} }
void QStateMachinePrivate::exitStates(QEvent *event, const QList<QAbstractState *> &statesToExit_sorted, void QStateMachinePrivate::exitStates(QEvent *event, const QList<QAbstractState *> &statesToExit_sorted,
const QHash<QAbstractState*, QVector<QPropertyAssignment> > &assignmentsForEnteredStates) const QHash<QAbstractState *, QList<QPropertyAssignment>> &assignmentsForEnteredStates)
{ {
for (int i = 0; i < statesToExit_sorted.size(); ++i) { for (int i = 0; i < statesToExit_sorted.size(); ++i) {
QAbstractState *s = statesToExit_sorted.at(i); QAbstractState *s = statesToExit_sorted.at(i);
@ -952,7 +952,7 @@ QAbstractState *QStateMachinePrivate::getTransitionDomain(QAbstractTransition *t
void QStateMachinePrivate::enterStates(QEvent *event, const QList<QAbstractState *> &exitedStates_sorted, void QStateMachinePrivate::enterStates(QEvent *event, const QList<QAbstractState *> &exitedStates_sorted,
const QList<QAbstractState *> &statesToEnter_sorted, const QList<QAbstractState *> &statesToEnter_sorted,
const QSet<QAbstractState *> &statesForDefaultEntry, const QSet<QAbstractState *> &statesForDefaultEntry,
QHash<QAbstractState*, QVector<QPropertyAssignment> > &propertyAssignmentsForState QHash<QAbstractState *, QList<QPropertyAssignment>> &propertyAssignmentsForState
#if QT_CONFIG(animation) #if QT_CONFIG(animation)
, const QList<QAbstractAnimation *> &selectedAnimations , const QList<QAbstractAnimation *> &selectedAnimations
#endif #endif
@ -975,9 +975,8 @@ void QStateMachinePrivate::enterStates(QEvent *event, const QList<QAbstractState
// Immediately set the properties that are not animated. // Immediately set the properties that are not animated.
{ {
QVector<QPropertyAssignment> assignments = propertyAssignmentsForState.value(s); const auto assignments = propertyAssignmentsForState.value(s);
for (int i = 0; i < assignments.size(); ++i) { for (const auto &assn : assignments) {
const QPropertyAssignment &assn = assignments.at(i);
if (globalRestorePolicy == QState::RestoreProperties) { if (globalRestorePolicy == QState::RestoreProperties) {
if (assn.explicitlySet) { if (assn.explicitlySet) {
if (!hasRestorable(s, assn.object, assn.propertyName)) { if (!hasRestorable(s, assn.object, assn.propertyName)) {
@ -1370,9 +1369,9 @@ void QStateMachinePrivate::unregisterRestorables(const QList<QAbstractState *> &
} }
} }
QVector<QPropertyAssignment> QStateMachinePrivate::restorablesToPropertyList(const QHash<RestorableId, QVariant> &restorables) const QList<QPropertyAssignment> QStateMachinePrivate::restorablesToPropertyList(const QHash<RestorableId, QVariant> &restorables) const
{ {
QVector<QPropertyAssignment> result; QList<QPropertyAssignment> result;
QHash<RestorableId, QVariant>::const_iterator it; QHash<RestorableId, QVariant>::const_iterator it;
for (it = restorables.constBegin(); it != restorables.constEnd(); ++it) { for (it = restorables.constBegin(); it != restorables.constEnd(); ++it) {
const RestorableId &id = it.key(); const RestorableId &id = it.key();
@ -1427,16 +1426,16 @@ QHash<QStateMachinePrivate::RestorableId, QVariant> QStateMachinePrivate::comput
properties that should not be restored because they are assigned by an properties that should not be restored because they are assigned by an
entered state). entered state).
*/ */
QHash<QAbstractState*, QVector<QPropertyAssignment> > QStateMachinePrivate::computePropertyAssignments( QHash<QAbstractState *, QList<QPropertyAssignment>> QStateMachinePrivate::computePropertyAssignments(
const QList<QAbstractState*> &statesToEnter_sorted, QHash<RestorableId, QVariant> &pendingRestorables) const const QList<QAbstractState*> &statesToEnter_sorted, QHash<RestorableId, QVariant> &pendingRestorables) const
{ {
QHash<QAbstractState*, QVector<QPropertyAssignment> > assignmentsForState; QHash<QAbstractState *, QList<QPropertyAssignment>> assignmentsForState;
for (int i = 0; i < statesToEnter_sorted.size(); ++i) { for (int i = 0; i < statesToEnter_sorted.size(); ++i) {
QState *s = toStandardState(statesToEnter_sorted.at(i)); QState *s = toStandardState(statesToEnter_sorted.at(i));
if (!s) if (!s)
continue; continue;
QVector<QPropertyAssignment> &assignments = QStatePrivate::get(s)->propertyAssignments; QList<QPropertyAssignment> &assignments = QStatePrivate::get(s)->propertyAssignments;
for (int j = 0; j < assignments.size(); ++j) { for (int j = 0; j < assignments.size(); ++j) {
const QPropertyAssignment &assn = assignments.at(j); const QPropertyAssignment &assn = assignments.at(j);
if (assn.objectDeleted()) { if (assn.objectDeleted()) {
@ -1617,7 +1616,7 @@ QList<QAbstractAnimation *> QStateMachinePrivate::selectAnimations(const QList<Q
} }
void QStateMachinePrivate::terminateActiveAnimations(QAbstractState *state, void QStateMachinePrivate::terminateActiveAnimations(QAbstractState *state,
const QHash<QAbstractState*, QVector<QPropertyAssignment> > &assignmentsForEnteredStates) const QHash<QAbstractState *, QList<QPropertyAssignment>> &assignmentsForEnteredStates)
{ {
Q_Q(QStateMachine); Q_Q(QStateMachine);
QList<QAbstractAnimation*> animations = animationsForState.take(state); QList<QAbstractAnimation*> animations = animationsForState.take(state);
@ -1642,9 +1641,8 @@ void QStateMachinePrivate::terminateActiveAnimations(QAbstractState *state,
// If there is no property assignment that sets this property, // If there is no property assignment that sets this property,
// set the property to its target value. // set the property to its target value.
bool found = false; bool found = false;
QHash<QAbstractState*, QVector<QPropertyAssignment> >::const_iterator it; for (auto it = assignmentsForEnteredStates.constBegin(); it != assignmentsForEnteredStates.constEnd(); ++it) {
for (it = assignmentsForEnteredStates.constBegin(); it != assignmentsForEnteredStates.constEnd(); ++it) { const QList<QPropertyAssignment> &assignments = it.value();
const QVector<QPropertyAssignment> &assignments = it.value();
for (int j = 0; j < assignments.size(); ++j) { for (int j = 0; j < assignments.size(); ++j) {
if (assignments.at(j).hasTarget(assn.object, assn.propertyName)) { if (assignments.at(j).hasTarget(assn.object, assn.propertyName)) {
found = true; found = true;
@ -1662,16 +1660,15 @@ void QStateMachinePrivate::terminateActiveAnimations(QAbstractState *state,
void QStateMachinePrivate::initializeAnimations(QAbstractState *state, const QList<QAbstractAnimation *> &selectedAnimations, void QStateMachinePrivate::initializeAnimations(QAbstractState *state, const QList<QAbstractAnimation *> &selectedAnimations,
const QList<QAbstractState*> &exitedStates_sorted, const QList<QAbstractState*> &exitedStates_sorted,
QHash<QAbstractState*, QVector<QPropertyAssignment> > &assignmentsForEnteredStates) QHash<QAbstractState *, QList<QPropertyAssignment>> &assignmentsForEnteredStates)
{ {
Q_Q(QStateMachine); Q_Q(QStateMachine);
if (!assignmentsForEnteredStates.contains(state)) if (!assignmentsForEnteredStates.contains(state))
return; return;
QVector<QPropertyAssignment> &assignments = assignmentsForEnteredStates[state]; QList<QPropertyAssignment> &assignments = assignmentsForEnteredStates[state];
for (int i = 0; i < selectedAnimations.size(); ++i) { for (int i = 0; i < selectedAnimations.size(); ++i) {
QAbstractAnimation *anim = selectedAnimations.at(i); QAbstractAnimation *anim = selectedAnimations.at(i);
QVector<QPropertyAssignment>::iterator it; for (auto it = assignments.begin(); it != assignments.end(); ) {
for (it = assignments.begin(); it != assignments.end(); ) {
const QPropertyAssignment &assn = *it; const QPropertyAssignment &assn = *it;
const auto ret = initializeAnimation(anim, assn); const auto ret = initializeAnimation(anim, assn);
if (!ret.handledAnimations.isEmpty()) { if (!ret.handledAnimations.isEmpty()) {
@ -1831,7 +1828,7 @@ void QStateMachinePrivate::_q_start()
QSet<QAbstractState*> statesForDefaultEntry; QSet<QAbstractState*> statesForDefaultEntry;
QList<QAbstractState*> enteredStates = computeEntrySet(transitions, statesForDefaultEntry, &calculationCache); QList<QAbstractState*> enteredStates = computeEntrySet(transitions, statesForDefaultEntry, &calculationCache);
QHash<RestorableId, QVariant> pendingRestorables; QHash<RestorableId, QVariant> pendingRestorables;
QHash<QAbstractState*, QVector<QPropertyAssignment> > assignmentsForEnteredStates = QHash<QAbstractState *, QList<QPropertyAssignment>> assignmentsForEnteredStates =
computePropertyAssignments(enteredStates, pendingRestorables); computePropertyAssignments(enteredStates, pendingRestorables);
#if QT_CONFIG(animation) #if QT_CONFIG(animation)
QList<QAbstractAnimation *> selectedAnimations = selectAnimations(transitions); QList<QAbstractAnimation *> selectedAnimations = selectAnimations(transitions);
@ -2285,7 +2282,7 @@ void QStateMachinePrivate::registerSignalTransition(QSignalTransition *transitio
--signalIndex; --signalIndex;
connectionsMutex.lock(); connectionsMutex.lock();
QVector<int> &connectedSignalIndexes = connections[sender]; QList<int> &connectedSignalIndexes = connections[sender];
if (connectedSignalIndexes.size() <= signalIndex) if (connectedSignalIndexes.size() <= signalIndex)
connectedSignalIndexes.resize(signalIndex+1); connectedSignalIndexes.resize(signalIndex+1);
if (connectedSignalIndexes.at(signalIndex) == 0) { if (connectedSignalIndexes.at(signalIndex) == 0) {
@ -2323,7 +2320,7 @@ void QStateMachinePrivate::unregisterSignalTransition(QSignalTransition *transit
QSignalTransitionPrivate::get(transition)->signalIndex = -1; QSignalTransitionPrivate::get(transition)->signalIndex = -1;
connectionsMutex.lock(); connectionsMutex.lock();
QVector<int> &connectedSignalIndexes = connections[sender]; QList<int> &connectedSignalIndexes = connections[sender];
Q_ASSERT(connectedSignalIndexes.size() > signalIndex); Q_ASSERT(connectedSignalIndexes.size() > signalIndex);
Q_ASSERT(connectedSignalIndexes.at(signalIndex) != 0); Q_ASSERT(connectedSignalIndexes.at(signalIndex) != 0);
if (--connectedSignalIndexes[signalIndex] == 0) { if (--connectedSignalIndexes[signalIndex] == 0) {

15
src/corelib/statemachine/qstatemachine_p.h
View File

@ -60,7 +60,6 @@
#include <QtCore/qpair.h> #include <QtCore/qpair.h>
#include <QtCore/qpointer.h> #include <QtCore/qpointer.h>
#include <QtCore/qset.h> #include <QtCore/qset.h>
#include <QtCore/qvector.h>
#include <private/qfreelist_p.h> #include <private/qfreelist_p.h>
QT_REQUIRE_CONFIG(statemachine); QT_REQUIRE_CONFIG(statemachine);
@ -143,7 +142,7 @@ public:
virtual void endMacrostep(bool didChange); virtual void endMacrostep(bool didChange);
virtual void exitInterpreter(); virtual void exitInterpreter();
virtual void exitStates(QEvent *event, const QList<QAbstractState *> &statesToExit_sorted, virtual void exitStates(QEvent *event, const QList<QAbstractState *> &statesToExit_sorted,
const QHash<QAbstractState*, QVector<QPropertyAssignment> > &assignmentsForEnteredStates); const QHash<QAbstractState *, QList<QPropertyAssignment>> &assignmentsForEnteredStates);
QList<QAbstractState*> computeExitSet(const QList<QAbstractTransition*> &enabledTransitions, CalculationCache *cache); QList<QAbstractState*> computeExitSet(const QList<QAbstractTransition*> &enabledTransitions, CalculationCache *cache);
QSet<QAbstractState*> computeExitSet_Unordered(const QList<QAbstractTransition*> &enabledTransitions, CalculationCache *cache); QSet<QAbstractState*> computeExitSet_Unordered(const QList<QAbstractTransition*> &enabledTransitions, CalculationCache *cache);
QSet<QAbstractState*> computeExitSet_Unordered(QAbstractTransition *t, CalculationCache *cache); QSet<QAbstractState*> computeExitSet_Unordered(QAbstractTransition *t, CalculationCache *cache);
@ -151,7 +150,7 @@ public:
virtual void enterStates(QEvent *event, const QList<QAbstractState*> &exitedStates_sorted, virtual void enterStates(QEvent *event, const QList<QAbstractState*> &exitedStates_sorted,
const QList<QAbstractState*> &statesToEnter_sorted, const QList<QAbstractState*> &statesToEnter_sorted,
const QSet<QAbstractState*> &statesForDefaultEntry, const QSet<QAbstractState*> &statesForDefaultEntry,
QHash<QAbstractState *, QVector<QPropertyAssignment> > &propertyAssignmentsForState QHash<QAbstractState *, QList<QPropertyAssignment>> &propertyAssignmentsForState
#if QT_CONFIG(animation) #if QT_CONFIG(animation)
, const QList<QAbstractAnimation*> &selectedAnimations , const QList<QAbstractAnimation*> &selectedAnimations
#endif #endif
@ -236,9 +235,9 @@ public:
const QVariant &value); const QVariant &value);
void unregisterRestorables(const QList<QAbstractState*> &states, QObject *object, void unregisterRestorables(const QList<QAbstractState*> &states, QObject *object,
const QByteArray &propertyName); const QByteArray &propertyName);
QVector<QPropertyAssignment> restorablesToPropertyList(const QHash<RestorableId, QVariant> &restorables) const; QList<QPropertyAssignment> restorablesToPropertyList(const QHash<RestorableId, QVariant> &restorables) const;
QHash<RestorableId, QVariant> computePendingRestorables(const QList<QAbstractState*> &statesToExit_sorted) const; QHash<RestorableId, QVariant> computePendingRestorables(const QList<QAbstractState*> &statesToExit_sorted) const;
QHash<QAbstractState*, QVector<QPropertyAssignment> > computePropertyAssignments( QHash<QAbstractState *, QList<QPropertyAssignment>> computePropertyAssignments(
const QList<QAbstractState*> &statesToEnter_sorted, const QList<QAbstractState*> &statesToEnter_sorted,
QHash<RestorableId, QVariant> &pendingRestorables) const; QHash<RestorableId, QVariant> &pendingRestorables) const;
#endif #endif
@ -290,15 +289,15 @@ public:
QList<QAbstractAnimation *> selectAnimations(const QList<QAbstractTransition *> &transitionList) const; QList<QAbstractAnimation *> selectAnimations(const QList<QAbstractTransition *> &transitionList) const;
void terminateActiveAnimations(QAbstractState *state, void terminateActiveAnimations(QAbstractState *state,
const QHash<QAbstractState*, QVector<QPropertyAssignment> > &assignmentsForEnteredStates); const QHash<QAbstractState *, QList<QPropertyAssignment>> &assignmentsForEnteredStates);
void initializeAnimations(QAbstractState *state, const QList<QAbstractAnimation*> &selectedAnimations, void initializeAnimations(QAbstractState *state, const QList<QAbstractAnimation*> &selectedAnimations,
const QList<QAbstractState *> &exitedStates_sorted, const QList<QAbstractState *> &exitedStates_sorted,
QHash<QAbstractState *, QVector<QPropertyAssignment> > &assignmentsForEnteredStates); QHash<QAbstractState *, QList<QPropertyAssignment>> &assignmentsForEnteredStates);
#endif // animation #endif // animation
QSignalEventGenerator *signalEventGenerator; QSignalEventGenerator *signalEventGenerator;
QHash<const QObject*, QVector<int> > connections; QHash<const QObject *, QList<int>> connections;
QMutex connectionsMutex; QMutex connectionsMutex;
#if QT_CONFIG(qeventtransition) #if QT_CONFIG(qeventtransition)
QHash<QObject*, QHash<QEvent::Type, int> > qobjectEvents; QHash<QObject*, QHash<QEvent::Type, int> > qobjectEvents;