From 499ec43937e926e4f2fa57a9baa455fcb3862262 Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@qt.io>
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 <simon.hausmann@qt.io>
---
 .../qmltooling/qmldbg_debugger/qv4datacollector.cpp  | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp')

diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
index a538956e8e..c86f3d1803 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
@@ -69,19 +69,19 @@ QV4::Heap::ExecutionContext *QV4DataCollector::findContext(int frame)
 {
     QV4::CppStackFrame *f = findFrame(frame);
 
-    return f ? f->context()->d() : 0;
+    return f ? f->context()->d() : nullptr;
 }
 
 QV4::Heap::CallContext *QV4DataCollector::findScope(QV4::Heap::ExecutionContext *ctx, int scope)
 {
     if (!ctx)
-        return 0;
+        return nullptr;
 
     for (; scope > 0 && ctx; --scope)
         ctx = ctx->outer;
 
     return (ctx && ctx->type == QV4::Heap::ExecutionContext::Type_CallContext) ?
-                static_cast<QV4::Heap::CallContext *>(ctx) : 0;
+                static_cast<QV4::Heap::CallContext *>(ctx) : nullptr;
 }
 
 QVector<QV4::Heap::ExecutionContext::ContextType> QV4DataCollector::getScopeTypes(int frame)
@@ -139,16 +139,16 @@ const QV4::Object *collectProperty(const QV4::ScopedValue &value, QV4::Execution
     switch (value->type()) {
     case QV4::Value::Empty_Type:
         Q_ASSERT(!"empty Value encountered");
-        return 0;
+        return nullptr;
     case QV4::Value::Undefined_Type:
         dict.insert(valueKey, QJsonValue::Undefined);
-        return 0;
+        return nullptr;
     case QV4::Value::Null_Type:
         dict.insert(valueKey, QJsonValue::Null);
-        return 0;
+        return nullptr;
     case QV4::Value::Boolean_Type:
         dict.insert(valueKey, value->booleanValue());
-        return 0;
+        return nullptr;
     case QV4::Value::Managed_Type:
         if (const QV4::String *s = value->as<QV4::String>()) {
             dict.insert(valueKey, s->toQString());
@@ -176,10 +176,10 @@ const QV4::Object *collectProperty(const QV4::ScopedValue &value, QV4::Execution
         } else {
             Q_UNREACHABLE();
         }
-        return 0;
+        return nullptr;
     case QV4::Value::Integer_Type:
         dict.insert(valueKey, value->integerValue());
-        return 0;
+        return nullptr;
     default: {// double
         const double val = value->doubleValue();
         if (qIsFinite(val))
@@ -190,7 +190,7 @@ const QV4::Object *collectProperty(const QV4::ScopedValue &value, QV4::Execution
             dict.insert(valueKey, QStringLiteral("-Infinity"));
         else
             dict.insert(valueKey, QStringLiteral("Infinity"));
-        return 0;
+        return nullptr;
     }
     }
 }
-- 
cgit v1.2.3