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, 2 insertions, 2 deletions

diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
index f5b2269297..9d4b640272 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
@@ -1073,7 +1073,7 @@ void tst_QGraphicsGridLayout::itemAt()
         } else {
             const QByteArray message = "QGraphicsGridLayout::itemAt: invalid index " + QByteArray::number(i);
             QTest::ignoreMessage(QtWarningMsg, message.constData());
-            QCOMPARE(layout->itemAt(i), static_cast<QGraphicsLayoutItem*>(0));
+            QCOMPARE(layout->itemAt(i), nullptr);
         }
     }
     delete widget;
@@ -1102,7 +1102,7 @@ void tst_QGraphicsGridLayout::removeAt()
     QGraphicsLayoutItem *item0 = layout->itemAt(0);
     QCOMPARE(item0->parentLayoutItem(), static_cast<QGraphicsLayoutItem *>(layout));
     layout->removeAt(0);
-    QCOMPARE(item0->parentLayoutItem(), static_cast<QGraphicsLayoutItem *>(0));
+    QCOMPARE(item0->parentLayoutItem(), nullptr);
     QCOMPARE(layout->count(), 0);
     QTest::ignoreMessage(QtWarningMsg, QString::fromLatin1("QGraphicsGridLayout::removeAt: invalid index 0").toLatin1().constData());
     layout->removeAt(0);