1 files changed, 13 insertions, 64 deletions

diff --git a/src/gui/doc/snippets/textdocument-selections/mainwindow.cpp b/src/gui/doc/snippets/textdocument-selections/mainwindow.cpp
index 9253e87670..6e1d051d4b 100644
--- a/src/gui/doc/snippets/textdocument-selections/mainwindow.cpp
+++ b/src/gui/doc/snippets/textdocument-selections/mainwindow.cpp
@@ -1,86 +1,38 @@
-/****************************************************************************
-**
-** 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$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+#include "mainwindow.h"
 
 #include <QtWidgets>
 
-#include "mainwindow.h"
-
 MainWindow::MainWindow()
 {
     QMenu *fileMenu = new QMenu(tr("&File"));
 
-    fileMenu->addAction(tr("&Open..."), this, SLOT(openFile()),
-                        QKeySequence(tr("Ctrl+O", "File|Open")));
+    fileMenu->addAction(tr("&Open..."), QKeySequence(tr("Ctrl+O", "File|Open")),
+                        this, &MainWindow::openFile);
 
-    QAction *quitAction = fileMenu->addAction(tr("E&xit"), this, SLOT(close()));
+    QAction *quitAction = fileMenu->addAction(tr("E&xit"), this, &MainWindow::close);
     quitAction->setShortcut(tr("Ctrl+Q"));
 
     QMenu *editMenu = new QMenu(tr("&Edit"));
 
-    cutAction = editMenu->addAction(tr("Cu&t"), this, SLOT(cutSelection()));
+    cutAction = editMenu->addAction(tr("Cu&t"), this, &MainWindow::cutSelection);
     cutAction->setShortcut(tr("Ctrl+X"));
     cutAction->setEnabled(false);
 
-    copyAction = editMenu->addAction(tr("&Copy"), this, SLOT(copySelection()));
+    copyAction = editMenu->addAction(tr("&Copy"), this, &MainWindow::copySelection);
     copyAction->setShortcut(tr("Ctrl+C"));
     copyAction->setEnabled(false);
 
-    pasteAction = editMenu->addAction(tr("&Paste"), this, SLOT(pasteSelection()));
+    pasteAction = editMenu->addAction(tr("&Paste"), this, &MainWindow::pasteSelection);
     pasteAction->setShortcut(tr("Ctrl+V"));
     pasteAction->setEnabled(false);
 
     QMenu *selectMenu = new QMenu(tr("&Select"));
-    selectMenu->addAction(tr("&Word"), this, SLOT(selectWord()));
-    selectMenu->addAction(tr("&Line"), this, SLOT(selectLine()));
-    selectMenu->addAction(tr("&Block"), this, SLOT(selectBlock()));
-    selectMenu->addAction(tr("&Frame"), this, SLOT(selectFrame()));
+    selectMenu->addAction(tr("&Word"), this, &MainWindow::selectWord);
+    selectMenu->addAction(tr("&Line"), this, &MainWindow::selectLine);
+    selectMenu->addAction(tr("&Block"), this, &MainWindow::selectBlock);
+    selectMenu->addAction(tr("&Frame"), this, &MainWindow::selectFrame);
 
     menuBar()->addMenu(fileMenu);
     menuBar()->addMenu(editMenu);
@@ -151,7 +103,6 @@ void MainWindow::pasteSelection()
 void MainWindow::selectWord()
 {
     QTextCursor cursor = editor->textCursor();
-    QTextBlock block = cursor.block();
 
 //! [0]
     cursor.beginEditBlock();
@@ -168,7 +119,6 @@ void MainWindow::selectWord()
 void MainWindow::selectLine()
 {
     QTextCursor cursor = editor->textCursor();
-    QTextBlock block = cursor.block();
 
     cursor.beginEditBlock();
     cursor.movePosition(QTextCursor::StartOfLine);
@@ -181,7 +131,6 @@ void MainWindow::selectLine()
 void MainWindow::selectBlock()
 {
     QTextCursor cursor = editor->textCursor();
-    QTextBlock block = cursor.block();
 
     cursor.beginEditBlock();
     cursor.movePosition(QTextCursor::StartOfBlock);