diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-02-20 13:35:03 +0100 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2018-02-20 14:15:08 +0000 |
| commit | 1ebb4e0d64bf27dfc6c38b9770ae744fad87fb82 (patch) | |
| tree | f92eb1649a32785f93fe6af8df82c8d0611b21e0 /src/client/qwaylanddatadevice.cpp | |
| parent | abfdf34f510b64439c85cc54f47b41c4ce3f9c61 (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/client/qwaylanddatadevice.cpp')
| -rw-r--r-- | src/client/qwaylanddatadevice.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/client/qwaylanddatadevice.cpp b/src/client/qwaylanddatadevice.cpp index 66f36f75b..83912035a 100644 --- a/src/client/qwaylanddatadevice.cpp +++ b/src/client/qwaylanddatadevice.cpp @@ -67,7 +67,7 @@ QWaylandDataDevice::QWaylandDataDevice(QWaylandDataDeviceManager *manager, QWayl , m_display(manager->display()) , m_inputDevice(inputDevice) , m_enterSerial(0) - , m_dragWindow(0) + , m_dragWindow(nullptr) , m_dragPoint() , m_dragOffer() , m_selectionOffer() @@ -135,7 +135,7 @@ void QWaylandDataDevice::data_device_drop() { QDrag *drag = static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->currentDrag(); - QMimeData *dragData = 0; + QMimeData *dragData = nullptr; Qt::DropActions supportedActions; if (drag) { dragData = drag->mimeData(); @@ -182,14 +182,14 @@ void QWaylandDataDevice::data_device_enter(uint32_t serial, wl_surface *surface, if (response.isAccepted()) { wl_data_offer_accept(m_dragOffer->object(), m_enterSerial, m_dragOffer->firstFormat().toUtf8().constData()); } else { - wl_data_offer_accept(m_dragOffer->object(), m_enterSerial, 0); + wl_data_offer_accept(m_dragOffer->object(), m_enterSerial, nullptr); } } void QWaylandDataDevice::data_device_leave() { if (m_dragWindow) - QWindowSystemInterface::handleDrag(m_dragWindow, 0, QPoint(), Qt::IgnoreAction); + QWindowSystemInterface::handleDrag(m_dragWindow, nullptr, QPoint(), Qt::IgnoreAction); QDrag *drag = static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->currentDrag(); if (!drag) { @@ -227,7 +227,7 @@ void QWaylandDataDevice::data_device_motion(uint32_t time, wl_fixed_t x, wl_fixe if (response.isAccepted()) { wl_data_offer_accept(m_dragOffer->object(), m_enterSerial, m_dragOffer->firstFormat().toUtf8().constData()); } else { - wl_data_offer_accept(m_dragOffer->object(), m_enterSerial, 0); + wl_data_offer_accept(m_dragOffer->object(), m_enterSerial, nullptr); } } #endif // QT_CONFIG(draganddrop) |