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/ftw/qpodvector_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/ftw/qpodvector_p.h')
-rw-r--r-- | src/qml/qml/ftw/qpodvector_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/ftw/qpodvector_p.h b/src/qml/qml/ftw/qpodvector_p.h index cafe3367de..d0e4f89741 100644 --- a/src/qml/qml/ftw/qpodvector_p.h +++ b/src/qml/qml/ftw/qpodvector_p.h @@ -61,7 +61,7 @@ class QPODVector { public: QPODVector() - : m_count(0), m_capacity(0), m_data(0) {} + : m_count(0), m_capacity(0), m_data(nullptr) {} ~QPODVector() { if (m_data) ::free(m_data); } const T &at(int idx) const { @@ -154,7 +154,7 @@ public: other.m_data = m_data; m_count = 0; m_capacity = 0; - m_data = 0; + m_data = nullptr; } QPODVector<T,Increment> &operator<<(const T &v) { append(v); return *this; } |