diff options
Diffstat (limited to 'src/corelib/animation')
| -rw-r--r-- | src/corelib/animation/qabstractanimation.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/animation/qpropertyanimation.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp index b7136dc055..52adc343ab 100644 --- a/src/corelib/animation/qabstractanimation.cpp +++ b/src/corelib/animation/qabstractanimation.cpp @@ -235,7 +235,7 @@ QUnifiedTimer *QUnifiedTimer::instance(bool create) inst = new QUnifiedTimer; unifiedTimer()->setLocalData(inst); } else { - inst = unifiedTimer() ? unifiedTimer()->localData() : 0; + inst = unifiedTimer() ? unifiedTimer()->localData() : nullptr; } return inst; } @@ -565,7 +565,7 @@ QAnimationTimer *QAnimationTimer::instance(bool create) inst = new QAnimationTimer; animationTimer()->setLocalData(inst); } else { - inst = animationTimer() ? animationTimer()->localData() : 0; + inst = animationTimer() ? animationTimer()->localData() : nullptr; } #else Q_UNUSED(create); diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp index d014b5c441..be2bed0a07 100644 --- a/src/corelib/animation/qpropertyanimation.cpp +++ b/src/corelib/animation/qpropertyanimation.cpp @@ -271,7 +271,7 @@ void QPropertyAnimation::updateState(QAbstractAnimation::State newState, QPropertyAnimationPair key(d->targetValue, d->propertyName); if (newState == Running) { d->updateMetaProperty(); - animToStop = hash.value(key, 0); + animToStop = hash.value(key, nullptr); hash.insert(key, this); locker.unlock(); // update the default start value |