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/qgraphicsproxywidget/tst_qgraphicsproxywidget.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/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp')
-rw-r--r-- | tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index d99c056abe..65c9938f89 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -482,7 +482,7 @@ void tst_QGraphicsProxyWidget::setWidget() QCOMPARE((qreal)bottom, rbottom); } else { // proxy shouldn't mess with the widget if it can't insert it. - QCOMPARE(proxy->widget(), (QWidget*)0); + QCOMPARE(proxy->widget(), nullptr); QCOMPARE(proxy->acceptHoverEvents(), false); if (subWidget) { QVERIFY(!subWidget->testAttribute(Qt::WA_DontShowOnScreen)); @@ -493,7 +493,7 @@ void tst_QGraphicsProxyWidget::setWidget() } if (widgetExists) { - QCOMPARE(existingSubWidget->parent(), static_cast<QObject*>(0)); + QCOMPARE(existingSubWidget->parent(), nullptr); QVERIFY(!existingSubWidget->testAttribute(Qt::WA_DontShowOnScreen)); QVERIFY(!existingSubWidget->testAttribute(Qt::WA_QuitOnClose)); } |