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/qqmlguard_p.h | |
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/qqmlguard_p.h')
-rw-r--r-- | src/qml/qml/qqmlguard_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlguard_p.h b/src/qml/qml/qqmlguard_p.h index 52526276be..87c3677d29 100644 --- a/src/qml/qml/qqmlguard_p.h +++ b/src/qml/qml/qqmlguard_p.h @@ -113,18 +113,18 @@ Q_DECLARE_METATYPE(QQmlGuard<QObject>) QT_BEGIN_NAMESPACE QQmlGuardImpl::QQmlGuardImpl() -: o(0), next(0), prev(0) +: o(nullptr), next(nullptr), prev(nullptr) { } QQmlGuardImpl::QQmlGuardImpl(QObject *g) -: o(g), next(0), prev(0) +: o(g), next(nullptr), prev(nullptr) { if (o) addGuard(); } QQmlGuardImpl::QQmlGuardImpl(const QQmlGuardImpl &g) -: o(g.o), next(0), prev(0) +: o(g.o), next(nullptr), prev(nullptr) { if (o) addGuard(); } @@ -132,7 +132,7 @@ QQmlGuardImpl::QQmlGuardImpl(const QQmlGuardImpl &g) QQmlGuardImpl::~QQmlGuardImpl() { if (prev) remGuard(); - o = 0; + o = nullptr; } void QQmlGuardImpl::addGuard() @@ -155,8 +155,8 @@ void QQmlGuardImpl::remGuard() if (next) next->prev = prev; *prev = next; - next = 0; - prev = 0; + next = nullptr; + prev = nullptr; } template<class T> |