summaryrefslogtreecommitdiff
path: root/src/imports/layouts/qquickstacklayout.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/qquickstacklayout.cpp
parent53d1e9ed21d25e65a2f13606af479838f5f21fe7 (diff)
downloadqtdeclarative-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/imports/layouts/qquickstacklayout.cpp')
-rw-r--r--src/imports/layouts/qquickstacklayout.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/layouts/qquickstacklayout.cpp b/src/imports/layouts/qquickstacklayout.cpp
index cf70856e14..0b51d79bef 100644
--- a/src/imports/layouts/qquickstacklayout.cpp
+++ b/src/imports/layouts/qquickstacklayout.cpp
@@ -213,7 +213,7 @@ QQuickItem *QQuickStackLayout::itemAt(int index) const
return item;
--index;
}
- return 0;
+ return nullptr;
}
int QQuickStackLayout::itemCount() const
@@ -320,7 +320,7 @@ void QQuickStackLayout::rearrange(const QSizeF &newSize)
void QQuickStackLayout::collectItemSizeHints(QQuickItem *item, QSizeF *sizeHints)
{
- QQuickLayoutAttached *info = 0;
+ QQuickLayoutAttached *info = nullptr;
QQuickLayout::effectiveSizeHints_helper(item, sizeHints, &info, true);
if (!info)
return;