aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/layouts/qquicklinearlayout.cpp
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2018-02-21 10:41:54 +0100
committerShawn Rutledge <shawn.rutledge@qt.io>2018-02-26 07:13:18 +0000
commit499ec43937e926e4f2fa57a9baa455fcb3862262 (patch)
tree206c90d47387f8322b68f5e3db613189397e1af3 /src/imports/layouts/qquicklinearlayout.cpp
parent53d1e9ed21d25e65a2f13606af479838f5f21fe7 (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/imports/layouts/qquicklinearlayout.cpp')
-rw-r--r--src/imports/layouts/qquicklinearlayout.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/layouts/qquicklinearlayout.cpp b/src/imports/layouts/qquicklinearlayout.cpp
index db983e06ba..fa51ef1f2f 100644
--- a/src/imports/layouts/qquicklinearlayout.cpp
+++ b/src/imports/layouts/qquicklinearlayout.cpp
@@ -653,13 +653,13 @@ void QQuickGridLayout::insertLayoutItems()
const auto items = childItems();
for (QQuickItem *child : items) {
checkAnchors(child);
- QQuickLayoutAttached *info = 0;
+ QQuickLayoutAttached *info = nullptr;
// Will skip all items with effective maximum width/height == 0
if (shouldIgnoreItem(child, info, sizeHints))
continue;
- Qt::Alignment alignment = 0;
+ Qt::Alignment alignment = nullptr;
int row = -1;
int column = -1;
int span[2] = {1,1};
@@ -828,13 +828,13 @@ void QQuickLinearLayout::insertLayoutItems()
for (QQuickItem *child : items) {
Q_ASSERT(child);
checkAnchors(child);
- QQuickLayoutAttached *info = 0;
+ QQuickLayoutAttached *info = nullptr;
// Will skip all items with effective maximum width/height == 0
if (shouldIgnoreItem(child, info, sizeHints))
continue;
- Qt::Alignment alignment = 0;
+ Qt::Alignment alignment = nullptr;
if (info)
alignment = info->alignment();