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/qquickstateoperations_p.h | |
parent | 53d1e9ed21d25e65a2f13606af479838f5f21fe7 (diff) | |
download | qtdeclarative-499ec43937e926e4f2fa57a9baa455fcb3862262.tar.gz |
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/qquickstateoperations_p.h')
-rw-r--r-- | src/quick/items/qquickstateoperations_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquickstateoperations_p.h b/src/quick/items/qquickstateoperations_p.h index d61ed294cb..e947b2213f 100644 --- a/src/quick/items/qquickstateoperations_p.h +++ b/src/quick/items/qquickstateoperations_p.h @@ -75,7 +75,7 @@ class Q_AUTOTEST_EXPORT QQuickParentChange : public QQuickStateOperation, public Q_PROPERTY(QQmlScriptString scale READ scale WRITE setScale) Q_PROPERTY(QQmlScriptString rotation READ rotation WRITE setRotation) public: - QQuickParentChange(QObject *parent=0); + QQuickParentChange(QObject *parent=nullptr); ~QQuickParentChange(); QQuickItem *object() const; @@ -138,7 +138,7 @@ class Q_AUTOTEST_EXPORT QQuickAnchorSet : public QObject Q_PROPERTY(QQmlScriptString baseline READ baseline WRITE setBaseline RESET resetBaseline) public: - QQuickAnchorSet(QObject *parent=0); + QQuickAnchorSet(QObject *parent=nullptr); virtual ~QQuickAnchorSet(); QQmlScriptString left() const; @@ -187,7 +187,7 @@ class Q_AUTOTEST_EXPORT QQuickAnchorChanges : public QQuickStateOperation, publi Q_PROPERTY(QQuickAnchorSet *anchors READ anchors CONSTANT) public: - QQuickAnchorChanges(QObject *parent=0); + QQuickAnchorChanges(QObject *parent=nullptr); ~QQuickAnchorChanges(); ActionList actions() override; |