From 9f2e3b54d6cd5a3961ff180cf25f8720d67e6a24 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 6 Aug 2021 17:57:44 +0300 Subject: [PATCH] solid: replace Q_NULLPTR with nullptr Signed-off-by: Ivailo Monev --- solid/solid/backends/geom/geomdevice.cpp | 8 ++++---- solid/solid/backends/geom/geommanager.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/solid/solid/backends/geom/geomdevice.cpp b/solid/solid/backends/geom/geomdevice.cpp index 84fbef6d..0344a5bc 100644 --- a/solid/solid/backends/geom/geomdevice.cpp +++ b/solid/solid/backends/geom/geomdevice.cpp @@ -67,10 +67,10 @@ GeomDevice::GeomDevice(const QString &device) struct gmesh tree; ::memset(&tree, 0, sizeof(gmesh)); const int geomresult = geom_gettree(&tree); - struct gclass* geomclass = Q_NULLPTR; - struct ggeom* geomgeom = Q_NULLPTR; - struct gprovider* geomprovider = Q_NULLPTR; - struct gconfig* geomconfig = Q_NULLPTR; + struct gclass* geomclass = nullptr; + struct ggeom* geomgeom = nullptr; + struct gprovider* geomprovider = nullptr; + struct gconfig* geomconfig = nullptr; LIST_FOREACH(geomclass, &tree.lg_class, lg_class) { LIST_FOREACH(geomgeom, &geomclass->lg_geom, lg_geom) { LIST_FOREACH(geomprovider, &geomgeom->lg_provider, lg_provider) { diff --git a/solid/solid/backends/geom/geommanager.cpp b/solid/solid/backends/geom/geommanager.cpp index 6a6a45a0..10356fe6 100644 --- a/solid/solid/backends/geom/geommanager.cpp +++ b/solid/solid/backends/geom/geommanager.cpp @@ -78,9 +78,9 @@ QStringList GeomManager::allDevices() struct gmesh tree; ::memset(&tree, 0, sizeof(gmesh)); const int geomresult = geom_gettree(&tree); - struct gclass* geomclass = Q_NULLPTR; - struct ggeom* geomgeom = Q_NULLPTR; - struct gprovider* geomprovider = Q_NULLPTR; + struct gclass* geomclass = nullptr; + struct ggeom* geomgeom = nullptr; + struct gprovider* geomprovider = nullptr; // NOTE: keep in sync with kdelibs/solid/solid/backends/geom/geomdevice.cpp LIST_FOREACH(geomclass, &tree.lg_class, lg_class) { // not interested in devices made up by providers such as labels