diff options
Diffstat (limited to 'src/compositor/compositor_api')
11 files changed, 29 insertions, 29 deletions
diff --git a/src/compositor/compositor_api/qwaylandbufferref.cpp b/src/compositor/compositor_api/qwaylandbufferref.cpp index 8ceeeea56..affd7af33 100644 --- a/src/compositor/compositor_api/qwaylandbufferref.cpp +++ b/src/compositor/compositor_api/qwaylandbufferref.cpp @@ -71,7 +71,7 @@ public: QWaylandBufferRef::QWaylandBufferRef() : d(new QWaylandBufferRefPrivate) { - d->buffer = 0; + d->buffer = nullptr; } /*! diff --git a/src/compositor/compositor_api/qwaylandclient.cpp b/src/compositor/compositor_api/qwaylandclient.cpp index 122fd41c3..471c1b5a1 100644 --- a/src/compositor/compositor_api/qwaylandclient.cpp +++ b/src/compositor/compositor_api/qwaylandclient.cpp @@ -69,7 +69,7 @@ public: Q_UNUSED(data); QWaylandClient *client = reinterpret_cast<Listener *>(listener)->parent; - Q_ASSERT(client != 0); + Q_ASSERT(client != nullptr); delete client; } @@ -144,7 +144,7 @@ QWaylandClient::~QWaylandClient() QWaylandClient *QWaylandClient::fromWlClient(QWaylandCompositor *compositor, wl_client *wlClient) { if (!wlClient) - return 0; + return nullptr; QWaylandClient *client = nullptr; @@ -152,7 +152,7 @@ QWaylandClient *QWaylandClient::fromWlClient(QWaylandCompositor *compositor, wl_ QWaylandClientPrivate::client_destroy_callback); if (l) client = reinterpret_cast<QWaylandClientPrivate::Listener *>( - wl_container_of(l, (QWaylandClientPrivate::Listener *)0, listener))->parent; + wl_container_of(l, (QWaylandClientPrivate::Listener *)nullptr, listener))->parent; if (!client) { // The original idea was to create QWaylandClient instances when diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index 4c662a34a..289af2f38 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -148,11 +148,11 @@ public: } // namespace QWaylandCompositorPrivate::QWaylandCompositorPrivate(QWaylandCompositor *compositor) - : display(0) + : display(nullptr) #if QT_CONFIG(opengl) , use_hw_integration_extension(true) - , client_buffer_integration(0) - , server_buffer_integration(0) + , client_buffer_integration(nullptr) + , server_buffer_integration(nullptr) #endif , retainSelection(false) , preInitialized(false) @@ -834,7 +834,7 @@ QWaylandSeat *QWaylandCompositor::defaultSeat() const QWaylandSeat *QWaylandCompositor::seatFor(QInputEvent *inputEvent) { Q_D(QWaylandCompositor); - QWaylandSeat *dev = NULL; + QWaylandSeat *dev = nullptr; for (int i = 0; i < d->seats.size(); i++) { QWaylandSeat *candidate = d->seats.at(i); if (candidate->isOwner(inputEvent)) { diff --git a/src/compositor/compositor_api/qwaylanddrag.cpp b/src/compositor/compositor_api/qwaylanddrag.cpp index c52e424d5..34f936a56 100644 --- a/src/compositor/compositor_api/qwaylanddrag.cpp +++ b/src/compositor/compositor_api/qwaylanddrag.cpp @@ -83,7 +83,7 @@ QWaylandSurface *QWaylandDrag::icon() const const QtWayland::DataDevice *dataDevice = d->dataDevice(); if (!dataDevice) - return 0; + return nullptr; return dataDevice->dragIcon(); } @@ -110,7 +110,7 @@ bool QWaylandDrag::visible() const if (!dataDevice) return false; - return dataDevice->dragIcon() != 0; + return dataDevice->dragIcon() != nullptr; } void QWaylandDrag::dragMove(QWaylandSurface *target, const QPointF &pos) diff --git a/src/compositor/compositor_api/qwaylandinputmethodcontrol.cpp b/src/compositor/compositor_api/qwaylandinputmethodcontrol.cpp index 575a64df4..69e5971eb 100644 --- a/src/compositor/compositor_api/qwaylandinputmethodcontrol.cpp +++ b/src/compositor/compositor_api/qwaylandinputmethodcontrol.cpp @@ -138,7 +138,7 @@ void QWaylandInputMethodControl::defaultSeatChanged() { Q_D(QWaylandInputMethodControl); - disconnect(d->textInput(), 0, this, 0); + disconnect(d->textInput(), nullptr, this, nullptr); d->seat = d->compositor->defaultSeat(); QWaylandTextInput *textInput = d->textInput(); diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp index 930eae1ae..e35c0f371 100644 --- a/src/compositor/compositor_api/qwaylandkeyboard.cpp +++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp @@ -71,7 +71,7 @@ QWaylandKeyboardPrivate::QWaylandKeyboardPrivate(QWaylandSeat *seat) , pendingKeymap(false) #if QT_CONFIG(xkbcommon_evdev) , keymap_fd(-1) - , xkb_state(0) + , xkb_state(nullptr) #endif , repeatRate(40) , repeatDelay(400) @@ -168,7 +168,7 @@ void QWaylandKeyboardPrivate::keyboard_bind_resource(wl_keyboard::Resource *reso void QWaylandKeyboardPrivate::keyboard_destroy_resource(wl_keyboard::Resource *resource) { if (focusResource == resource) - focusResource = 0; + focusResource = nullptr; } void QWaylandKeyboardPrivate::keyboard_release(wl_keyboard::Resource *resource) @@ -333,7 +333,7 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap) return; } - keymap_area = static_cast<char *>(mmap(0, keymap_size, PROT_READ | PROT_WRITE, MAP_SHARED, keymap_fd, 0)); + keymap_area = static_cast<char *>(mmap(nullptr, keymap_size, PROT_READ | PROT_WRITE, MAP_SHARED, keymap_fd, 0)); if (keymap_area == MAP_FAILED) { close(keymap_fd); keymap_fd = -1; @@ -448,8 +448,8 @@ void QWaylandKeyboard::focusDestroyed(void *data) Q_D(QWaylandKeyboard); d->focusDestroyListener.reset(); - d->focus = 0; - d->focusResource = 0; + d->focus = nullptr; + d->focusResource = nullptr; } void QWaylandKeyboard::updateKeymap() diff --git a/src/compositor/compositor_api/qwaylandoutput_p.h b/src/compositor/compositor_api/qwaylandoutput_p.h index dab6daf73..5a21c3de7 100644 --- a/src/compositor/compositor_api/qwaylandoutput_p.h +++ b/src/compositor/compositor_api/qwaylandoutput_p.h @@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE struct QWaylandSurfaceViewMapper { QWaylandSurfaceViewMapper() - : surface(0) + : surface(nullptr) , views() , has_entered(false) {} diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp index 74ce326e5..91e85b884 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.cpp +++ b/src/compositor/compositor_api/qwaylandquickitem.cpp @@ -163,7 +163,7 @@ void QWaylandBufferMaterialShader::updateState(const QSGMaterialShader::RenderSt const char * const *QWaylandBufferMaterialShader::attributeNames() const { - static char const *const attr[] = { "qt_VertexPosition", "qt_VertexTexCoord", 0 }; + static char const *const attr[] = { "qt_VertexPosition", "qt_VertexTexCoord", nullptr }; return attr; } @@ -261,14 +261,14 @@ void QWaylandBufferMaterial::ensureTextures(int count) } } -QMutex *QWaylandQuickItemPrivate::mutex = 0; +QMutex *QWaylandQuickItemPrivate::mutex = nullptr; class QWaylandSurfaceTextureProvider : public QSGTextureProvider { public: QWaylandSurfaceTextureProvider() : m_smooth(false) - , m_sgTex(0) + , m_sgTex(nullptr) { } @@ -283,7 +283,7 @@ public: Q_ASSERT(QThread::currentThread() == thread()); m_ref = buffer; delete m_sgTex; - m_sgTex = 0; + m_sgTex = nullptr; if (m_ref.hasBuffer()) { if (buffer.isSharedMemory()) { m_sgTex = surfaceItem->window()->createTextureFromImage(buffer.image()); diff --git a/src/compositor/compositor_api/qwaylandresource.cpp b/src/compositor/compositor_api/qwaylandresource.cpp index 07e67a9b1..7cfcce132 100644 --- a/src/compositor/compositor_api/qwaylandresource.cpp +++ b/src/compositor/compositor_api/qwaylandresource.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE QWaylandResource::QWaylandResource() - : m_resource(0) + : m_resource(nullptr) { } diff --git a/src/compositor/compositor_api/qwaylandseat.cpp b/src/compositor/compositor_api/qwaylandseat.cpp index 4b506bcda..2ee32bfb2 100644 --- a/src/compositor/compositor_api/qwaylandseat.cpp +++ b/src/compositor/compositor_api/qwaylandseat.cpp @@ -89,15 +89,15 @@ void QWaylandSeatPrivate::setCapabilities(QWaylandSeat::CapabilityFlags caps) QWaylandSeat::CapabilityFlags changed = caps ^ capabilities; if (changed & QWaylandSeat::Pointer) { - pointer.reset(pointer.isNull() ? QWaylandCompositorPrivate::get(compositor)->callCreatePointerDevice(q) : 0); + pointer.reset(pointer.isNull() ? QWaylandCompositorPrivate::get(compositor)->callCreatePointerDevice(q) : nullptr); } if (changed & QWaylandSeat::Keyboard) { - keyboard.reset(keyboard.isNull() ? QWaylandCompositorPrivate::get(compositor)->callCreateKeyboardDevice(q) : 0); + keyboard.reset(keyboard.isNull() ? QWaylandCompositorPrivate::get(compositor)->callCreateKeyboardDevice(q) : nullptr); } if (changed & QWaylandSeat::Touch) { - touch.reset(touch.isNull() ? QWaylandCompositorPrivate::get(compositor)->callCreateTouchDevice(q) : 0); + touch.reset(touch.isNull() ? QWaylandCompositorPrivate::get(compositor)->callCreateTouchDevice(q) : nullptr); } capabilities = caps; diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp index 37b6876ac..a5316f535 100644 --- a/src/compositor/compositor_api/qwaylandsurface.cpp +++ b/src/compositor/compositor_api/qwaylandsurface.cpp @@ -81,7 +81,7 @@ public: res->data = this; res->destroy = destroyCallback; #else - wl_resource_set_implementation(res, 0, this, destroyCallback); + wl_resource_set_implementation(res, nullptr, this, destroyCallback); #endif } ~FrameCallback() @@ -129,7 +129,7 @@ QWaylandSurfacePrivate::QWaylandSurfacePrivate() , compositor(nullptr) , refCount(1) , client(nullptr) - , role(0) + , role(nullptr) , inputRegion(infiniteRegion()) , bufferScale(1) , isCursorSurface(false) @@ -140,7 +140,7 @@ QWaylandSurfacePrivate::QWaylandSurfacePrivate() #if QT_CONFIG(im) , inputMethodControl(nullptr) #endif - , subsurface(0) + , subsurface(nullptr) { pending.buffer = QWaylandBufferRef(); pending.newlyAttached = false; @@ -843,7 +843,7 @@ void QWaylandSurfacePrivate::derefView(QWaylandView *view) void QWaylandSurfacePrivate::initSubsurface(QWaylandSurface *parent, wl_client *client, int id, int version) { Q_Q(QWaylandSurface); - QWaylandSurface *oldParent = 0; // TODO: implement support for switching parents + QWaylandSurface *oldParent = nullptr; // TODO: implement support for switching parents subsurface = new Subsurface(this); subsurface->init(client, id, version); |