summaryrefslogtreecommitdiffstats
path: root/examples/widgets/layouts/flowlayout
diff options
context:
space:
mode:
authorChristian Ehrlicher <ch.ehrlicher@gmx.de>2018-12-02 14:11:13 +0100
committerChristian Ehrlicher <ch.ehrlicher@gmx.de>2019-01-23 15:13:45 +0000
commitaa32510430d6a5e58cb456faeb072d9f189872fe (patch)
tree449096e9edff2056d186e0b0d1ae19d52d21652b /examples/widgets/layouts/flowlayout
parentc590aa678d5c27162b0ca7191fa76b1d3a112767 (diff)
Cleanup Widgets examples - nullptr
Cleanup the widgets examples - replace 0 with nullptr Change-Id: Id4bf119b9a41f6d10117f3a613a6e604128fa196 Reviewed-by: Konstantin Shegunov <kshegunov@gmail.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'examples/widgets/layouts/flowlayout')
-rw-r--r--examples/widgets/layouts/flowlayout/flowlayout.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/examples/widgets/layouts/flowlayout/flowlayout.cpp b/examples/widgets/layouts/flowlayout/flowlayout.cpp
index 9203da0ba1..b7064d98b1 100644
--- a/examples/widgets/layouts/flowlayout/flowlayout.cpp
+++ b/examples/widgets/layouts/flowlayout/flowlayout.cpp
@@ -116,8 +116,7 @@ QLayoutItem *FlowLayout::takeAt(int index)
{
if (index >= 0 && index < itemList.size())
return itemList.takeAt(index);
- else
- return 0;
+ return nullptr;
}
//! [5]
@@ -215,7 +214,7 @@ int FlowLayout::smartSpacing(QStyle::PixelMetric pm) const
return -1;
} else if (parent->isWidgetType()) {
QWidget *pw = static_cast<QWidget *>(parent);
- return pw->style()->pixelMetric(pm, 0, pw);
+ return pw->style()->pixelMetric(pm, nullptr, pw);
} else {
return static_cast<QLayout *>(parent)->spacing();
}