diff options
Diffstat (limited to 'tests/auto/widgets/itemviews')
8 files changed, 35 insertions, 35 deletions
diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp index 5567641dde..bd6733e2d0 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp +++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp @@ -558,7 +558,7 @@ void tst_QAbstractItemView::noModel() view.setModel(0); // Due to the model is removed, this will generate a valueChanged signal on both scrollbars. (value to 0) QApplication::processEvents(); - QCOMPARE(view.model(), (QAbstractItemModel*)0); + QCOMPARE(view.model(), nullptr); } void tst_QAbstractItemView::dragSelect() diff --git a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp index e6c4ab44f8..62acf49f4a 100644 --- a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp +++ b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp @@ -770,15 +770,15 @@ void tst_QColumnView::gripMoved() void tst_QColumnView::preview() { QColumnView view; - QCOMPARE(view.previewWidget(), (QWidget*)0); + QCOMPARE(view.previewWidget(), nullptr); TreeModel model; view.setModel(&model); - QCOMPARE(view.previewWidget(), (QWidget*)0); + QCOMPARE(view.previewWidget(), nullptr); QModelIndex home = model.index(0, 0); QVERIFY(home.isValid()); QVERIFY(model.hasChildren(home)); view.setCurrentIndex(home); - QCOMPARE(view.previewWidget(), (QWidget*)0); + QCOMPARE(view.previewWidget(), nullptr); QModelIndex file; QVERIFY(model.rowCount(home) > 0); diff --git a/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp b/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp index ea88020a56..5ab0a226b7 100644 --- a/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp +++ b/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp @@ -79,7 +79,7 @@ void tst_QDataWidgetMapper::setModel() { QDataWidgetMapper mapper; - QCOMPARE(mapper.model(), (QAbstractItemModel *)0); + QCOMPARE(mapper.model(), nullptr); { // let the model go out of scope firstma QStandardItemModel model; @@ -87,7 +87,7 @@ void tst_QDataWidgetMapper::setModel() QCOMPARE(mapper.model(), static_cast<QAbstractItemModel *>(&model)); } - QCOMPARE(mapper.model(), (QAbstractItemModel *)0); + QCOMPARE(mapper.model(), nullptr); { // let the mapper go out of scope first QStandardItemModel model2; @@ -263,7 +263,7 @@ void tst_QDataWidgetMapper::addMapping() QCOMPARE(edit2.text(), QString("item 0 2")); } // let the edit go out of scope - QCOMPARE(mapper.mappedWidgetAt(2), (QWidget *)0); + QCOMPARE(mapper.mappedWidgetAt(2), nullptr); mapper.toLast(); } @@ -400,7 +400,7 @@ void tst_QDataWidgetMapper::mappedWidgetAt() QLineEdit lineEdit1; QLineEdit lineEdit2; - QCOMPARE(mapper.mappedWidgetAt(432312), (QWidget*)0); + QCOMPARE(mapper.mappedWidgetAt(432312), nullptr); mapper.addMapping(&lineEdit1, 1); mapper.addMapping(&lineEdit2, 2); @@ -410,7 +410,7 @@ void tst_QDataWidgetMapper::mappedWidgetAt() mapper.addMapping(&lineEdit2, 4242); - QCOMPARE(mapper.mappedWidgetAt(2), (QWidget*)0); + QCOMPARE(mapper.mappedWidgetAt(2), nullptr); QCOMPARE(mapper.mappedWidgetAt(4242), static_cast<QWidget *>(&lineEdit2)); } 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 diff --git a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp index a86ffbc30d..4d4a95b3f5 100644 --- a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp +++ b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp @@ -809,13 +809,13 @@ void tst_QTableWidget::itemOwnership() headerItem = new QObjectTableItem(); testWidget->setVerticalHeaderItem(0, headerItem); delete headerItem; - QCOMPARE(testWidget->verticalHeaderItem(0), (QTableWidgetItem *)0); + QCOMPARE(testWidget->verticalHeaderItem(0), nullptr); //delete horizontal headeritem from outside headerItem = new QObjectTableItem(); testWidget->setHorizontalHeaderItem(0, headerItem); delete headerItem; - QCOMPARE(testWidget->horizontalHeaderItem(0), (QTableWidgetItem *)0); + QCOMPARE(testWidget->horizontalHeaderItem(0), nullptr); //setItem item = new QObjectTableItem(); diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp index c7b7ffaf95..80ef0879cc 100644 --- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp @@ -1107,10 +1107,10 @@ void tst_QTreeView::setModel() { QTreeView view; view.show(); - QCOMPARE(view.model(), (QAbstractItemModel*)0); - QCOMPARE(view.selectionModel(), (QItemSelectionModel*)0); - QCOMPARE(view.header()->model(), (QAbstractItemModel*)0); - QCOMPARE(view.header()->selectionModel(), (QItemSelectionModel*)0); + QCOMPARE(view.model(), nullptr); + QCOMPARE(view.selectionModel(), nullptr); + QCOMPARE(view.header()->model(), nullptr); + QCOMPARE(view.header()->selectionModel(), nullptr); for (int x = 0; x < 2; ++x) { QtTestModel *model = new QtTestModel(10, 8); @@ -1131,9 +1131,9 @@ void tst_QTreeView::setModel() QTRY_COMPARE(modelDestroyedSpy.count(), 0); view.setModel(0); - QCOMPARE(view.model(), (QAbstractItemModel*)0); + QCOMPARE(view.model(), nullptr); // ### shouldn't selectionModel also be 0 now? -// QCOMPARE(view.selectionModel(), (QItemSelectionModel*)0); +// QCOMPARE(view.selectionModel(), nullptr); delete model; } } @@ -1283,7 +1283,7 @@ void tst_QTreeView::noDelegate() QTreeView view; view.setModel(&model); view.setItemDelegate(0); - QCOMPARE(view.itemDelegate(), (QAbstractItemDelegate *)0); + QCOMPARE(view.itemDelegate(), nullptr); } void tst_QTreeView::noModel() diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp index f1e8c7c814..fcffaa0eb9 100644 --- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp +++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp @@ -194,7 +194,7 @@ void tst_QTreeWidget::getSetCheck() QCOMPARE(obj1.headerItem(), var2); obj1.setHeaderItem((QTreeWidgetItem *)0); -// QCOMPARE(obj1.headerItem(), (QTreeWidgetItem *)0); +// QCOMPARE(obj1.headerItem(), nullptr); // QTreeWidgetItem * QTreeWidget::currentItem() // void QTreeWidget::setCurrentItem(QTreeWidgetItem *) @@ -203,7 +203,7 @@ void tst_QTreeWidget::getSetCheck() QCOMPARE(obj1.currentItem(), var3); obj1.setCurrentItem((QTreeWidgetItem *)0); - QCOMPARE(obj1.currentItem(), (QTreeWidgetItem *)0); + QCOMPARE(obj1.currentItem(), nullptr); } typedef QList<int> IntList; @@ -285,9 +285,9 @@ void tst_QTreeWidget::addTopLevelItem() tree.addTopLevelItem(ti); QCOMPARE(tree.topLevelItemCount(), i+1); QCOMPARE(tree.topLevelItem(i), ti); - QCOMPARE(tree.topLevelItem(-1), static_cast<TreeItem*>(0)); + QCOMPARE(tree.topLevelItem(-1), nullptr); QCOMPARE(tree.indexOfTopLevelItem(ti), i); - QCOMPARE(ti->parent(), static_cast<TreeItem*>(0)); + QCOMPARE(ti->parent(), nullptr); tree.addTopLevelItem(ti); QCOMPARE(tree.topLevelItemCount(), i+1); tops.append(ti); @@ -419,7 +419,7 @@ void tst_QTreeWidget::currentItem() // can't set the headerItem to be the current item tree.setCurrentItem(tree.headerItem()); - QCOMPARE(tree.currentItem(), static_cast<TreeItem*>(0)); + QCOMPARE(tree.currentItem(), nullptr); } void tst_QTreeWidget::editItem_data() @@ -520,7 +520,7 @@ void tst_QTreeWidget::takeItem() int count = testWidget->topLevelItemCount(); QTreeWidgetItem *item = testWidget->takeTopLevelItem(index); if (outOfBounds) { - QCOMPARE(item, (QTreeWidgetItem *)0); + QCOMPARE(item, nullptr); QCOMPARE(count, testWidget->topLevelItemCount()); } else { QCOMPARE(item->text(0), QStringLiteral("top") + QString::number(index)); @@ -531,7 +531,7 @@ void tst_QTreeWidget::takeItem() int count = testWidget->topLevelItem(0)->childCount(); QTreeWidgetItem *item = testWidget->topLevelItem(0)->takeChild(index); if (outOfBounds) { - QCOMPARE(item, (QTreeWidgetItem *)0); + QCOMPARE(item, nullptr); QCOMPARE(count, testWidget->topLevelItem(0)->childCount()); } else { QCOMPARE(item->text(0), QStringLiteral("child") + QString::number(index)); @@ -1664,8 +1664,8 @@ void tst_QTreeWidget::addChild() QCOMPARE(taken, children); QCOMPARE(item->childCount(), 0); for (int i = 0; i < taken.count(); ++i) { - QCOMPARE(taken.at(i)->parent(), static_cast<QTreeWidgetItem*>(0)); - QCOMPARE(taken.at(i)->treeWidget(), static_cast<QTreeWidget*>(0)); + QCOMPARE(taken.at(i)->parent(), nullptr); + QCOMPARE(taken.at(i)->treeWidget(), nullptr); item->addChild(taken.at(i)); // re-add } diff --git a/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp index f08e57c84b..c2c02f3766 100644 --- a/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp +++ b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp @@ -1160,7 +1160,7 @@ void tst_QTreeWidgetItemIterator::updateIteratorAfterDeletedItem_and_ContinueIte delete item; it+=iterator_advance_after_removal; if (iterator_new_value.isNull()) { - QCOMPARE((*it), (QTreeWidgetItem*)0); + QCOMPARE((*it), nullptr); } else { QCOMPARE((*it)->text(0), iterator_new_value); } @@ -1202,7 +1202,7 @@ void tst_QTreeWidgetItemIterator::initializeIterator() QTreeWidget tw; QTreeWidgetItemIterator it(&tw); - QCOMPARE((*it), static_cast<QTreeWidgetItem*>(0)); + QCOMPARE((*it), nullptr); } void tst_QTreeWidgetItemIterator::sortingEnabled() |