From 499ec43937e926e4f2fa57a9baa455fcb3862262 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Wed, 21 Feb 2018 10:41:54 +0100 Subject: 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 --- src/quick/items/qquickspriteengine_p.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/quick/items/qquickspriteengine_p.h') diff --git a/src/quick/items/qquickspriteengine_p.h b/src/quick/items/qquickspriteengine_p.h index ff02135799..416e6611b5 100644 --- a/src/quick/items/qquickspriteengine_p.h +++ b/src/quick/items/qquickspriteengine_p.h @@ -81,7 +81,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickStochasticState : public QObject //Currently Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) public: - QQuickStochasticState(QObject* parent = 0) + QQuickStochasticState(QObject* parent = nullptr) : QObject(parent) , m_duration(-1) , m_durationVariation(0) @@ -193,8 +193,8 @@ class Q_QUICK_PRIVATE_EXPORT QQuickStochasticEngine : public QObject Q_PROPERTY(QString globalGoal READ globalGoal WRITE setGlobalGoal NOTIFY globalGoalChanged) Q_PROPERTY(QQmlListProperty states READ states) public: - explicit QQuickStochasticEngine(QObject *parent = 0); - QQuickStochasticEngine(const QList &states, QObject *parent = 0); + explicit QQuickStochasticEngine(QObject *parent = nullptr); + QQuickStochasticEngine(const QList &states, QObject *parent = nullptr); ~QQuickStochasticEngine(); QQmlListProperty states() @@ -270,8 +270,8 @@ class Q_QUICK_PRIVATE_EXPORT QQuickSpriteEngine : public QQuickStochasticEngine Q_OBJECT Q_PROPERTY(QQmlListProperty sprites READ sprites) public: - explicit QQuickSpriteEngine(QObject *parent = 0); - QQuickSpriteEngine(const QList &sprites, QObject *parent = 0); + explicit QQuickSpriteEngine(QObject *parent = nullptr); + QQuickSpriteEngine(const QList &sprites, QObject *parent = nullptr); ~QQuickSpriteEngine(); QQmlListProperty sprites() { @@ -303,7 +303,7 @@ public: QImage assembledImage(int maxSize = 2048); private: - int pseudospriteProgress(int, int, int *rd = 0) const; + int pseudospriteProgress(int, int, int *rd = nullptr) const; QList m_sprites; bool m_startedImageAssembly; bool m_loaded; -- cgit v1.2.3