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/qv4persistent_p.h | |
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/qv4persistent_p.h')
-rw-r--r-- | src/qml/jsruntime/qv4persistent_p.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/qml/jsruntime/qv4persistent_p.h b/src/qml/jsruntime/qv4persistent_p.h index 1f838f5531..5a0b2389e1 100644 --- a/src/qml/jsruntime/qv4persistent_p.h +++ b/src/qml/jsruntime/qv4persistent_p.h @@ -81,7 +81,7 @@ struct Q_QML_EXPORT PersistentValueStorage Value &operator *(); }; Iterator begin() { return Iterator(firstPage, 0); } - Iterator end() { return Iterator(0, 0); } + Iterator end() { return Iterator(nullptr, 0); } static ExecutionEngine *getEngine(Value *v); @@ -94,7 +94,7 @@ private: class Q_QML_EXPORT PersistentValue { public: - PersistentValue() : val(0) {} + PersistentValue() : val(nullptr) {} PersistentValue(const PersistentValue &other); PersistentValue &operator=(const PersistentValue &other); PersistentValue &operator=(const WeakValue &other); @@ -117,19 +117,19 @@ public: } Managed *asManaged() const { if (!val) - return 0; + return nullptr; return val->managed(); } template<typename T> T *as() const { if (!val) - return 0; + return nullptr; return val->as<T>(); } ExecutionEngine *engine() const { if (!val) - return 0; + return nullptr; return PersistentValueStorage::getEngine(val); } @@ -137,7 +137,7 @@ public: bool isNullOrUndefined() const { return !val || val->isNullOrUndefined(); } void clear() { PersistentValueStorage::free(val); - val = 0; + val = nullptr; } bool isEmpty() { return !val; } @@ -148,7 +148,7 @@ private: class Q_QML_EXPORT WeakValue { public: - WeakValue() : val(0) {} + WeakValue() : val(nullptr) {} WeakValue(const WeakValue &other); WeakValue(ExecutionEngine *engine, const Value &value); WeakValue &operator=(const WeakValue &other); @@ -183,19 +183,19 @@ public: } Managed *asManaged() const { if (!val) - return 0; + return nullptr; return val->managed(); } template <typename T> T *as() const { if (!val) - return 0; + return nullptr; return val->as<T>(); } ExecutionEngine *engine() const { if (!val) - return 0; + return nullptr; return PersistentValueStorage::getEngine(val); } |