diff options
author | Kevin Funk <kfunk@kde.org> | 2017-09-24 23:55:04 +0200 |
---|---|---|
committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-26 15:45:33 +0000 |
commit | 064feb4fd76e6adbfcafe449d6ae7f52834c538a (patch) | |
tree | 5a9f20aced2da3e4cc6055cae7156e121f4210d0 /src/compositor/global | |
parent | 62c058f83add9f559f09cf74bc50f721ed75d76a (diff) |
Replace Q_NULLPTR with nullptr
Change-Id: I9699a957430b8d3574ce29acb91b7ada9ea6209b
Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com>
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/compositor/global')
-rw-r--r-- | src/compositor/global/qwaylandcompositorextension.cpp | 6 | ||||
-rw-r--r-- | src/compositor/global/qwaylandcompositorextension.h | 2 | ||||
-rw-r--r-- | src/compositor/global/qwaylandcompositorextension_p.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/compositor/global/qwaylandcompositorextension.cpp b/src/compositor/global/qwaylandcompositorextension.cpp index 7b44dbde6..ee117bbae 100644 --- a/src/compositor/global/qwaylandcompositorextension.cpp +++ b/src/compositor/global/qwaylandcompositorextension.cpp @@ -146,7 +146,7 @@ QWaylandObject::QWaylandObject(QObjectPrivate &d, QObject *parent) QWaylandObject::~QWaylandObject() { foreach (QWaylandCompositorExtension *extension, extension_vector) - QWaylandCompositorExtensionPrivate::get(extension)->extension_container = Q_NULLPTR; + QWaylandCompositorExtensionPrivate::get(extension)->extension_container = nullptr; } QWaylandCompositorExtension *QWaylandObject::extension(const QByteArray &name) @@ -155,7 +155,7 @@ QWaylandCompositorExtension *QWaylandObject::extension(const QByteArray &name) if (extension_vector.at(i)->extensionInterface()->name == name) return extension_vector.at(i); } - return Q_NULLPTR; + return nullptr; } QWaylandCompositorExtension *QWaylandObject::extension(const wl_interface *interface) @@ -164,7 +164,7 @@ QWaylandCompositorExtension *QWaylandObject::extension(const wl_interface *inter if (extension_vector.at(i)->extensionInterface() == interface) return extension_vector.at(i); } - return Q_NULLPTR; + return nullptr; } QList<QWaylandCompositorExtension *> QWaylandObject::extensions() const diff --git a/src/compositor/global/qwaylandcompositorextension.h b/src/compositor/global/qwaylandcompositorextension.h index 73f8aab36..48fce0c96 100644 --- a/src/compositor/global/qwaylandcompositorextension.h +++ b/src/compositor/global/qwaylandcompositorextension.h @@ -114,7 +114,7 @@ public: static T *findIn(QWaylandObject *container) { - if (!container) return Q_NULLPTR; + if (!container) return nullptr; return qobject_cast<T *>(container->extension(T::interfaceName())); } diff --git a/src/compositor/global/qwaylandcompositorextension_p.h b/src/compositor/global/qwaylandcompositorextension_p.h index 56889cfab..68f817aa6 100644 --- a/src/compositor/global/qwaylandcompositorextension_p.h +++ b/src/compositor/global/qwaylandcompositorextension_p.h @@ -64,7 +64,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandCompositorExtensionPrivate : public QO public: QWaylandCompositorExtensionPrivate() : QObjectPrivate() - , extension_container(Q_NULLPTR) + , extension_container(nullptr) , initialized(false) { } |