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/jsruntime/qv4managed.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/jsruntime/qv4managed.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4managed.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4managed.cpp b/src/qml/jsruntime/qv4managed.cpp index 200380eda0..b50e5f0355 100644 --- a/src/qml/jsruntime/qv4managed.cpp +++ b/src/qml/jsruntime/qv4managed.cpp @@ -46,7 +46,7 @@ using namespace QV4; const VTable Managed::static_vtbl = { - 0, + nullptr, 0, 0, Managed::IsExecutionContext, @@ -58,15 +58,15 @@ const VTable Managed::static_vtbl = 0, Managed::MyType, "Managed", - 0, - 0 /*markObjects*/, + nullptr, + nullptr /*markObjects*/, isEqualTo }; QString Managed::className() const { - const char *s = 0; + const char *s = nullptr; switch (Type(d()->vtable()->type)) { case Type_Invalid: case Type_String: |