mirror of
https://bitbucket.org/smil3y/kdelibs.git
synced 2025-02-23 18:32:49 +00:00
generic: replace Q_NULLPTR with nullptr
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
ea0d7874fb
commit
6f4748dc08
4 changed files with 6 additions and 6 deletions
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue