From 2431765d57d843c8b08eb40dd5c2c2308424a6af Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Date: Sun, 8 Sep 2019 20:07:22 +0200
Subject: tst_QItemView: cleanup

Cleanup QItemView autotest:
 - use range-based for loops
 - use nullptr
 - use member initialization
 - use new signal/slot syntax
 - use static invocations
 - use override

Change-Id: I46edc2dc5bbaa09fb11710fa34ef4c6639181f62
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 .../widgets/itemviews/qitemview/viewstotest.cpp     | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'tests/auto/widgets/itemviews/qitemview/viewstotest.cpp')

diff --git a/tests/auto/widgets/itemviews/qitemview/viewstotest.cpp b/tests/auto/widgets/itemviews/qitemview/viewstotest.cpp
index f1da2f4fe7..c55cc865fc 100644
--- a/tests/auto/widgets/itemviews/qitemview/viewstotest.cpp
+++ b/tests/auto/widgets/itemviews/qitemview/viewstotest.cpp
@@ -26,11 +26,10 @@
 **
 ****************************************************************************/
 
-
-#include <QtTest/QtTest>
-#include <QtCore/QtCore>
-#include <QtGui/QtGui>
-#include <QtWidgets/QtWidgets>
+#include <QHeaderView>
+#include <QListView>
+#include <QTableView>
+#include <QTreeView>
 
 /*
     To add a view to be tested add the header file to the includes
@@ -54,12 +53,12 @@ public:
     enum Display { DisplayNone, DisplayRoot };
 
     struct test {
-        test(QString m, Display d) : viewType(m), display(d){};
+        test(const QString &m, Display d) : viewType(m), display(d) {}
         QString viewType;
         Display display;
     };
 
-    QList<test> tests;
+    QVector<test> tests;
 };
 
 
@@ -84,7 +83,7 @@ ViewsToTest::ViewsToTest()
  */
 QAbstractItemView *ViewsToTest::createView(const QString &viewType)
 {
-    QAbstractItemView *view = 0;
+    QAbstractItemView *view = nullptr;
     if (viewType == "QListView_ScrollPerItem") {
         view = new QListView();
         view->setObjectName("QListView");
@@ -137,16 +136,16 @@ void ViewsToTest::hideIndexes(QAbstractItemView *view)
     if (QTableView *tableView = qobject_cast<QTableView *>(view)) {
         tableView->setColumnHidden(1, true);
         tableView->setRowHidden(1, true);
-        tableView->setRowHidden(tableView->model()->rowCount()-2, true);
+        tableView->setRowHidden(tableView->model()->rowCount() - 2, true);
     }
     if (QTreeView *treeView = qobject_cast<QTreeView *>(view)) {
         treeView->setColumnHidden(1, true);
         treeView->setRowHidden(1, QModelIndex(), true);
-        treeView->setRowHidden(treeView->model()->rowCount()-2, QModelIndex(), true);
+        treeView->setRowHidden(treeView->model()->rowCount() - 2, QModelIndex(), true);
     }
     if (QListView *listView = qobject_cast<QListView *>(view)) {
         listView->setRowHidden(1, true);
-        listView->setRowHidden(listView->model()->rowCount()-2, true);
+        listView->setRowHidden(listView->model()->rowCount() - 2, true);
     }
 }
 
-- 
cgit v1.2.3