Another round of 0->nullptr cleanup

Change-Id: Ic8db7dc252f8fea46eb5a4f334726d6c7f4645a6
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>

24 files changed, 64 insertions, 62 deletions

diff --git a/src/gui/accessible/linux/atspiadaptor.cpp b/src/gui/accessible/linux/atspiadaptor.cpp
index a0c41fb7b3..8feaf58ca1 100644
--- a/src/gui/accessible/linux/atspiadaptor.cpp
+++ b/src/gui/accessible/linux/atspiadaptor.cpp
@@ -858,7 +858,7 @@ QAccessibleInterface *AtSpiAdaptor::interfaceFromPath(const QString& dbusPath) c
     QStringList parts = dbusPath.split(QLatin1Char('/'));
     if (parts.size() != 6) {
         qCDebug(lcAccessibilityAtspi) << "invalid path: " << dbusPath;
-        return 0;
+        return nullptr;
     }
 
     QString objectString = parts.at(5);
@@ -1613,7 +1613,7 @@ bool AtSpiAdaptor::componentInterface(QAccessibleInterface *interface, const QSt
         }
 
         QAccessibleInterface * childInterface(interface->childAt(x, y));
-        QAccessibleInterface * iface = 0;
+        QAccessibleInterface * iface = nullptr;
         while (childInterface) {
             iface = childInterface;
             childInterface = iface->childAt(x, y);
@@ -2301,7 +2301,7 @@ bool AtSpiAdaptor::tableInterface(QAccessibleInterface *interface, const QString
         connection.send(message.createReply(QVariant::fromValue(QDBusVariant(
             QVariant::fromValue(interface->tableInterface()->selectedRowCount())))));
     } else if (function == QLatin1String("GetSummary")) {
-        QAccessibleInterface * summary = interface->tableInterface() ? interface->tableInterface()->summary() : 0;
+        QAccessibleInterface *summary = interface->tableInterface() ? interface->tableInterface()->summary() : nullptr;
         QSpiObjectReference ref(connection, QDBusObjectPath(pathForInterface(summary)));
         connection.send(message.createReply(QVariant::fromValue(QDBusVariant(QVariant::fromValue(ref)))));
     } else if (function == QLatin1String("GetAccessibleAt")) {
diff --git a/src/gui/accessible/linux/qspiaccessiblebridge.cpp b/src/gui/accessible/linux/qspiaccessiblebridge.cpp
index fb4bf1f27b..9b9b7a46a5 100644
--- a/src/gui/accessible/linux/qspiaccessiblebridge.cpp
+++ b/src/gui/accessible/linux/qspiaccessiblebridge.cpp
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
 */
 
 QSpiAccessibleBridge::QSpiAccessibleBridge()
-    : cache(0), dec(0), dbusAdaptor(0)
+    : cache(nullptr), dec(nullptr), dbusAdaptor(nullptr)
 {
     dbusConnection = new DBusConnection();
     connect(dbusConnection, SIGNAL(enabledChanged(bool)), this, SLOT(enabledChanged(bool)));
diff --git a/src/gui/image/qimage_conversions.cpp b/src/gui/image/qimage_conversions.cpp
index 773face2d4..f0c1951b94 100644
--- a/src/gui/image/qimage_conversions.cpp
+++ b/src/gui/image/qimage_conversions.cpp
@@ -224,8 +224,8 @@ void convert_generic(QImageData *dest, const QImageData *src, Qt::ImageConversio
                     buffer = reinterpret_cast<uint *>(destData) + x;
                 else
                     l = qMin(l, BufferSize);
-                const uint *ptr = fetch(buffer, srcData, x, l, 0, ditherPtr);
-                store(destData, ptr, x, l, 0, ditherPtr);
+                const uint *ptr = fetch(buffer, srcData, x, l, nullptr, ditherPtr);
+                store(destData, ptr, x, l, nullptr, ditherPtr);
                 x += l;
             }
             srcData += src->bytes_per_line;
diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp
index a3ff898222..0702e2bb23 100644
--- a/src/gui/image/qimagereader.cpp
+++ b/src/gui/image/qimagereader.cpp
@@ -538,7 +538,7 @@ bool QImageReaderPrivate::initHandler()
 
     // probe the file extension
     if (deleteDevice && !device->isOpen() && !device->open(QIODevice::ReadOnly) && autoDetectImageFormat) {
-        Q_ASSERT(qobject_cast<QFile*>(device) != 0); // future-proofing; for now this should always be the case, so...
+        Q_ASSERT(qobject_cast<QFile*>(device) != nullptr); // future-proofing; for now this should always be the case, so...
         QFile *file = static_cast<QFile *>(device);
 
         if (file->error() == QFileDevice::ResourceError) {
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<QStandardItem*> &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 QList<QStandardI
         rows += count;
         int index = childIndex(row, 0);
         if (index != -1)
-            children.insert(index, columnCount() * count, 0);
+            children.insert(index, columnCount() * count, nullptr);
     }
     if (!items.isEmpty()) {
         int index = childIndex(row, 0);
@@ -555,7 +555,7 @@ bool QStandardItemPrivate::insertColumns(int column, int count, const QList<QSta
         columns += count;
         int index = childIndex(0, column);
         for (int row = 0; row < rowCount(); ++row) {
-            children.insert(index, count, 0);
+            children.insert(index, count, nullptr);
             index += columnCount();
         }
     }
@@ -661,7 +661,7 @@ void QStandardItemModelPrivate::rowsInserted(QStandardItem *parent,
 {
     Q_Q(QStandardItemModel);
     if (parent == root.data())
-        rowHeaderItems.insert(row, count, 0);
+        rowHeaderItems.insert(row, count, nullptr);
     q->endInsertRows();
 }
 
@@ -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;
 }
diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp
index 51bf5cf336..82da0f8146 100644
--- a/src/gui/kernel/qopenglcontext.cpp
+++ b/src/gui/kernel/qopenglcontext.cpp
@@ -1247,14 +1247,14 @@ void QOpenGLMultiGroupSharedResource::insert(QOpenGLContext *context, QOpenGLSha
 QOpenGLSharedResource *QOpenGLMultiGroupSharedResource::value(QOpenGLContext *context)
 {
     QOpenGLContextGroup *group = context->shareGroup();
-    return group->d_func()->m_resources.value(this, 0);
+    return group->d_func()->m_resources.value(this, nullptr);
 }
 
 QList<QOpenGLSharedResource *> QOpenGLMultiGroupSharedResource::resources() const
 {
     QList<QOpenGLSharedResource *> result;
     for (QList<QOpenGLContextGroup *>::const_iterator it = m_groups.constBegin(); it != m_groups.constEnd(); ++it) {
-        QOpenGLSharedResource *resource = (*it)->d_func()->m_resources.value(const_cast<QOpenGLMultiGroupSharedResource *>(this), 0);
+        QOpenGLSharedResource *resource = (*it)->d_func()->m_resources.value(const_cast<QOpenGLMultiGroupSharedResource *>(this), nullptr);
         if (resource)
             result << resource;
     }
diff --git a/src/gui/kernel/qopenglcontext_p.h b/src/gui/kernel/qopenglcontext_p.h
index b3c0658d60..7bba323120 100644
--- a/src/gui/kernel/qopenglcontext_p.h
+++ b/src/gui/kernel/qopenglcontext_p.h
@@ -174,7 +174,7 @@ public:
         // Have to use our own mutex here, not the group's, since
         // m_groups has to be protected too against any concurrent access.
         QMutexLocker locker(&m_mutex);
-        T *resource = static_cast<T *>(group->d_func()->m_resources.value(this, 0));
+        T *resource = static_cast<T *>(group->d_func()->m_resources.value(this, nullptr));
         if (!resource) {
             resource = new T(context);
             insert(context, resource);
diff --git a/src/gui/kernel/qwindowsysteminterface_p.h b/src/gui/kernel/qwindowsysteminterface_p.h
index bca4786b6d..1cf060cfff 100644
--- a/src/gui/kernel/qwindowsysteminterface_p.h
+++ b/src/gui/kernel/qwindowsysteminterface_p.h
@@ -471,7 +471,7 @@ public:
         void prepend(WindowSystemEvent *e)
         { const QMutexLocker locker(&mutex); impl.prepend(e); }
         WindowSystemEvent *takeFirstOrReturnNull()
-        { const QMutexLocker locker(&mutex); return impl.empty() ? 0 : impl.takeFirst(); }
+        { const QMutexLocker locker(&mutex); return impl.empty() ? nullptr : impl.takeFirst(); }
         WindowSystemEvent *takeFirstNonUserInputOrReturnNull()
         {
             const QMutexLocker locker(&mutex);
diff --git a/src/gui/painting/qcompositionfunctions.cpp b/src/gui/painting/qcompositionfunctions.cpp
index ced213e36d..0d1e540c7a 100644
--- a/src/gui/painting/qcompositionfunctions.cpp
+++ b/src/gui/painting/qcompositionfunctions.cpp
@@ -3089,11 +3089,12 @@ CompositionFunctionSolid64 qt_functionForModeSolid64_C[] = {
         comp_func_solid_Difference_rgb64,
         comp_func_solid_Exclusion_rgb64,
 #else
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
 #endif
-        0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0
+        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
 };
 
 CompositionFunction qt_functionForMode_C[] = {
@@ -3164,11 +3165,12 @@ CompositionFunction64 qt_functionForMode64_C[] = {
         comp_func_Difference_rgb64,
         comp_func_Exclusion_rgb64,
 #else
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
 #endif
-        0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0
+        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/painting/qpathsimplifier.cpp b/src/gui/painting/qpathsimplifier.cpp
index 256a2fefe7..74313c9ca2 100644
--- a/src/gui/painting/qpathsimplifier.cpp
+++ b/src/gui/painting/qpathsimplifier.cpp
@@ -880,9 +880,9 @@ void PathSimplifier::connectElements()
 #ifndef QT_NO_DEBUG
     for (int i = 0; i < m_elements.size(); ++i) {
         const Element *element = m_elements.at(i);
-        Q_ASSERT(element->next == 0 || element->next->previous == element);
-        Q_ASSERT(element->previous == 0 || element->previous->next == element);
-        Q_ASSERT((element->next == 0) == (element->previous == 0));
+        Q_ASSERT(element->next == nullptr || element->next->previous == element);
+        Q_ASSERT(element->previous == nullptr || element->previous->next == element);
+        Q_ASSERT((element->next == nullptr) == (element->previous == nullptr));
     }
 #endif
 }
@@ -1442,7 +1442,7 @@ bool PathSimplifier::elementIsLeftOf(const Element *left, const Element *right)
 QPair<PathSimplifier::RBNode *, PathSimplifier::RBNode *> PathSimplifier::outerBounds(const QPoint &point)
 {
     RBNode *current = m_elementList.root;
-    QPair<RBNode *, RBNode *> result(0, 0);
+    QPair<RBNode *, RBNode *> result(nullptr, nullptr);
 
     while (current) {
         const Element *element = current->data;
diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp
index 925244a5a8..d510e28c6f 100644
--- a/src/gui/painting/qpdf.cpp
+++ b/src/gui/painting/qpdf.cpp
@@ -3038,7 +3038,7 @@ void QPdfEnginePrivate::drawTextItem(const QPointF &p, const QTextItemInt &ti)
         noEmbed = true;
     }
 
-    QFontSubset *font = fonts.value(face_id, 0);
+    QFontSubset *font = fonts.value(face_id, nullptr);
     if (!font) {
         font = new QFontSubset(fe, requestObject());
         font->noEmbed = noEmbed;
diff --git a/src/gui/painting/qtriangulator.cpp b/src/gui/painting/qtriangulator.cpp
index d3080aeb58..1c21706fbd 100644
--- a/src/gui/painting/qtriangulator.cpp
+++ b/src/gui/painting/qtriangulator.cpp
@@ -1061,7 +1061,7 @@ template <typename T>
 QPair<QRBTree<int>::Node *, QRBTree<int>::Node *> QTriangulator<T>::ComplexToSimple::bounds(const QPodPoint &point) const
 {
     QRBTree<int>::Node *current = m_edgeList.root;
-    QPair<QRBTree<int>::Node *, QRBTree<int>::Node *> result(0, 0);
+    QPair<QRBTree<int>::Node *, QRBTree<int>::Node *> result(nullptr, nullptr);
     while (current) {
         const QPodPoint &v1 = m_parent->m_vertices.at(m_edges.at(current->data).lower());
         const QPodPoint &v2 = m_parent->m_vertices.at(m_edges.at(current->data).upper());
@@ -1110,7 +1110,7 @@ template <typename T>
 QPair<QRBTree<int>::Node *, QRBTree<int>::Node *> QTriangulator<T>::ComplexToSimple::outerBounds(const QPodPoint &point) const
 {
     QRBTree<int>::Node *current = m_edgeList.root;
-    QPair<QRBTree<int>::Node *, QRBTree<int>::Node *> result(0, 0);
+    QPair<QRBTree<int>::Node *, QRBTree<int>::Node *> result(nullptr, nullptr);
 
     while (current) {
         const QPodPoint &v1 = m_parent->m_vertices.at(m_edges.at(current->data).lower());
@@ -1309,7 +1309,7 @@ void QTriangulator<T>::ComplexToSimple::calculateIntersections()
         int vertex = (event.type == Event::Upper ? m_edges.at(event.edge).upper() : m_edges.at(event.edge).lower());
         QIntersectionPoint eventPoint = QT_PREPEND_NAMESPACE(qIntersectionPoint)(event.point);
 
-        if (range.first != 0) {
+        if (range.first != nullptr) {
             splitEdgeListRange(range.first, range.second, vertex, eventPoint);
             reorderEdgeListRange(range.first, range.second);
         }
diff --git a/src/gui/painting/webgradients.cpp b/src/gui/painting/webgradients.cpp
index 33bbcc4319..d837c4383c 100644
--- a/src/gui/painting/webgradients.cpp
+++ b/src/gui/painting/webgradients.cpp
@@ -572,7 +572,7 @@ static Q_CONSTEXPR QGradient::QGradientData qt_preset_gradient_data[] = {
 static void *qt_preset_gradient_dummy()
 {
     union {void *p; uint i;};
-    p = 0;
+    p = nullptr;
     i |= uint(QGradient::ObjectMode);
     return p;
 }
diff --git a/src/gui/platform/unix/qeventdispatcher_glib.cpp b/src/gui/platform/unix/qeventdispatcher_glib.cpp
index 42b66af686..eaa27de25c 100644
--- a/src/gui/platform/unix/qeventdispatcher_glib.cpp
+++ b/src/gui/platform/unix/qeventdispatcher_glib.cpp
@@ -64,7 +64,7 @@ static gboolean userEventSourcePrepare(GSource *source, gint *timeout)
 
 static gboolean userEventSourceCheck(GSource *source)
 {
-    return userEventSourcePrepare(source, 0);
+    return userEventSourcePrepare(source, nullptr);
 }
 
 static gboolean userEventSourceDispatch(GSource *source, GSourceFunc, gpointer)
@@ -111,7 +111,7 @@ QPAEventDispatcherGlib::~QPAEventDispatcherGlib()
 
     g_source_destroy(&d->userEventSource->source);
     g_source_unref(&d->userEventSource->source);
-    d->userEventSource = 0;
+    d->userEventSource = nullptr;
 }
 
 bool QPAEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags)
diff --git a/src/gui/platform/unix/qgenericunixthemes.cpp b/src/gui/platform/unix/qgenericunixthemes.cpp
index 352c975400..92bf4a14ec 100644
--- a/src/gui/platform/unix/qgenericunixthemes.cpp
+++ b/src/gui/platform/unix/qgenericunixthemes.cpp
@@ -80,16 +80,16 @@ Q_DECLARE_LOGGING_CATEGORY(qLcTray)
 
 ResourceHelper::ResourceHelper()
 {
-    std::fill(palettes, palettes + QPlatformTheme::NPalettes, static_cast<QPalette *>(0));
-    std::fill(fonts, fonts + QPlatformTheme::NFonts, static_cast<QFont *>(0));
+    std::fill(palettes, palettes + QPlatformTheme::NPalettes, static_cast<QPalette *>(nullptr));
+    std::fill(fonts, fonts + QPlatformTheme::NFonts, static_cast<QFont *>(nullptr));
 }
 
 void ResourceHelper::clear()
 {
     qDeleteAll(palettes, palettes + QPlatformTheme::NPalettes);
     qDeleteAll(fonts, fonts + QPlatformTheme::NFonts);
-    std::fill(palettes, palettes + QPlatformTheme::NPalettes, static_cast<QPalette *>(0));
-    std::fill(fonts, fonts + QPlatformTheme::NFonts, static_cast<QFont *>(0));
+    std::fill(palettes, palettes + QPlatformTheme::NPalettes, static_cast<QPalette *>(nullptr));
+    std::fill(fonts, fonts + QPlatformTheme::NFonts, static_cast<QFont *>(nullptr));
 }
 
 const char *QGenericUnixTheme::name = "generic";
@@ -162,7 +162,7 @@ const QFont *QGenericUnixTheme::font(Font type) const
     case QPlatformTheme::FixedFont:
         return &d->fixedFont;
     default:
-        return 0;
+        return nullptr;
     }
 }
 
@@ -532,7 +532,7 @@ QFont *QKdeThemePrivate::kdeFont(const QVariant &fontValue)
                 return new QFont(font);
         }
     }
-    return 0;
+    return nullptr;
 }
 
 
@@ -621,7 +621,7 @@ QPlatformTheme *QKdeTheme::createKdeTheme()
     const QByteArray kdeVersionBA = qgetenv("KDE_SESSION_VERSION");
     const int kdeVersion = kdeVersionBA.toInt();
     if (kdeVersion < 4)
-        return 0;
+        return nullptr;
 
     if (kdeVersion > 4)
         // Plasma 5 follows XDG spec
@@ -665,7 +665,7 @@ QPlatformTheme *QKdeTheme::createKdeTheme()
     kdeDirs.removeDuplicates();
     if (kdeDirs.isEmpty()) {
         qWarning("Unable to determine KDE dirs");
-        return 0;
+        return nullptr;
     }
 
     return new QKdeTheme(kdeDirs, kdeVersion);
@@ -782,7 +782,7 @@ const QFont *QGnomeTheme::font(Font type) const
     case QPlatformTheme::FixedFont:
         return d->fixedFont;
     default:
-        return 0;
+        return nullptr;
     }
 }
 
diff --git a/src/gui/text/freetype/qfontengine_ft.cpp b/src/gui/text/freetype/qfontengine_ft.cpp
index e916d7242f..42cf147901 100644
--- a/src/gui/text/freetype/qfontengine_ft.cpp
+++ b/src/gui/text/freetype/qfontengine_ft.cpp
@@ -220,7 +220,7 @@ QFreetypeFace *QFreetypeFace::getFace(const QFontEngine::FaceId &face_id,
 
     QtFreetypeData *freetypeData = qt_getFreetypeData();
 
-    QFreetypeFace *freetype = freetypeData->faces.value(face_id, 0);
+    QFreetypeFace *freetype = freetypeData->faces.value(face_id, nullptr);
     if (freetype) {
         freetype->ref.ref();
     } else {
@@ -1396,7 +1396,7 @@ void QFontEngineFT::TransformedGlyphSets::moveToFront(int i)
 QFontEngineFT::QGlyphSet *QFontEngineFT::loadGlyphSet(const QTransform &matrix)
 {
     if (matrix.type() > QTransform::TxShear || !cacheEnabled)
-        return 0;
+        return nullptr;
 
     // FT_Set_Transform only supports scalable fonts
     if (!FT_IS_SCALABLE(freetype->face))
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 9005c11792..dab787bbde 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -2667,7 +2667,7 @@ void QFontCache::cleanup()
         // no cache - just ignore
     }
     if (cache && cache->hasLocalData())
-        cache->setLocalData(0);
+        cache->setLocalData(nullptr);
 }
 
 static QBasicAtomicInt font_cache_id = Q_BASIC_ATOMIC_INITIALIZER(0);
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index d3c8c1a840..819b2d14f8 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -230,7 +230,7 @@ bool QFontEngine::supportsScript(QChar::Script script) const
     if (qt_useHarfbuzzNG()) {
         // in AAT fonts, 'gsub' table is effectively replaced by 'mort'/'morx' table
         uint len;
-        if (getSfntTableData(MAKE_TAG('m','o','r','t'), 0, &len) || getSfntTableData(MAKE_TAG('m','o','r','x'), 0, &len))
+        if (getSfntTableData(MAKE_TAG('m','o','r','t'), nullptr, &len) || getSfntTableData(MAKE_TAG('m','o','r','x'), nullptr, &len))
             return true;
 
         if (hb_face_t *face = hb_qt_face_get_for_engine(const_cast<QFontEngine *>(this))) {
diff --git a/src/gui/text/qfontengine_qpf2.cpp b/src/gui/text/qfontengine_qpf2.cpp
index 7178ef2928..3b904e122a 100644
--- a/src/gui/text/qfontengine_qpf2.cpp
+++ b/src/gui/text/qfontengine_qpf2.cpp
@@ -90,7 +90,7 @@ static const QFontEngineQPF2::TagType tagTypes[QFontEngineQPF2::NumTags] = {
 #define READ_VERIFY(type, variable) \
     if (tagPtr + sizeof(type) > endPtr) { \
         DEBUG_VERIFY() << "read verify failed in line" << __LINE__; \
-        return 0; \
+        return nullptr; \
     } \
     variable = qFromBigEndian<type>(tagPtr); \
     DEBUG_VERIFY() << "read value" << variable << "of type " #type; \
@@ -113,7 +113,7 @@ T readValue(const uchar *&data)
 #define VERIFY_TAG(condition) \
     if (!(condition)) { \
         DEBUG_VERIFY() << "verifying tag condition " #condition " failed in line" << __LINE__ << "with tag" << tag; \
-        return 0; \
+        return nullptr; \
     }
 
 static inline const uchar *verifyTag(const uchar *tagPtr, const uchar *endPtr)
diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp
index 94efb4a94d..d6da0f38d2 100644
--- a/src/gui/text/qtextdocument_p.cpp
+++ b/src/gui/text/qtextdocument_p.cpp
@@ -1601,7 +1601,7 @@ QTextObject *QTextDocumentPrivate::objectForIndex(int objectIndex) const
     if (objectIndex < 0)
         return nullptr;
 
-    QTextObject *object = objects.value(objectIndex, 0);
+    QTextObject *object = objects.value(objectIndex, nullptr);
     if (!object) {
         QTextDocumentPrivate *that = const_cast<QTextDocumentPrivate *>(this);
         QTextFormat fmt = formats.objectFormat(objectIndex);
diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp
index d6e2441862..8ea3a655b7 100644
--- a/src/gui/text/qtextdocumentlayout.cpp
+++ b/src/gui/text/qtextdocumentlayout.cpp
@@ -2909,7 +2909,7 @@ void QTextDocumentLayoutPrivate::positionFloat(QTextFrame *frame, QTextLine *cur
 
     // If the frame is a table, then positioning it will affect the size if it covers more than
     // one page, because of page breaks and repeating the header.
-    if (qobject_cast<QTextTable *>(frame) != 0)
+    if (qobject_cast<QTextTable *>(frame) != nullptr)
         fd->sizeDirty = frameSpansIntoNextPage;
 }
 
diff --git a/src/gui/text/qtextodfwriter.cpp b/src/gui/text/qtextodfwriter.cpp
index 62a655b43c..ef51c967b0 100644
--- a/src/gui/text/qtextodfwriter.cpp
+++ b/src/gui/text/qtextodfwriter.cpp
@@ -312,7 +312,7 @@ void QTextOdfWriter::writeBlock(QXmlStreamWriter &writer, const QTextBlock &bloc
                             .arg(block.textList()->formatIndex()));
                 }
                 else {
-                    m_listStack.push(0);
+                    m_listStack.push(nullptr);
                 }
             }
         }
diff --git a/src/gui/util/qgridlayoutengine.cpp b/src/gui/util/qgridlayoutengine.cpp
index 4c36ff197b..d875db0da6 100644
--- a/src/gui/util/qgridlayoutengine.cpp
+++ b/src/gui/util/qgridlayoutengine.cpp
@@ -1255,7 +1255,7 @@ void QGridLayoutEngine::maybeExpandGrid(int row, int column, Qt::Orientation ori
 
                     Q_ASSERT(newIndex > oldIndex);
                     q_grid[newIndex] = q_grid[oldIndex];
-                    q_grid[oldIndex] = 0;
+                    q_grid[oldIndex] = nullptr;
                 }
             }
         }
@@ -1264,7 +1264,7 @@ void QGridLayoutEngine::maybeExpandGrid(int row, int column, Qt::Orientation ori
 
 void QGridLayoutEngine::regenerateGrid()
 {
-    q_grid.fill(0);
+    q_grid.fill(nullptr);
 
     for (int i = q_items.count() - 1; i >= 0; --i) {
         QGridLayoutItem *item = q_items.at(i);
diff --git a/src/gui/vulkan/qbasicvulkanplatforminstance.cpp b/src/gui/vulkan/qbasicvulkanplatforminstance.cpp
index 97d5a7643f..01d6179166 100644
--- a/src/gui/vulkan/qbasicvulkanplatforminstance.cpp
+++ b/src/gui/vulkan/qbasicvulkanplatforminstance.cpp
@@ -66,7 +66,7 @@ QBasicPlatformVulkanInstance::QBasicPlatformVulkanInstance()
       m_vkGetInstanceProcAddr(nullptr),
       m_ownsVkInst(false),
       m_errorCode(VK_SUCCESS),
-      m_debugCallback(0)
+      m_debugCallback(VK_NULL_HANDLE)
 {
 }