1 files changed, 19 insertions, 69 deletions
diff --git a/src/widgets/doc/snippets/qtreewidget-using/mainwindow.cpp b/src/widgets/doc/snippets/qtreewidget-using/mainwindow.cpp
index ee7e028a13..8042f4549a 100644
--- a/src/widgets/doc/snippets/qtreewidget-using/mainwindow.cpp
+++ b/src/widgets/doc/snippets/qtreewidget-using/mainwindow.cpp
@@ -1,54 +1,7 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** 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.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtGui>
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+#include <QtWidgets>
 
 #include "mainwindow.h"
 
@@ -90,16 +43,15 @@ MainWindow::MainWindow()
     treeWidget->setHeaderLabels(headers);
 //! [2]
 
-    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
-    connect(ascendingAction, SIGNAL(triggered()), this, SLOT(sortAscending()));
-    connect(autoSortAction, SIGNAL(triggered()), this, SLOT(updateSortItems()));
-    connect(descendingAction, SIGNAL(triggered()), this, SLOT(sortDescending()));
-    connect(findItemsAction, SIGNAL(triggered()), this, SLOT(findItems()));
-    connect(insertAction, SIGNAL(triggered()), this, SLOT(insertItem()));
-    connect(removeAction, SIGNAL(triggered()), this, SLOT(removeItem()));
-    connect(treeWidget,
-            SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
-            this, SLOT(updateMenus(QTreeWidgetItem*)));
+    connect(quitAction, &QAction::triggered, this, &QWidget::close);
+    connect(ascendingAction, &QAction::triggered, this, &MainWindow::sortAscending);
+    connect(autoSortAction, &QAction::triggered, this, &MainWindow::updateSortItems);
+    connect(descendingAction, &QAction::triggered, this, &MainWindow::sortDescending);
+    connect(findItemsAction, &QAction::triggered, this, &MainWindow::findItems);
+    connect(insertAction, &QAction::triggered, this, &MainWindow::insertItem);
+    connect(removeAction, &QAction::triggered, this, &MainWindow::removeItem);
+    connect(treeWidget, &QTreeWidget::currentItemChanged,
+            this, &MainWindow::updateMenus);
 
     setupTreeItems();
     updateMenus(treeWidget->currentItem());
@@ -150,18 +102,16 @@ void MainWindow::findItems()
     if (itemText.isEmpty())
         return;
 
-//! [6]
-    QTreeWidgetItem *item;
-//! [6]
-    foreach (item, treeWidget->selectedItems())
-        treeWidget->setItemSelected(item, false);
+    const QList<QTreeWidgetItem *> items = treeWidget->selectedItems();
+    for (QTreeWidgetItem *item : items)
+        item->setSelected(false);
 
 //! [7]
-    QList<QTreeWidgetItem *> found = treeWidget->findItems(
+    const QList<QTreeWidgetItem *> found = treeWidget->findItems(
         itemText, Qt::MatchWildcard);
 
-    foreach (item, found) {
-        treeWidget->setItemSelected(item, true);
+    for (QTreeWidgetItem *item : found) {
+        item->setSelected(true);
         // Show the item->text(0) for each item.
     }
 //! [7]