summaryrefslogtreecommitdiffstats
path: root/src/compositor/hardware_integration
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2018-02-20 13:35:03 +0100
committerJohan Helsing <johan.helsing@qt.io>2018-02-20 14:15:08 +0000
commit1ebb4e0d64bf27dfc6c38b9770ae744fad87fb82 (patch)
treef92eb1649a32785f93fe6af8df82c8d0611b21e0 /src/compositor/hardware_integration
parentabfdf34f510b64439c85cc54f47b41c4ce3f9c61 (diff)
Use nullptr instead of 0 or NULL
Applied automatic fixes using clang-tidy's modernize-use-nullptr, and some manual cleanup to prevent QFlag macros to be affected. Change-Id: I88f94390185bc6e6f23693b68723cd5710815ae6 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/compositor/hardware_integration')
-rw-r--r--src/compositor/hardware_integration/qwlclientbufferintegration.cpp2
-rw-r--r--src/compositor/hardware_integration/qwlclientbufferintegrationfactory.cpp2
-rw-r--r--src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h2
-rw-r--r--src/compositor/hardware_integration/qwlserverbufferintegrationfactory.cpp2
-rw-r--r--src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/compositor/hardware_integration/qwlclientbufferintegration.cpp b/src/compositor/hardware_integration/qwlclientbufferintegration.cpp
index 67d4e5f54..3f4d4a412 100644
--- a/src/compositor/hardware_integration/qwlclientbufferintegration.cpp
+++ b/src/compositor/hardware_integration/qwlclientbufferintegration.cpp
@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE
namespace QtWayland {
ClientBufferIntegration::ClientBufferIntegration()
- : m_compositor(0)
+ : m_compositor(nullptr)
{
}
diff --git a/src/compositor/hardware_integration/qwlclientbufferintegrationfactory.cpp b/src/compositor/hardware_integration/qwlclientbufferintegrationfactory.cpp
index 57359190d..68c8ac4c6 100644
--- a/src/compositor/hardware_integration/qwlclientbufferintegrationfactory.cpp
+++ b/src/compositor/hardware_integration/qwlclientbufferintegrationfactory.cpp
@@ -90,7 +90,7 @@ ClientBufferIntegration *ClientBufferIntegrationFactory::create(const QString &n
if (ClientBufferIntegration *ret = qLoadPlugin<ClientBufferIntegration, ClientBufferIntegrationPlugin>(loader(), name, args))
return ret;
#endif
- return 0;
+ return nullptr;
}
}
diff --git a/src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h b/src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h
index bc8f0a48a..edf4fea0a 100644
--- a/src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h
+++ b/src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h
@@ -68,7 +68,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT ClientBufferIntegrationPlugin : public QObject
{
Q_OBJECT
public:
- explicit ClientBufferIntegrationPlugin(QObject *parent = 0);
+ explicit ClientBufferIntegrationPlugin(QObject *parent = nullptr);
~ClientBufferIntegrationPlugin();
virtual ClientBufferIntegration *create(const QString &key, const QStringList &paramList) = 0;
diff --git a/src/compositor/hardware_integration/qwlserverbufferintegrationfactory.cpp b/src/compositor/hardware_integration/qwlserverbufferintegrationfactory.cpp
index 6425f7c38..2b60de5eb 100644
--- a/src/compositor/hardware_integration/qwlserverbufferintegrationfactory.cpp
+++ b/src/compositor/hardware_integration/qwlserverbufferintegrationfactory.cpp
@@ -90,7 +90,7 @@ ServerBufferIntegration *ServerBufferIntegrationFactory::create(const QString &n
if (ServerBufferIntegration *ret = qLoadPlugin<ServerBufferIntegration, ServerBufferIntegrationPlugin>(loader(), name, args))
return ret;
#endif
- return 0;
+ return nullptr;
}
}
diff --git a/src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h b/src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h
index e1b123c6f..0cb5ed323 100644
--- a/src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h
+++ b/src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h
@@ -68,7 +68,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT ServerBufferIntegrationPlugin : public QObject
{
Q_OBJECT
public:
- explicit ServerBufferIntegrationPlugin(QObject *parent = 0);
+ explicit ServerBufferIntegrationPlugin(QObject *parent = nullptr);
~ServerBufferIntegrationPlugin();
virtual ServerBufferIntegration *create(const QString &key, const QStringList &paramList) = 0;