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 --- tools/qmltime/qmltime.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/qmltime') diff --git a/tools/qmltime/qmltime.cpp b/tools/qmltime/qmltime.cpp index b337ccac5c..b897d304fc 100644 --- a/tools/qmltime/qmltime.cpp +++ b/tools/qmltime/qmltime.cpp @@ -66,10 +66,10 @@ private: }; QML_DECLARE_TYPE(Timer); -Timer *Timer::m_timer = 0; +Timer *Timer::m_timer = nullptr; Timer::Timer() - : m_component(0) + : m_component(nullptr) , m_willparent(false) , m_item(new QQuickItem) { -- cgit v1.2.3