From c593492d1678a2ec08f1bfffcb572459b3bc6c00 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 26 Sep 2018 15:39:35 +0200 Subject: Modernize the "animation" feature Change-Id: Ibc164b3df3cf87db569ef4813de458a9067b7f7d Reviewed-by: Edward Welbourne Reviewed-by: Oswald Buddenhagen --- src/corelib/statemachine/qabstracttransition.cpp | 2 +- src/corelib/statemachine/qabstracttransition.h | 4 ++-- src/corelib/statemachine/qabstracttransition_p.h | 2 +- src/corelib/statemachine/qstatemachine.cpp | 30 ++++++++++++------------ src/corelib/statemachine/qstatemachine.h | 8 +++---- src/corelib/statemachine/qstatemachine_p.h | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src/corelib/statemachine') diff --git a/src/corelib/statemachine/qabstracttransition.cpp b/src/corelib/statemachine/qabstracttransition.cpp index 272e681fb4..ebf33e120a 100644 --- a/src/corelib/statemachine/qabstracttransition.cpp +++ b/src/corelib/statemachine/qabstracttransition.cpp @@ -334,7 +334,7 @@ QStateMachine *QAbstractTransition::machine() const return d->machine(); } -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) /*! Adds the given \a animation to this transition. diff --git a/src/corelib/statemachine/qabstracttransition.h b/src/corelib/statemachine/qabstracttransition.h index 9b35e0cdb6..18e12d3eb6 100644 --- a/src/corelib/statemachine/qabstracttransition.h +++ b/src/corelib/statemachine/qabstracttransition.h @@ -53,7 +53,7 @@ class QAbstractState; class QState; class QStateMachine; -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) class QAbstractAnimation; #endif @@ -86,7 +86,7 @@ public: QStateMachine *machine() const; -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) void addAnimation(QAbstractAnimation *animation); void removeAnimation(QAbstractAnimation *animation); QList animations() const; diff --git a/src/corelib/statemachine/qabstracttransition_p.h b/src/corelib/statemachine/qabstracttransition_p.h index e11514670e..663d777c75 100644 --- a/src/corelib/statemachine/qabstracttransition_p.h +++ b/src/corelib/statemachine/qabstracttransition_p.h @@ -85,7 +85,7 @@ public: QVector > targetStates; QAbstractTransition::TransitionType transitionType; -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) QList animations; #endif }; diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index 24734f99ac..7388d496d9 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -59,7 +59,7 @@ #include "qeventtransition_p.h" #endif -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) #include "qpropertyanimation.h" #include "qanimationgroup.h" #include @@ -167,7 +167,7 @@ QT_BEGIN_NAMESPACE \sa start(), stop(), started(), stopped(), runningChanged() */ -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) /*! \property QStateMachine::animated @@ -401,7 +401,7 @@ QStateMachinePrivate::QStateMachinePrivate() error = QStateMachine::NoError; globalRestorePolicy = QState::DontRestoreProperties; signalEventGenerator = 0; -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) animated = true; #endif } @@ -700,12 +700,12 @@ void QStateMachinePrivate::microstep(QEvent *event, const QList selectedAnimations = selectAnimations(enabledTransitions); #endif enterStates(event, exitedStates, enteredStates, statesForDefaultEntry, assignmentsForEnteredStates -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) , selectedAnimations #endif ); @@ -827,7 +827,7 @@ void QStateMachinePrivate::exitStates(QEvent *event, const QListcallOnExit(event); -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) terminateActiveAnimations(s, assignmentsForEnteredStates); #else Q_UNUSED(assignmentsForEnteredStates); @@ -942,7 +942,7 @@ void QStateMachinePrivate::enterStates(QEvent *event, const QList &statesToEnter_sorted, const QSet &statesForDefaultEntry, QHash > &propertyAssignmentsForState -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) , const QList &selectedAnimations #endif ) @@ -958,7 +958,7 @@ void QStateMachinePrivate::enterStates(QEvent *event, const QList pendingRestorables; QHash > assignmentsForEnteredStates = computePropertyAssignments(enteredStates, pendingRestorables); -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) QList selectedAnimations = selectAnimations(transitions); #endif // enterStates() will set stopProcessingReason to Finished if a final @@ -1822,7 +1822,7 @@ void QStateMachinePrivate::_q_start() stopProcessingReason = EventQueueEmpty; enterStates(&nullEvent, exitedStates, enteredStates, statesForDefaultEntry, assignmentsForEnteredStates -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) , selectedAnimations #endif ); @@ -2957,7 +2957,7 @@ void QStateMachine::onExit(QEvent *event) QState::onExit(event); } -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) /*! Returns whether animations are enabled for this state machine. @@ -3004,7 +3004,7 @@ void QStateMachine::removeDefaultAnimation(QAbstractAnimation *animation) d->defaultAnimations.removeAll(animation); } -#endif // QT_NO_ANIMATION +#endif // animation // Begin moc-generated code -- modify carefully (check "HAND EDIT" parts)! diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h index fd90b86fd5..e520285437 100644 --- a/src/corelib/statemachine/qstatemachine.h +++ b/src/corelib/statemachine/qstatemachine.h @@ -60,7 +60,7 @@ class Q_CORE_EXPORT QStateMachine : public QState Q_PROPERTY(QString errorString READ errorString) Q_PROPERTY(QState::RestorePolicy globalRestorePolicy READ globalRestorePolicy WRITE setGlobalRestorePolicy) Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged) -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) Q_PROPERTY(bool animated READ isAnimated WRITE setAnimated) #endif public: @@ -122,14 +122,14 @@ public: bool isRunning() const; -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) bool isAnimated() const; void setAnimated(bool enabled); void addDefaultAnimation(QAbstractAnimation *animation); QList defaultAnimations() const; void removeDefaultAnimation(QAbstractAnimation *animation); -#endif // QT_NO_ANIMATION +#endif // animation QState::RestorePolicy globalRestorePolicy() const; void setGlobalRestorePolicy(QState::RestorePolicy restorePolicy); @@ -175,7 +175,7 @@ private: Q_DECLARE_PRIVATE(QStateMachine) Q_PRIVATE_SLOT(d_func(), void _q_start()) Q_PRIVATE_SLOT(d_func(), void _q_process()) -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) Q_PRIVATE_SLOT(d_func(), void _q_animationFinished()) #endif Q_PRIVATE_SLOT(d_func(), void _q_startDelayedEventTimer(int, int)) diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h index c28b162305..f3366ca5f7 100644 --- a/src/corelib/statemachine/qstatemachine_p.h +++ b/src/corelib/statemachine/qstatemachine_p.h @@ -297,7 +297,7 @@ public: void initializeAnimations(QAbstractState *state, const QList &selectedAnimations, const QList &exitedStates_sorted, QHash > &assignmentsForEnteredStates); -#endif // QT_NO_ANIMATION +#endif // animation QSignalEventGenerator *signalEventGenerator; -- cgit v1.2.3