diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-11-21 13:10:02 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-11-22 10:27:21 +0100 |
commit | 744e77b841878fb017c0f2d60607090008f28180 (patch) | |
tree | ef0f95935b0d6bd589f1abfc19d637c1172a96d5 /src/imports | |
parent | 89fc75c667adc23036cbbdb4bf56251d7b988a6b (diff) |
Avoid initializing QFlags with 0 or nullptr
It is being deprecated.
Change-Id: I844bd92af85bc53a8fc0371408d05277bd49f511
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/folderlistmodel/qquickfolderlistmodel.cpp | 2 | ||||
-rw-r--r-- | src/imports/layouts/qquickgridlayoutengine_p.h | 2 | ||||
-rw-r--r-- | src/imports/layouts/qquicklinearlayout.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp index f5acfd86b7..26c6d4032f 100644 --- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp +++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp @@ -107,7 +107,7 @@ void QQuickFolderListModelPrivate::updateSorting() { Q_Q(QQuickFolderListModel); - QDir::SortFlags flags = nullptr; + QDir::SortFlags flags; switch (sortField) { case QQuickFolderListModel::Unsorted: diff --git a/src/imports/layouts/qquickgridlayoutengine_p.h b/src/imports/layouts/qquickgridlayoutengine_p.h index 2810e2e5d0..c53be89477 100644 --- a/src/imports/layouts/qquickgridlayoutengine_p.h +++ b/src/imports/layouts/qquickgridlayoutengine_p.h @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE class QQuickGridLayoutItem : public QGridLayoutItem { public: QQuickGridLayoutItem(QQuickItem *item, int row, int column, - int rowSpan = 1, int columnSpan = 1, Qt::Alignment alignment = 0) + int rowSpan = 1, int columnSpan = 1, Qt::Alignment alignment = { }) : QGridLayoutItem(row, column, rowSpan, columnSpan, alignment), m_item(item), sizeHintCacheDirty(true), useFallbackToWidthOrHeight(true) {} diff --git a/src/imports/layouts/qquicklinearlayout.cpp b/src/imports/layouts/qquicklinearlayout.cpp index c8d2ac5eb2..d89e575372 100644 --- a/src/imports/layouts/qquicklinearlayout.cpp +++ b/src/imports/layouts/qquicklinearlayout.cpp @@ -665,7 +665,7 @@ void QQuickGridLayout::insertLayoutItems() if (shouldIgnoreItem(child, info, sizeHints)) continue; - Qt::Alignment alignment = nullptr; + Qt::Alignment alignment; int row = -1; int column = -1; int span[2] = {1,1}; @@ -854,7 +854,7 @@ void QQuickLinearLayout::insertLayoutItems() if (shouldIgnoreItem(child, info, sizeHints)) continue; - Qt::Alignment alignment = nullptr; + Qt::Alignment alignment; if (info) alignment = info->alignment(); |