diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-02-21 10:41:54 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-02-26 07:13:18 +0000 |
| commit | 499ec43937e926e4f2fa57a9baa455fcb3862262 (patch) | |
| tree | 206c90d47387f8322b68f5e3db613189397e1af3 /src/quick/items/qquickpositioners.cpp | |
| parent | 53d1e9ed21d25e65a2f13606af479838f5f21fe7 (diff) | |
use nullptr consistently (clang-tidy)
From now on we prefer nullptr instead of 0 to clarify cases where
we are assigning or testing a pointer rather than a numeric zero.
Also, replaced cases where 0 was passed as Qt::KeyboardModifiers
with Qt::NoModifier (clang-tidy replaced them with nullptr, which
waas wrong, so it was just as well to make the tests more readable
rather than to revert those lines).
Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/quick/items/qquickpositioners.cpp')
| -rw-r--r-- | src/quick/items/qquickpositioners.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/quick/items/qquickpositioners.cpp b/src/quick/items/qquickpositioners.cpp index e752e2538f..493db51666 100644 --- a/src/quick/items/qquickpositioners.cpp +++ b/src/quick/items/qquickpositioners.cpp @@ -69,7 +69,7 @@ void QQuickBasePositionerPrivate::unwatchChanges(QQuickItem* other) QQuickBasePositioner::PositionedItem::PositionedItem(QQuickItem *i) : item(i) - , transitionableItem(0) + , transitionableItem(nullptr) , index(-1) , isNew(false) , isVisible(true) @@ -203,7 +203,7 @@ void QQuickBasePositioner::setSpacing(qreal s) QQuickTransition *QQuickBasePositioner::populate() const { Q_D(const QQuickBasePositioner); - return d->transitioner ? d->transitioner->populateTransition : 0; + return d->transitioner ? d->transitioner->populateTransition : nullptr; } void QQuickBasePositioner::setPopulate(QQuickTransition *transition) @@ -220,7 +220,7 @@ void QQuickBasePositioner::setPopulate(QQuickTransition *transition) QQuickTransition *QQuickBasePositioner::move() const { Q_D(const QQuickBasePositioner); - return d->transitioner ? d->transitioner->displacedTransition : 0; + return d->transitioner ? d->transitioner->displacedTransition : nullptr; } void QQuickBasePositioner::setMove(QQuickTransition *mt) @@ -238,7 +238,7 @@ void QQuickBasePositioner::setMove(QQuickTransition *mt) QQuickTransition *QQuickBasePositioner::add() const { Q_D(const QQuickBasePositioner); - return d->transitioner ? d->transitioner->addTransition : 0; + return d->transitioner ? d->transitioner->addTransition : nullptr; } void QQuickBasePositioner::setAdd(QQuickTransition *add) @@ -460,15 +460,15 @@ void QQuickBasePositioner::updateAttachedProperties(QQuickPositionerAttached *sp // be changed to run only when there are attached properties present. This // could be a flag in the positioner that is set by the attached property // constructor. - QQuickPositionerAttached *prevLastProperty = 0; - QQuickPositionerAttached *lastProperty = 0; + QQuickPositionerAttached *prevLastProperty = nullptr; + QQuickPositionerAttached *lastProperty = nullptr; for (int ii = 0; ii < positionedItems.count(); ++ii) { const PositionedItem &child = positionedItems.at(ii); if (!child.item) continue; - QQuickPositionerAttached *property = 0; + QQuickPositionerAttached *property = nullptr; if (specificProperty) { if (specificPropertyOwner == child.item) { @@ -503,7 +503,7 @@ void QQuickBasePositioner::updateAttachedProperties(QQuickPositionerAttached *sp if (!child.item) continue; - QQuickPositionerAttached *property = 0; + QQuickPositionerAttached *property = nullptr; if (specificProperty) { if (specificPropertyOwner == child.item) { |