Polish the model/view tutorial examples

- Reorder the class declarations, moving private sections last
- Make constructors explicit
- Add space to the comments
- Introduce auto
- Replace slot MainWindow::showWindowTitle() by a direct
  connection to slot QWidget::setWindowTitle().

Pick-to: 6.4 6.3
Change-Id: Ic229162434dfef5f2767d0b4e186759ca0f821f3
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>

2 files changed, 23 insertions, 21 deletions

diff --git a/examples/widgets/tutorials/modelview/7_selections/mainwindow.cpp b/examples/widgets/tutorials/modelview/7_selections/mainwindow.cpp
index 0539d49ce6..3bedb2f82c 100644
--- a/examples/widgets/tutorials/modelview/7_selections/mainwindow.cpp
+++ b/examples/widgets/tutorials/modelview/7_selections/mainwindow.cpp
@@ -14,20 +14,20 @@ MainWindow::MainWindow(QWidget *parent)
     , standardModel(new QStandardItemModel(this))
 {
     setCentralWidget(treeView);
-    QStandardItem *rootNode = standardModel->invisibleRootItem();
+    auto *rootNode = standardModel->invisibleRootItem();
 
 
-    //defining a couple of items
-    QStandardItem *americaItem = new QStandardItem("America");
-    QStandardItem *mexicoItem =  new QStandardItem("Canada");
-    QStandardItem *usaItem =     new QStandardItem("USA");
-    QStandardItem *bostonItem =  new QStandardItem("Boston");
-    QStandardItem *europeItem =  new QStandardItem("Europe");
-    QStandardItem *italyItem =   new QStandardItem("Italy");
-    QStandardItem *romeItem =    new QStandardItem("Rome");
-    QStandardItem *veronaItem =  new QStandardItem("Verona");
+    // defining a couple of items
+    auto *americaItem = new QStandardItem("America");
+    auto *mexicoItem =  new QStandardItem("Canada");
+    auto *usaItem =     new QStandardItem("USA");
+    auto *bostonItem =  new QStandardItem("Boston");
+    auto *europeItem =  new QStandardItem("Europe");
+    auto *italyItem =   new QStandardItem("Italy");
+    auto *romeItem =    new QStandardItem("Rome");
+    auto *veronaItem =  new QStandardItem("Verona");
 
-    //building up the hierarchy
+    // building up the hierarchy
     rootNode->    appendRow(americaItem);
     rootNode->    appendRow(europeItem);
     americaItem-> appendRow(mexicoItem);
@@ -37,11 +37,11 @@ MainWindow::MainWindow(QWidget *parent)
     italyItem->   appendRow(romeItem);
     italyItem->   appendRow(veronaItem);
 
-    //register the model
+    // register the model
     treeView->setModel(standardModel);
     treeView->expandAll();
 
-    //selection changes shall trigger a slot
+    // selection changes shall trigger a slot
     QItemSelectionModel *selectionModel = treeView->selectionModel();
     connect(selectionModel, &QItemSelectionModel::selectionChanged,
             this, &MainWindow::selectionChangedSlot);
@@ -53,13 +53,13 @@ MainWindow::MainWindow(QWidget *parent)
 //! [quoting modelview_b]
 void MainWindow::selectionChangedSlot(const QItemSelection & /*newSelection*/, const QItemSelection & /*oldSelection*/)
 {
-    //get the text of the selected item
+    // get the text of the selected item
     const QModelIndex index = treeView->selectionModel()->currentIndex();
     QString selectedText = index.data(Qt::DisplayRole).toString();
-    //find out the hierarchy level of the selected item
+    // find out the hierarchy level of the selected item
     int hierarchyLevel = 1;
     QModelIndex seekRoot = index;
-    while (seekRoot.parent() != QModelIndex()) {
+    while (seekRoot.parent().isValid()) {
         seekRoot = seekRoot.parent();
         hierarchyLevel++;
     }
diff --git a/examples/widgets/tutorials/modelview/7_selections/mainwindow.h b/examples/widgets/tutorials/modelview/7_selections/mainwindow.h
index a0d05222fa..cca1ae837f 100644
--- a/examples/widgets/tutorials/modelview/7_selections/mainwindow.h
+++ b/examples/widgets/tutorials/modelview/7_selections/mainwindow.h
@@ -7,7 +7,7 @@
 #include <QMainWindow>
 
 QT_BEGIN_NAMESPACE
-class QTreeView; //forward declarations
+class QTreeView; // forward declarations
 class QStandardItemModel;
 class QItemSelection;
 QT_END_NAMESPACE
@@ -16,13 +16,15 @@ QT_END_NAMESPACE
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
+public:
+    explicit MainWindow(QWidget *parent = nullptr);
+
+private slots:
+    void selectionChangedSlot(const QItemSelection &newSelection, const QItemSelection &oldSelection);
+
 private:
     QTreeView *treeView;
     QStandardItemModel *standardModel;
-private slots:
-    void selectionChangedSlot(const QItemSelection &newSelection, const QItemSelection &oldSelection);
-public:
-    MainWindow(QWidget *parent = nullptr);
 };
 
 #endif // MAINWINDOW_H