diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-29 16:30:13 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-31 12:56:50 +0200 |
| commit | 5747f3139219abd6c8670953620cee1f5584caba (patch) | |
| tree | 07dda7644e3628ead8459efa304e36d705e36521 /src/corelib/kernel | |
| parent | 4ed483b0e24b410b6bb240b48b4ad71e67877dc2 (diff) | |
Another round of 0->nullptr cleanup
Change-Id: Ic8db7dc252f8fea46eb5a4f334726d6c7f4645a6
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qabstracteventdispatcher.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetaobjectbuilder.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp index e77e8d3865..72504a178d 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.cpp +++ b/src/corelib/kernel/qabstracteventdispatcher.cpp @@ -429,7 +429,7 @@ void QAbstractEventDispatcher::installNativeEventFilter(QAbstractNativeEventFilt Q_D(QAbstractEventDispatcher); // clean up unused items in the list - d->eventFilters.removeAll(0); + d->eventFilters.removeAll(nullptr); d->eventFilters.removeAll(filterObj); d->eventFilters.prepend(filterObj); } @@ -452,7 +452,7 @@ void QAbstractEventDispatcher::removeNativeEventFilter(QAbstractNativeEventFilte Q_D(QAbstractEventDispatcher); for (int i = 0; i < d->eventFilters.count(); ++i) { if (d->eventFilters.at(i) == filter) { - d->eventFilters[i] = 0; + d->eventFilters[i] = nullptr; break; } } diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp index c578b88429..514cfeac55 100644 --- a/src/corelib/kernel/qmetaobjectbuilder.cpp +++ b/src/corelib/kernel/qmetaobjectbuilder.cpp @@ -1669,7 +1669,7 @@ static const QMetaObject *resolveClassName if (name == QByteArray("QObject")) return &QObject::staticMetaObject; else - return references.value(name, 0); + return references.value(name, nullptr); } /*! diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 0e65580e7f..b26bd0298e 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -2035,7 +2035,7 @@ void QObjectPrivate::deleteChildren() // delete siblings for (int i = 0; i < children.count(); ++i) { currentChildBeingDeleted = children.at(i); - children[i] = 0; + children[i] = nullptr; delete currentChildBeingDeleted; } children.clear(); @@ -2076,7 +2076,7 @@ void QObjectPrivate::setParent_helper(QObject *o) if (index < 0) { // we're probably recursing into setParent() from a ChildRemoved event, don't do anything } else if (parentD->isDeletingChildren) { - parentD->children[index] = 0; + parentD->children[index] = nullptr; } else { parentD->children.removeAt(index); if (sendChildEvents && parentD->receiveChildEvents) { |