diff options
Diffstat (limited to 'examples/widgets/animation/sub-attaq/qanimationstate.cpp')
| -rw-r--r-- | examples/widgets/animation/sub-attaq/qanimationstate.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/widgets/animation/sub-attaq/qanimationstate.cpp b/examples/widgets/animation/sub-attaq/qanimationstate.cpp index ae24af6da3..ce99f9080d 100644 --- a/examples/widgets/animation/sub-attaq/qanimationstate.cpp +++ b/examples/widgets/animation/sub-attaq/qanimationstate.cpp @@ -73,7 +73,7 @@ QAnimationState *s = new QAnimationState(machine->rootState()); QPropertyAnimation *animation = new QPropertyAnimation(obj, "pos"); s->setAnimation(animation); QState *s2 = new QState(machine->rootState()); -s->addTransition(s, SIGNAL(animationFinished()), s2); +s->addTransition(s, &QAnimationState::animationFinished, s2); machine.start(); \endcode @@ -84,7 +84,7 @@ machine.start(); Constructs a new state with the given \a parent state. */ QAnimationState::QAnimationState(QState *parent) - : QState(parent), m_animation(0) + : QState(parent), m_animation(nullptr) { } @@ -107,18 +107,18 @@ void QAnimationState::setAnimation(QAbstractAnimation *animation) //Disconnect from the previous animation if exist if(m_animation) - disconnect(m_animation, SIGNAL(finished()), this, SIGNAL(animationFinished())); + disconnect(m_animation, &QAbstractAnimation::finished, this, &QAnimationState::animationFinished); m_animation = animation; if (m_animation) { //connect the new animation - connect(m_animation, SIGNAL(finished()), this, SIGNAL(animationFinished())); + connect(m_animation, &QAbstractAnimation::finished, this, &QAnimationState::animationFinished); } } /*! - Returns the animation handle by this animation state, or 0 if there is no animation. + Returns the animation handle by this animation state, or \nullptr if there is no animation. */ QAbstractAnimation* QAnimationState::animation() const { |