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/itemviews/qlistwidget | |
| 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/itemviews/qlistwidget')
| -rw-r--r-- | tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp index f8ab64e4d6..eb93e4c167 100644 --- a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp +++ b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp @@ -193,7 +193,7 @@ void tst_QListWidget::init() void tst_QListWidget::checkDefaultValues() { - QCOMPARE(testWidget->currentItem(), (QListWidgetItem *)0); + QCOMPARE(testWidget->currentItem(), nullptr); QCOMPARE(testWidget->currentRow(), -1); QCOMPARE(testWidget->count(), 0); } @@ -413,7 +413,7 @@ void tst_QListWidget::currentItem() if (currentIndex.isValid()) QCOMPARE(testWidget->currentItem(), testWidget->item(currentIndex.row())); else - QCOMPARE(testWidget->currentItem(), (QListWidgetItem*)0); + QCOMPARE(testWidget->currentItem(), nullptr); } void tst_QListWidget::currentRow() @@ -631,7 +631,7 @@ void tst_QListWidget::item() QListWidgetItem *item = testWidget->item(row); if (outOfBounds) { - QCOMPARE(item, static_cast<QListWidgetItem*>(0)); + QCOMPARE(item, nullptr); QCOMPARE(testWidget->count(), 3); } else { QCOMPARE(item->text(), QStringLiteral("item") + QString::number(row)); @@ -664,7 +664,7 @@ void tst_QListWidget::takeItem() QListWidgetItem *item = testWidget->takeItem(row); if (outOfBounds) { - QCOMPARE(item, static_cast<QListWidgetItem*>(0)); + QCOMPARE(item, nullptr); QCOMPARE(testWidget->count(), 3); } else { QCOMPARE(item->text(), QStringLiteral("item") + QString::number(row)); @@ -1445,11 +1445,11 @@ void tst_QListWidget::itemWidget() QListWidgetItem *item = new QListWidgetItem(&list); - QCOMPARE(list.itemWidget(item), static_cast<QWidget*>(0)); + QCOMPARE(list.itemWidget(item), nullptr); list.setItemWidget(item, &widget); QCOMPARE(list.itemWidget(item), &widget); list.removeItemWidget(item); - QCOMPARE(list.itemWidget(item), static_cast<QWidget*>(0)); + QCOMPARE(list.itemWidget(item), nullptr); } #ifndef Q_OS_MAC |