aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/layouts
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/layouts')
-rw-r--r--src/imports/layouts/plugin.cpp2
-rw-r--r--src/imports/layouts/qquickgridlayoutengine.cpp2
-rw-r--r--src/imports/layouts/qquicklayout.cpp4
-rw-r--r--src/imports/layouts/qquicklinearlayout.cpp8
-rw-r--r--src/imports/layouts/qquickstacklayout.cpp4
5 files changed, 10 insertions, 10 deletions
diff --git a/src/imports/layouts/plugin.cpp b/src/imports/layouts/plugin.cpp
index fc3938c5d8..25d5bacc90 100644
--- a/src/imports/layouts/plugin.cpp
+++ b/src/imports/layouts/plugin.cpp
@@ -57,7 +57,7 @@ class QtQuickLayoutsPlugin : public QQmlExtensionPlugin
Q_OBJECT
Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
public:
- QtQuickLayoutsPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent)
+ QtQuickLayoutsPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent)
{
initResources();
}
diff --git a/src/imports/layouts/qquickgridlayoutengine.cpp b/src/imports/layouts/qquickgridlayoutengine.cpp
index fe716f0694..6004bb92ca 100644
--- a/src/imports/layouts/qquickgridlayoutengine.cpp
+++ b/src/imports/layouts/qquickgridlayoutengine.cpp
@@ -55,7 +55,7 @@ Qt::Alignment QQuickGridLayoutEngine::alignment(QQuickItem *quickItem) const
{
if (QGridLayoutItem *item = findLayoutItem(quickItem))
return item->alignment();
- return 0;
+ return nullptr;
}
QT_END_NAMESPACE
diff --git a/src/imports/layouts/qquicklayout.cpp b/src/imports/layouts/qquicklayout.cpp
index 3bfdea5be7..b3a5a2cfc8 100644
--- a/src/imports/layouts/qquicklayout.cpp
+++ b/src/imports/layouts/qquicklayout.cpp
@@ -114,7 +114,7 @@ QQuickLayoutAttached::QQuickLayoutAttached(QObject *parent)
m_isTopMarginSet(false),
m_isRightMarginSet(false),
m_isBottomMarginSet(false),
- m_alignment(0)
+ m_alignment(nullptr)
{
}
@@ -683,7 +683,7 @@ QQuickLayout *QQuickLayoutAttached::parentLayout() const
} else {
qmlWarning(parent()) << "Layout must be attached to Item elements";
}
- return 0;
+ return nullptr;
}
QQuickItem *QQuickLayoutAttached::item() const
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();
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;