summaryrefslogtreecommitdiffstats
path: root/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp
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/wayland_wrapper/qwldatadevicemanager.cpp
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/wayland_wrapper/qwldatadevicemanager.cpp')
-rw-r--r--src/compositor/wayland_wrapper/qwldatadevicemanager.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp b/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp
index a1937c923..0c0855d24 100644
--- a/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp
+++ b/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp
@@ -59,11 +59,11 @@ QT_BEGIN_NAMESPACE
namespace QtWayland {
DataDeviceManager::DataDeviceManager(QWaylandCompositor *compositor)
- : QObject(0)
+ : QObject(nullptr)
, wl_data_device_manager(compositor->display(), 1)
, m_compositor(compositor)
- , m_current_selection_source(0)
- , m_retainedReadNotifier(0)
+ , m_current_selection_source(nullptr)
+ , m_retainedReadNotifier(nullptr)
, m_compositorOwnsSelection(false)
{
}
@@ -137,7 +137,7 @@ void DataDeviceManager::finishReadFromClient(bool exhausted)
// or else clients may SIGPIPE.
m_obsoleteRetainedReadNotifiers.append(m_retainedReadNotifier);
}
- m_retainedReadNotifier = 0;
+ m_retainedReadNotifier = nullptr;
}
}
@@ -219,7 +219,7 @@ bool DataDeviceManager::offerFromCompositorToClient(wl_resource *clientDataDevic
struct wl_resource *selectionOffer =
wl_resource_create(client, &wl_data_offer_interface, -1, 0);
- wl_resource_set_implementation(selectionOffer, &compositor_offer_interface, this, 0);
+ wl_resource_set_implementation(selectionOffer, &compositor_offer_interface, this, nullptr);
wl_data_device_send_data_offer(clientDataDeviceResource, selectionOffer);
foreach (const QString &format, m_retainedData.formats()) {
QByteArray ba = format.toLatin1();