aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util/qquickanimator_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/qquickanimator_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/qquickanimator_p.h')
-rw-r--r--src/quick/util/qquickanimator_p.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/quick/util/qquickanimator_p.h b/src/quick/util/qquickanimator_p.h
index 92c66299dc..511cecda7f 100644
--- a/src/quick/util/qquickanimator_p.h
+++ b/src/quick/util/qquickanimator_p.h
@@ -94,8 +94,8 @@ protected:
TransitionDirection,
QObject *) override;
- QQuickAnimator(QQuickAnimatorPrivate &dd, QObject *parent = 0);
- QQuickAnimator(QObject *parent = 0);
+ QQuickAnimator(QQuickAnimatorPrivate &dd, QObject *parent = nullptr);
+ QQuickAnimator(QObject *parent = nullptr);
Q_SIGNALS:
void targetItemChanged(QQuickItem *);
@@ -110,7 +110,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickScaleAnimator : public QQuickAnimator
{
Q_OBJECT
public:
- QQuickScaleAnimator(QObject *parent = 0);
+ QQuickScaleAnimator(QObject *parent = nullptr);
protected:
QQuickAnimatorJob *createJob() const override;
QString propertyName() const override { return QStringLiteral("scale"); }
@@ -120,7 +120,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickXAnimator : public QQuickAnimator
{
Q_OBJECT
public:
- QQuickXAnimator(QObject *parent = 0);
+ QQuickXAnimator(QObject *parent = nullptr);
protected:
QQuickAnimatorJob *createJob() const override;
QString propertyName() const override { return QStringLiteral("x"); }
@@ -130,7 +130,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickYAnimator : public QQuickAnimator
{
Q_OBJECT
public:
- QQuickYAnimator(QObject *parent = 0);
+ QQuickYAnimator(QObject *parent = nullptr);
protected:
QQuickAnimatorJob *createJob() const override;
QString propertyName() const override { return QStringLiteral("y"); }
@@ -140,7 +140,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickOpacityAnimator : public QQuickAnimator
{
Q_OBJECT
public:
- QQuickOpacityAnimator(QObject *parent = 0);
+ QQuickOpacityAnimator(QObject *parent = nullptr);
protected:
QQuickAnimatorJob *createJob() const override;
QString propertyName() const override { return QStringLiteral("opacity"); }
@@ -157,7 +157,7 @@ public:
enum RotationDirection { Numerical, Shortest, Clockwise, Counterclockwise };
Q_ENUM(RotationDirection)
- QQuickRotationAnimator(QObject *parent = 0);
+ QQuickRotationAnimator(QObject *parent = nullptr);
void setDirection(RotationDirection dir);
RotationDirection direction() const;
@@ -179,7 +179,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickUniformAnimator : public QQuickAnimator
Q_PROPERTY(QString uniform READ uniform WRITE setUniform NOTIFY uniformChanged)
public:
- QQuickUniformAnimator(QObject *parent = 0);
+ QQuickUniformAnimator(QObject *parent = nullptr);
QString uniform() const;
void setUniform(const QString &);