From 5747f3139219abd6c8670953620cee1f5584caba Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 29 Jul 2020 16:30:13 +0200 Subject: Another round of 0->nullptr cleanup Change-Id: Ic8db7dc252f8fea46eb5a4f334726d6c7f4645a6 Reviewed-by: Sona Kurazyan --- src/gui/itemmodels/qstandarditemmodel.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/gui/itemmodels') diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp index e4d9bcbb71..9bb0d9aa98 100644 --- a/src/gui/itemmodels/qstandarditemmodel.cpp +++ b/src/gui/itemmodels/qstandarditemmodel.cpp @@ -189,7 +189,7 @@ void QStandardItemPrivate::childDeleted(QStandardItem *child) int index = childIndex(child); Q_ASSERT(index != -1); const auto modelIndex = child->index(); - children.replace(index, 0); + children.replace(index, nullptr); emit model->dataChanged(modelIndex, modelIndex); } @@ -481,7 +481,7 @@ bool QStandardItemPrivate::insertRows(int row, const QList &item rows += count; int index = childIndex(row, 0); if (index != -1) - children.insert(index, columnCount() * count, 0); + children.insert(index, columnCount() * count, nullptr); } for (int i = 0; i < items.count(); ++i) { QStandardItem *item = items.at(i); @@ -511,7 +511,7 @@ bool QStandardItemPrivate::insertRows(int row, int count, const QListendInsertRows(); } @@ -673,7 +673,7 @@ void QStandardItemModelPrivate::columnsInserted(QStandardItem *parent, { Q_Q(QStandardItemModel); if (parent == root.data()) - columnHeaderItems.insert(column, count, 0); + columnHeaderItems.insert(column, count, nullptr); q->endInsertColumns(); } @@ -1881,7 +1881,7 @@ QStandardItem *QStandardItem::takeChild(int row, int column) item = d->children.at(index); if (item) item->d_func()->setParentAndModel(nullptr, nullptr); - d->children.replace(index, 0); + d->children.replace(index, nullptr); } return item; } @@ -2195,9 +2195,9 @@ QStandardItemModel::QStandardItemModel(int rows, int columns, QObject *parent) Q_D(QStandardItemModel); d->init(); d->root->insertColumns(0, columns); - d->columnHeaderItems.insert(0, columns, 0); + d->columnHeaderItems.insert(0, columns, nullptr); d->root->insertRows(0, rows); - d->rowHeaderItems.insert(0, rows, 0); + d->rowHeaderItems.insert(0, rows, nullptr); d->root->d_func()->setModel(this); } @@ -2754,7 +2754,7 @@ QStandardItem *QStandardItemModel::takeHorizontalHeaderItem(int column) QStandardItem *headerItem = d->columnHeaderItems.at(column); if (headerItem) { headerItem->d_func()->setParentAndModel(nullptr, nullptr); - d->columnHeaderItems.replace(column, 0); + d->columnHeaderItems.replace(column, nullptr); } return headerItem; } @@ -2776,7 +2776,7 @@ QStandardItem *QStandardItemModel::takeVerticalHeaderItem(int row) QStandardItem *headerItem = d->rowHeaderItems.at(row); if (headerItem) { headerItem->d_func()->setParentAndModel(nullptr, nullptr); - d->rowHeaderItems.replace(row, 0); + d->rowHeaderItems.replace(row, nullptr); } return headerItem; } -- cgit v1.2.3