diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-09-30 15:16:55 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-11-30 07:24:47 +0000 |
| commit | 2fd3d8ea9e3e1829653942431070a83569bab6eb (patch) | |
| tree | 7803eed14bf3064b4d2c1420c0f0c94482463b6d /tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp | |
| parent | 97b8fdab7d3604294476bf566b024ecbd5b412b0 (diff) | |
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>
Diffstat (limited to 'tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp')
| -rw-r--r-- | tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp index 87cd032ad0..cfc18c6e32 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp @@ -186,10 +186,10 @@ void tst_QGraphicsLayout::automaticReparenting() l1->addItem(w1); QGraphicsWidget *w2 = new QGraphicsWidget(); l1->addItem(w2); - QCOMPARE(w1->parentItem(), static_cast<QGraphicsItem*>(0)); - QCOMPARE(w2->parentItem(), static_cast<QGraphicsItem*>(0)); + QCOMPARE(w1->parentItem(), nullptr); + QCOMPARE(w2->parentItem(), nullptr); scene.addItem(w1); - QCOMPARE(w1->parentItem(), static_cast<QGraphicsItem*>(0)); + QCOMPARE(w1->parentItem(), nullptr); window->setLayout(l1); QCOMPARE(w1->parentItem(), static_cast<QGraphicsItem*>(window)); QCOMPARE(w2->parentItem(), static_cast<QGraphicsItem*>(window)); |