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/jsapi/qjsvalue_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/jsapi/qjsvalue_p.h')
-rw-r--r-- | src/qml/jsapi/qjsvalue_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsapi/qjsvalue_p.h b/src/qml/jsapi/qjsvalue_p.h index c4761ad6ea..62e09f72be 100644 --- a/src/qml/jsapi/qjsvalue_p.h +++ b/src/qml/jsapi/qjsvalue_p.h @@ -68,7 +68,7 @@ public: static inline QV4::Value *getValue(const QJSValue *jsval) { if (jsval->d & 3) - return 0; + return nullptr; return reinterpret_cast<QV4::Value *>(jsval->d); } @@ -76,7 +76,7 @@ public: { if (jsval->d & 1) return reinterpret_cast<QVariant *>(jsval->d & ~3); - return 0; + return nullptr; } static inline void setVariant(QJSValue *jsval, const QVariant &v) { @@ -153,14 +153,14 @@ public: *v = QV4::Encode(variant->toUInt()); break; default: - return 0; + return nullptr; } return v; } static QV4::ExecutionEngine *engine(const QJSValue *jsval) { QV4::Value *v = getValue(jsval); - return v ? QV4::PersistentValueStorage::getEngine(v) : 0; + return v ? QV4::PersistentValueStorage::getEngine(v) : nullptr; } static inline bool checkEngine(QV4::ExecutionEngine *e, const QJSValue &jsval) { |