diff options
Diffstat (limited to 'src/compositor/wayland_wrapper')
4 files changed, 21 insertions, 21 deletions
diff --git a/src/compositor/wayland_wrapper/qwlbuffermanager.cpp b/src/compositor/wayland_wrapper/qwlbuffermanager.cpp index a8314daea..86331a744 100644 --- a/src/compositor/wayland_wrapper/qwlbuffermanager.cpp +++ b/src/compositor/wayland_wrapper/qwlbuffermanager.cpp @@ -57,7 +57,7 @@ BufferManager::BufferManager(QWaylandCompositor *compositor) struct buffer_manager_destroy_listener : wl_listener { buffer_manager_destroy_listener() - : d(0) + : d(nullptr) { notify = BufferManager::destroy_listener_callback; wl_list_init(&this->link); diff --git a/src/compositor/wayland_wrapper/qwldatadevice.cpp b/src/compositor/wayland_wrapper/qwldatadevice.cpp index 73d7bb1fa..3b557a109 100644 --- a/src/compositor/wayland_wrapper/qwldatadevice.cpp +++ b/src/compositor/wayland_wrapper/qwldatadevice.cpp @@ -64,13 +64,13 @@ DataDevice::DataDevice(QWaylandSeat *seat) : wl_data_device() , m_compositor(seat->compositor()) , m_seat(seat) - , m_selectionSource(0) + , m_selectionSource(nullptr) #if QT_CONFIG(draganddrop) - , m_dragClient(0) - , m_dragDataSource(0) - , m_dragFocus(0) - , m_dragFocusResource(0) - , m_dragIcon(0) + , m_dragClient(nullptr) + , m_dragDataSource(nullptr) + , m_dragFocus(nullptr) + , m_dragFocusResource(nullptr) + , m_dragIcon(nullptr) , m_dragOrigin(nullptr) #endif { @@ -95,7 +95,7 @@ void DataDevice::setFocus(QWaylandClient *focusClient) void DataDevice::sourceDestroyed(DataSource *source) { if (m_selectionSource == source) - m_selectionSource = 0; + m_selectionSource = nullptr; } #if QT_CONFIG(draganddrop) @@ -103,8 +103,8 @@ void DataDevice::setDragFocus(QWaylandSurface *focus, const QPointF &localPositi { if (m_dragFocusResource) { send_leave(m_dragFocusResource->handle); - m_dragFocus = 0; - m_dragFocusResource = 0; + m_dragFocus = nullptr; + m_dragFocusResource = nullptr; } if (!focus) @@ -120,7 +120,7 @@ void DataDevice::setDragFocus(QWaylandSurface *focus, const QPointF &localPositi uint32_t serial = m_compositor->nextSerial(); - DataOffer *offer = m_dragDataSource ? new DataOffer(m_dragDataSource, resource) : 0; + DataOffer *offer = m_dragDataSource ? new DataOffer(m_dragDataSource, resource) : nullptr; if (m_dragDataSource && !offer) return; @@ -174,7 +174,7 @@ void DataDevice::cancelDrag() void DataDevice::data_device_start_drag(Resource *resource, struct ::wl_resource *source, struct ::wl_resource *origin, struct ::wl_resource *icon, uint32_t serial) { m_dragClient = resource->client(); - m_dragDataSource = source ? DataSource::fromResource(source) : 0; + m_dragDataSource = source ? DataSource::fromResource(source) : nullptr; m_dragOrigin = QWaylandSurface::fromResource(origin); QWaylandDrag *drag = m_seat->drag(); setDragIcon(icon ? QWaylandSurface::fromResource(icon) : nullptr); @@ -198,7 +198,7 @@ void DataDevice::data_device_set_selection(Resource *, struct ::wl_resource *sou { Q_UNUSED(serial); - DataSource *dataSource = source ? DataSource::fromResource(source) : 0; + DataSource *dataSource = source ? DataSource::fromResource(source) : nullptr; if (m_selectionSource) m_selectionSource->cancel(); @@ -215,7 +215,7 @@ void DataDevice::data_device_set_selection(Resource *, struct ::wl_resource *sou DataOffer *offer = new DataOffer(m_selectionSource, resource); send_selection(resource->handle, offer->resource()->handle); } else if (resource) { - send_selection(resource->handle, 0); + send_selection(resource->handle, nullptr); } } 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(); diff --git a/src/compositor/wayland_wrapper/qwldatasource.cpp b/src/compositor/wayland_wrapper/qwldatasource.cpp index 3a50cd0ff..2d523dad9 100644 --- a/src/compositor/wayland_wrapper/qwldatasource.cpp +++ b/src/compositor/wayland_wrapper/qwldatasource.cpp @@ -52,8 +52,8 @@ namespace QtWayland { DataSource::DataSource(struct wl_client *client, uint32_t id, uint32_t time) : QtWaylandServer::wl_data_source(client, id, 1) , m_time(time) - , m_device(0) - , m_manager(0) + , m_device(nullptr) + , m_manager(nullptr) { } |