From 5747f3139219abd6c8670953620cee1f5584caba Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 29 Jul 2020 16:30:13 +0200 Subject: Another round of 0->nullptr cleanup Change-Id: Ic8db7dc252f8fea46eb5a4f334726d6c7f4645a6 Reviewed-by: Sona Kurazyan --- src/corelib/animation/qabstractanimation.cpp | 4 ++-- src/corelib/animation/qpropertyanimation.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/corelib/animation') 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 -- cgit v1.2.3