1 files changed, 31 insertions, 49 deletions
diff --git a/src/gui/doc/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp b/src/gui/doc/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp
index a7e22e549d..a608312424 100644
--- a/src/gui/doc/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp
+++ b/src/gui/doc/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp
@@ -1,52 +1,19 @@
-/****************************************************************************
-**
-** 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 <QStandardItemModel>
+#include <QTreeView>
+#include <QWidget>
+
+namespace src_gui_itemviews_qstandarditemmodel {
+struct MyWidget : public QWidget
+{
+    void wrapper2();
+    void clicked(const QModelIndex &index);
+    QModelIndex index() { return QModelIndex(); }
+    QStandardItemModel *myStandardItemModel;
+};
+
+void wrapper0() {
 
 //! [0]
 QStandardItemModel model(4, 4);
@@ -58,6 +25,10 @@ for (int row = 0; row < model.rowCount(); ++row) {
 }
 //! [0]
 
+} // wrapper0
+
+
+void wrapper1() {
 
 //! [1]
 QStandardItemModel model;
@@ -69,7 +40,10 @@ for (int i = 0; i < 4; ++i) {
 }
 //! [1]
 
+} // wrapper1
+
 
+void MyWidget::wrapper2() {
 //! [2]
 QTreeView *treeView = new QTreeView(this);
 treeView->setModel(myStandardItemModel);
@@ -77,6 +51,8 @@ connect(treeView, &QTreeView::clicked,
         this, &MyWidget::clicked);
 //! [2]
 
+} // wrapper2
+
 
 //! [3]
 void MyWidget::clicked(const QModelIndex &index)
@@ -87,6 +63,12 @@ void MyWidget::clicked(const QModelIndex &index)
 //! [3]
 
 
+void wrapper3() {
+QTreeView *treeView = nullptr;
+MyWidget *item = nullptr;
 //! [4]
 treeView->scrollTo(item->index());
 //! [4]
+
+} // wrapper3
+} // src_gui_itemviews_qstandarditemmodel