tests/auto/widgets: use QCOMPARE(., nullptr)

.. instead of manually casted 0s.

QCOMPARE(., nullptr) was added for Qt 5.8. Make use of the new API.

In tst_qwidget.cpp, as a drive-by, change
   qApp->focusWidget() -> QApplication::focusWidget()

Change-Id: I1331b8916b026d48e01534d1ed0b3d72f3f3d50c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

1 files changed, 7 insertions, 7 deletions

diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
index c7b7ffaf95..80ef0879cc 100644
--- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
@@ -1107,10 +1107,10 @@ void tst_QTreeView::setModel()
 {
     QTreeView view;
     view.show();
-    QCOMPARE(view.model(), (QAbstractItemModel*)0);
-    QCOMPARE(view.selectionModel(), (QItemSelectionModel*)0);
-    QCOMPARE(view.header()->model(), (QAbstractItemModel*)0);
-    QCOMPARE(view.header()->selectionModel(), (QItemSelectionModel*)0);
+    QCOMPARE(view.model(), nullptr);
+    QCOMPARE(view.selectionModel(), nullptr);
+    QCOMPARE(view.header()->model(), nullptr);
+    QCOMPARE(view.header()->selectionModel(), nullptr);
 
     for (int x = 0; x < 2; ++x) {
         QtTestModel *model = new QtTestModel(10, 8);
@@ -1131,9 +1131,9 @@ void tst_QTreeView::setModel()
         QTRY_COMPARE(modelDestroyedSpy.count(), 0);
 
         view.setModel(0);
-        QCOMPARE(view.model(), (QAbstractItemModel*)0);
+        QCOMPARE(view.model(), nullptr);
         // ### shouldn't selectionModel also be 0 now?
-//        QCOMPARE(view.selectionModel(), (QItemSelectionModel*)0);
+//        QCOMPARE(view.selectionModel(), nullptr);
         delete model;
     }
 }
@@ -1283,7 +1283,7 @@ void tst_QTreeView::noDelegate()
     QTreeView view;
     view.setModel(&model);
     view.setItemDelegate(0);
-    QCOMPARE(view.itemDelegate(), (QAbstractItemDelegate *)0);
+    QCOMPARE(view.itemDelegate(), nullptr);
 }
 
 void tst_QTreeView::noModel()