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/qml/qqmlvmemetaobject_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/qml/qqmlvmemetaobject_p.h')
| -rw-r--r-- | src/qml/qml/qqmlvmemetaobject_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlvmemetaobject_p.h b/src/qml/qml/qqmlvmemetaobject_p.h index 7881240452..46bff68327 100644 --- a/src/qml/qml/qqmlvmemetaobject_p.h +++ b/src/qml/qml/qqmlvmemetaobject_p.h @@ -112,7 +112,7 @@ public: if (it->m_propertyIndex == propertyIndex) return true; } - if (auto parentInterceptor = ((parent.isT1() && parent.flag()) ? static_cast<QQmlInterceptorMetaObject *>(parent.asT1()) : 0)) + if (auto parentInterceptor = ((parent.isT1() && parent.flag()) ? static_cast<QQmlInterceptorMetaObject *>(parent.asT1()) : nullptr)) return parentInterceptor->intercepts(propertyIndex); return false; } @@ -141,7 +141,7 @@ inline QQmlInterceptorMetaObject *QQmlInterceptorMetaObject::get(QObject *obj) } } - return 0; + return nullptr; } class QQmlVMEMetaObjectEndpoint; @@ -243,7 +243,7 @@ QQmlVMEMetaObject *QQmlVMEMetaObject::get(QObject *obj) } } - return 0; + return nullptr; } int QQmlVMEMetaObject::propOffset() const @@ -271,7 +271,7 @@ QQmlVMEMetaObject *QQmlVMEMetaObject::parentVMEMetaObject() const if (parent.isT1() && parent.flag()) return static_cast<QQmlVMEMetaObject *>(parent.asT1()); - return 0; + return nullptr; } QT_END_NAMESPACE |