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/parser/qqmljsmemorypool_p.h | |
parent | 53d1e9ed21d25e65a2f13606af479838f5f21fe7 (diff) | |
download | qtdeclarative-499ec43937e926e4f2fa57a9baa455fcb3862262.tar.gz |
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/parser/qqmljsmemorypool_p.h')
-rw-r--r-- | src/qml/parser/qqmljsmemorypool_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/parser/qqmljsmemorypool_p.h b/src/qml/parser/qqmljsmemorypool_p.h index 536f5d4239..5682d66f45 100644 --- a/src/qml/parser/qqmljsmemorypool_p.h +++ b/src/qml/parser/qqmljsmemorypool_p.h @@ -72,11 +72,11 @@ class QML_PARSER_EXPORT MemoryPool : public QSharedData public: MemoryPool() - : _blocks(0), + : _blocks(nullptr), _allocatedBlocks(0), _blockCount(-1), - _ptr(0), - _end(0) + _ptr(nullptr), + _end(nullptr) { } ~MemoryPool() @@ -105,7 +105,7 @@ public: void reset() { _blockCount = -1; - _ptr = _end = 0; + _ptr = _end = nullptr; } template <typename Tp> Tp *New() { return new (this->allocate(sizeof(Tp))) Tp(); } @@ -125,7 +125,7 @@ private: Q_CHECK_PTR(_blocks); for (int index = _blockCount; index < _allocatedBlocks; ++index) - _blocks[index] = 0; + _blocks[index] = nullptr; } char *&block = _blocks[_blockCount]; |