From 6f4748dc083572ae9debafc6e632707d53dbf944 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Fri, 6 Aug 2021 15:28:49 +0300
Subject: [PATCH] generic: replace Q_NULLPTR with nullptr

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 kdeclarative/kdeclarative.cpp                  | 2 +-
 solid/solid/backends/udev/udevopticaldisc.cpp  | 2 +-
 solid/solid/backends/udev/udevopticaldrive.cpp | 2 +-
 solid/solid/backends/udev/udevqtdevice.cpp     | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kdeclarative/kdeclarative.cpp b/kdeclarative/kdeclarative.cpp
index a4c88500..e994483b 100644
--- a/kdeclarative/kdeclarative.cpp
+++ b/kdeclarative/kdeclarative.cpp
@@ -137,7 +137,7 @@ void KDeclarative::initialize()
     d->scriptEngine.data()->setGlobalObject(newGlobalObject);
 
 #ifdef QT_KATIE
-    KCmdLineArgs::init(KCmdLineArgs::qtArgc(), KCmdLineArgs::qtArgv(), Q_NULLPTR);
+    KCmdLineArgs::init(KCmdLineArgs::qtArgc(), KCmdLineArgs::qtArgv(), nullptr);
 #endif
 
     d->initialized = true;
diff --git a/solid/solid/backends/udev/udevopticaldisc.cpp b/solid/solid/backends/udev/udevopticaldisc.cpp
index 0fcb4d6e..589a591e 100644
--- a/solid/solid/backends/udev/udevopticaldisc.cpp
+++ b/solid/solid/backends/udev/udevopticaldisc.cpp
@@ -28,7 +28,7 @@ using namespace Solid::Backends::UDev;
 
 OpticalDisc::OpticalDisc(UDevDevice *device)
     : StorageVolume(device),
-    p_cdio(Q_NULLPTR)
+    p_cdio(nullptr)
 {
     const QByteArray devicename(m_device->deviceProperty("DEVNAME").toLocal8Bit());
     p_cdio = cdio_open(devicename.constData(), DRIVER_UNKNOWN);
diff --git a/solid/solid/backends/udev/udevopticaldrive.cpp b/solid/solid/backends/udev/udevopticaldrive.cpp
index 27e4e4ad..c6ed364b 100644
--- a/solid/solid/backends/udev/udevopticaldrive.cpp
+++ b/solid/solid/backends/udev/udevopticaldrive.cpp
@@ -39,7 +39,7 @@ using namespace Solid::Backends::UDev;
 
 OpticalDrive::OpticalDrive(UDevDevice *device)
     : StorageDrive(device),
-    p_cdio(Q_NULLPTR)
+    p_cdio(nullptr)
 {
     const QByteArray devicename(m_device->deviceProperty("DEVNAME").toLocal8Bit());
     p_cdio = cdio_open(devicename.constData(), DRIVER_UNKNOWN);
diff --git a/solid/solid/backends/udev/udevqtdevice.cpp b/solid/solid/backends/udev/udevqtdevice.cpp
index 1563ab27..20d551a0 100644
--- a/solid/solid/backends/udev/udevqtdevice.cpp
+++ b/solid/solid/backends/udev/udevqtdevice.cpp
@@ -25,7 +25,7 @@
 namespace UdevQt {
 
 Device::Device()
-    : m_device(Q_NULLPTR)
+    : m_device(nullptr)
 {
 }
 
@@ -59,14 +59,14 @@ Device &Device::operator=(const Device &other)
     if (other.m_device) {
         m_device = udev_device_ref(other.m_device);
     } else {
-        m_device = Q_NULLPTR;
+        m_device = nullptr;
     }
     return *this;
 }
 
 bool Device::isValid() const
 {
-    return (m_device != Q_NULLPTR);
+    return (m_device != nullptr);
 }
 
 QString Device::subsystem() const