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/qml/qml/qqmlerror.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/qml/qml/qqmlerror.cpp')
-rw-r--r-- | src/qml/qml/qqmlerror.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlerror.cpp b/src/qml/qml/qqmlerror.cpp index 1b264b025c..fc5b186b29 100644 --- a/src/qml/qml/qqmlerror.cpp +++ b/src/qml/qml/qqmlerror.cpp @@ -99,7 +99,7 @@ QQmlErrorPrivate::QQmlErrorPrivate() Creates an empty error object. */ QQmlError::QQmlError() -: d(0) +: d(nullptr) { } @@ -107,7 +107,7 @@ QQmlError::QQmlError() Creates a copy of \a other. */ QQmlError::QQmlError(const QQmlError &other) -: d(0) +: d(nullptr) { *this = other; } @@ -119,7 +119,7 @@ QQmlError &QQmlError::operator=(const QQmlError &other) { if (!other.d) { delete d; - d = 0; + d = nullptr; } else { if (!d) d = new QQmlErrorPrivate; @@ -138,7 +138,7 @@ QQmlError &QQmlError::operator=(const QQmlError &other) */ QQmlError::~QQmlError() { - delete d; d = 0; + delete d; d = nullptr; } /*! @@ -146,7 +146,7 @@ QQmlError::~QQmlError() */ bool QQmlError::isValid() const { - return d != 0; + return d != nullptr; } /*! @@ -239,7 +239,7 @@ QObject *QQmlError::object() const { if (d) return d->object; - return 0; + return nullptr; } /*! |