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/util | |
| 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/util')
| -rw-r--r-- | tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp index 99d067b7d7..f5cf9d7750 100644 --- a/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp +++ b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp @@ -215,7 +215,7 @@ void tst_QUndoGroup::setActive() QUndoGroup group; QUndoStack stack1(&group), stack2(&group); - QCOMPARE(group.activeStack(), (QUndoStack*)0); + QCOMPARE(group.activeStack(), nullptr); QCOMPARE(stack1.isActive(), false); QCOMPARE(stack2.isActive(), false); @@ -238,13 +238,13 @@ void tst_QUndoGroup::setActive() QCOMPARE(stack3.isActive(), false); group.removeStack(&stack2); - QCOMPARE(group.activeStack(), (QUndoStack*)0); + QCOMPARE(group.activeStack(), nullptr); QCOMPARE(stack1.isActive(), false); QCOMPARE(stack2.isActive(), true); QCOMPARE(stack3.isActive(), false); group.removeStack(&stack2); - QCOMPARE(group.activeStack(), (QUndoStack*)0); + QCOMPARE(group.activeStack(), nullptr); QCOMPARE(stack1.isActive(), false); QCOMPARE(stack2.isActive(), true); QCOMPARE(stack3.isActive(), false); @@ -280,7 +280,7 @@ void tst_QUndoGroup::deleteStack() QUndoStack *stack1 = new QUndoStack(&group); QCOMPARE(group.stacks(), QList<QUndoStack*>() << stack1); - QCOMPARE(group.activeStack(), (QUndoStack*)0); + QCOMPARE(group.activeStack(), nullptr); stack1->setActive(); QCOMPARE(group.activeStack(), stack1); @@ -299,17 +299,17 @@ void tst_QUndoGroup::deleteStack() delete stack1; QCOMPARE(group.stacks(), QList<QUndoStack*>() << stack3); - QCOMPARE(group.activeStack(), (QUndoStack*)0); + QCOMPARE(group.activeStack(), nullptr); stack3->setActive(false); - QCOMPARE(group.activeStack(), (QUndoStack*)0); + QCOMPARE(group.activeStack(), nullptr); stack3->setActive(true); QCOMPARE(group.activeStack(), stack3); group.removeStack(stack3); QCOMPARE(group.stacks(), QList<QUndoStack*>()); - QCOMPARE(group.activeStack(), (QUndoStack*)0); + QCOMPARE(group.activeStack(), nullptr); delete stack3; } |