From 499ec43937e926e4f2fa57a9baa455fcb3862262 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Wed, 21 Feb 2018 10:41:54 +0100 Subject: 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 --- src/qml/qml/qqmlcleanup.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/qml/qml/qqmlcleanup.cpp') diff --git a/src/qml/qml/qqmlcleanup.cpp b/src/qml/qml/qqmlcleanup.cpp index 708537a303..0d57ef5fe8 100644 --- a/src/qml/qml/qqmlcleanup.cpp +++ b/src/qml/qml/qqmlcleanup.cpp @@ -58,7 +58,7 @@ called by QQmlEngine just before it destroys the context. Create a QQmlCleanup that is not associated with any engine. */ QQmlCleanup::QQmlCleanup() -: prev(0), next(0), engine(0) +: prev(nullptr), next(nullptr), engine(nullptr) { } @@ -66,7 +66,7 @@ QQmlCleanup::QQmlCleanup() Create a QQmlCleanup for \a engine */ QQmlCleanup::QQmlCleanup(QQmlEngine *engine) -: prev(0), next(0), engine(0) +: prev(nullptr), next(nullptr), engine(nullptr) { if (!engine) return; @@ -109,8 +109,8 @@ QQmlCleanup::~QQmlCleanup() if (prev) *prev = next; if (next) next->prev = prev; - prev = 0; - next = 0; + prev = nullptr; + next = nullptr; } QT_END_NAMESPACE -- cgit v1.2.3