1 files changed, 19 insertions, 55 deletions

diff --git a/src/widgets/graphicsview/qgraphicsgridlayout.cpp b/src/widgets/graphicsview/qgraphicsgridlayout.cpp
index d9005afbef..e4599d20bb 100644
--- a/src/widgets/graphicsview/qgraphicsgridlayout.cpp
+++ b/src/widgets/graphicsview/qgraphicsgridlayout.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWidgets module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 /*!
     \class QGraphicsGridLayout
@@ -47,13 +11,16 @@
     \inmodule QtWidgets
 
     The most common way to use QGraphicsGridLayout is to construct an object
-    on the heap with no parent, add widgets and layouts by calling addItem(),
-    and finally assign the layout to a widget by calling
-    QGraphicsWidget::setLayout(). QGraphicsGridLayout automatically computes
+    on the heap, passing a parent widget to the constructor, then add widgets
+    and layouts by calling addItem(). QGraphicsGridLayout automatically computes
     the dimensions of the grid as you add items.
 
     \snippet code/src_gui_graphicsview_qgraphicsgridlayout.cpp 0
 
+    Alternatively, if you do not pass a parent widget to the layout's constructor,
+    you will need to call QGraphicsWidget::setLayout() to set this layout as the
+    top-level layout for that widget, the widget will take ownership of the layout.
+
     The layout takes ownership of the items. In some cases when the layout
     item also inherits from QGraphicsItem (such as QGraphicsWidget) there will be a
     ambiguity in ownership because the layout item belongs to two ownership hierarchies.
@@ -137,7 +104,7 @@ QGraphicsGridLayout::~QGraphicsGridLayout()
         // ~QGraphicsLayoutItem.
         removeAt(i);
         if (item) {
-            item->setParentLayoutItem(0);
+            item->setParentLayoutItem(nullptr);
             if (item->ownedByLayout())
                 delete item;
         }
@@ -179,7 +146,7 @@ void QGraphicsGridLayout::addItem(QGraphicsLayoutItem *item, int row, int column
 }
 
 /*!
-    \fn QGraphicsGridLayout::addItem(QGraphicsLayoutItem *item, int row, int column, Qt::Alignment alignment = 0)
+    \fn QGraphicsGridLayout::addItem(QGraphicsLayoutItem *item, int row, int column, Qt::Alignment alignment)
 
     Adds \a item to the grid on \a row and \a column. You can specify
     an optional \a alignment for \a item.
@@ -535,11 +502,11 @@ QGraphicsLayoutItem *QGraphicsGridLayout::itemAt(int row, int column) const
     Q_D(const QGraphicsGridLayout);
     if (row < 0 || row >= rowCount() || column < 0 || column >= columnCount()) {
         qWarning("QGraphicsGridLayout::itemAt: invalid row, column %d, %d", row, column);
-        return 0;
+        return nullptr;
     }
     if (QGraphicsGridLayoutEngineItem *engineItem = static_cast<QGraphicsGridLayoutEngineItem*>(d->engine.itemAt(row, column)))
         return engineItem->layoutItem();
-    return 0;
+    return nullptr;
 }
 
 /*!
@@ -552,20 +519,19 @@ int QGraphicsGridLayout::count() const
 }
 
 /*!
-    Returns the layout item at \a index, or 0 if there is no layout item at
-    this index.
+    Returns the layout item at \a index, or \nullptr if there is no
+    layout item at this index.
 */
 QGraphicsLayoutItem *QGraphicsGridLayout::itemAt(int index) const
 {
     Q_D(const QGraphicsGridLayout);
     if (index < 0 || index >= d->engine.itemCount()) {
         qWarning("QGraphicsGridLayout::itemAt: invalid index %d", index);
-        return 0;
+        return nullptr;
     }
-    QGraphicsLayoutItem *item = 0;
     if (QGraphicsGridLayoutEngineItem *engineItem = static_cast<QGraphicsGridLayoutEngineItem*>(d->engine.itemAt(index)))
-        item = engineItem->layoutItem();
-    return item;
+        return engineItem->layoutItem();
+    return nullptr;
 }
 
 /*!
@@ -584,13 +550,11 @@ void QGraphicsGridLayout::removeAt(int index)
 
     if (QGraphicsGridLayoutEngineItem *gridItem = static_cast<QGraphicsGridLayoutEngineItem*>(d->engine.itemAt(index))) {
         if (QGraphicsLayoutItem *layoutItem = gridItem->layoutItem())
-            layoutItem->setParentLayoutItem(0);
+            layoutItem->setParentLayoutItem(nullptr);
         d->engine.removeItem(gridItem);
 
         // recalculate rowInfo.count if we remove an item that is on the right/bottommost row
-        for (int j = 0; j < NOrientations; ++j) {
-            // 0: Hor, 1: Ver
-            const Qt::Orientation orient = (j == 0 ? Qt::Horizontal : Qt::Vertical);
+        for (const Qt::Orientation orient : {Qt::Horizontal, Qt::Vertical}) {
             const int oldCount = d->engine.rowCount(orient);
             if (gridItem->lastRow(orient) == oldCount - 1) {
                 const int newCount = d->engine.effectiveLastRow(orient) + 1;