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/qv4internalclass.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/qv4internalclass.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4internalclass.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4internalclass.cpp b/src/qml/jsruntime/qv4internalclass.cpp index 4041052344..9da854e7d7 100644 --- a/src/qml/jsruntime/qv4internalclass.cpp +++ b/src/qml/jsruntime/qv4internalclass.cpp @@ -105,10 +105,10 @@ void PropertyHash::addEntry(const PropertyHash::Entry &entry, int classSize) InternalClass::InternalClass(ExecutionEngine *engine) : engine(engine) - , vtable(0) - , prototype(0) - , m_sealed(0) - , m_frozen(0) + , vtable(nullptr) + , prototype(nullptr) + , m_sealed(nullptr) + , m_frozen(nullptr) , size(0) , extensible(true) { @@ -124,8 +124,8 @@ InternalClass::InternalClass(const QV4::InternalClass &other) , propertyTable(other.propertyTable) , nameMap(other.nameMap) , propertyData(other.propertyData) - , m_sealed(0) - , m_frozen(0) + , m_sealed(nullptr) + , m_frozen(nullptr) , size(other.size) , extensible(other.extensible) , isUsedAsProto(other.isUsedAsProto) @@ -223,7 +223,7 @@ InternalClass *InternalClass::changePrototypeImpl(Heap::Object *proto) Q_ASSERT(prototype != proto); Q_ASSERT(!proto || proto->internalClass->isUsedAsProto); - Transition temp = { { nullptr }, 0, Transition::PrototypeChange }; + Transition temp = { { nullptr }, nullptr, Transition::PrototypeChange }; temp.prototype = proto; Transition &t = lookupOrInsertTransition(temp); @@ -487,7 +487,7 @@ void InternalClass::destroy() destroyStack.pop_back(); if (!next->engine) continue; - next->engine = 0; + next->engine = nullptr; next->propertyTable.~PropertyHash(); next->nameMap.~SharedInternalClassData<Identifier *>(); next->propertyData.~SharedInternalClassData<PropertyAttributes>(); |