aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util/qquickstate_p.h
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2018-02-21 10:41:54 +0100
committerShawn Rutledge <shawn.rutledge@qt.io>2018-02-26 07:13:18 +0000
commit499ec43937e926e4f2fa57a9baa455fcb3862262 (patch)
tree206c90d47387f8322b68f5e3db613189397e1af3 /src/quick/util/qquickstate_p.h
parent53d1e9ed21d25e65a2f13606af479838f5f21fe7 (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/util/qquickstate_p.h')
-rw-r--r--src/quick/util/qquickstate_p.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/util/qquickstate_p.h b/src/quick/util/qquickstate_p.h
index f551402e80..89af5882df 100644
--- a/src/quick/util/qquickstate_p.h
+++ b/src/quick/util/qquickstate_p.h
@@ -126,7 +126,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickStateOperation : public QObject
{
Q_OBJECT
public:
- QQuickStateOperation(QObject *parent = 0)
+ QQuickStateOperation(QObject *parent = nullptr)
: QObject(parent) {}
typedef QList<QQuickStateAction> ActionList;
@@ -136,7 +136,7 @@ public:
void setState(QQuickState *state);
protected:
- QQuickStateOperation(QObjectPrivate &dd, QObject *parent = 0);
+ QQuickStateOperation(QObjectPrivate &dd, QObject *parent = nullptr);
private:
Q_DECLARE_PRIVATE(QQuickStateOperation)
@@ -159,7 +159,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickState : public QObject
Q_CLASSINFO("DeferredPropertyNames", "changes")
public:
- QQuickState(QObject *parent=0);
+ QQuickState(QObject *parent=nullptr);
virtual ~QQuickState();
QString name() const;