diff options
Diffstat (limited to 'src/compositor')
22 files changed, 49 insertions, 49 deletions
diff --git a/src/compositor/compositor_api/qwaylandbufferref.cpp b/src/compositor/compositor_api/qwaylandbufferref.cpp index affd7af33..82997a5d3 100644 --- a/src/compositor/compositor_api/qwaylandbufferref.cpp +++ b/src/compositor/compositor_api/qwaylandbufferref.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE class QWaylandBufferRefPrivate { public: - QtWayland::ClientBuffer *buffer; + QtWayland::ClientBuffer *buffer = nullptr; bool nullOrDestroyed() { return !buffer || buffer->isDestroyed(); diff --git a/src/compositor/compositor_api/qwaylandclient.cpp b/src/compositor/compositor_api/qwaylandclient.cpp index 471c1b5a1..bde24be1d 100644 --- a/src/compositor/compositor_api/qwaylandclient.cpp +++ b/src/compositor/compositor_api/qwaylandclient.cpp @@ -73,8 +73,8 @@ public: delete client; } - QWaylandCompositor *compositor; - wl_client *client; + QWaylandCompositor *compositor = nullptr; + wl_client *client = nullptr; uid_t uid; gid_t gid; @@ -82,7 +82,7 @@ public: struct Listener { wl_listener listener; - QWaylandClient *parent; + QWaylandClient *parent = nullptr; }; Listener listener; }; diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index ae5ed1ec1..8c476cf1c 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -142,7 +142,7 @@ public: return true; } - QWaylandCompositor *compositor; + QWaylandCompositor *compositor = nullptr; }; } // namespace @@ -284,7 +284,7 @@ void QWaylandCompositorPrivate::compositor_create_surface(wl_compositor::Resourc #endif struct wl_resource *surfResource = wl_client_get_object(client->client(), id); - QWaylandSurface *surface; + QWaylandSurface *surface = nullptr; if (surfResource) { surface = QWaylandSurface::fromResource(surfResource); } else { diff --git a/src/compositor/compositor_api/qwaylandcompositor_p.h b/src/compositor/compositor_api/qwaylandcompositor_p.h index b1959e68f..340860a94 100644 --- a/src/compositor/compositor_api/qwaylandcompositor_p.h +++ b/src/compositor/compositor_api/qwaylandcompositor_p.h @@ -136,13 +136,13 @@ protected: QList<QWaylandSurface *> all_surfaces; #if QT_CONFIG(wayland_datadevice) - QtWayland::DataDeviceManager *data_device_manager; + QtWayland::DataDeviceManager *data_device_manager = nullptr; #endif - QtWayland::BufferManager *buffer_manager; + QtWayland::BufferManager *buffer_manager = nullptr; QElapsedTimer timer; - wl_event_loop *loop; + wl_event_loop *loop = nullptr; QList<QWaylandClient *> clients; diff --git a/src/compositor/compositor_api/qwaylanddestroylistener_p.h b/src/compositor/compositor_api/qwaylanddestroylistener_p.h index 0cc10dca6..7c6001c36 100644 --- a/src/compositor/compositor_api/qwaylanddestroylistener_p.h +++ b/src/compositor/compositor_api/qwaylanddestroylistener_p.h @@ -70,7 +70,7 @@ public: struct Listener { wl_listener listener; - QWaylandDestroyListenerPrivate *parent; + QWaylandDestroyListenerPrivate *parent = nullptr; }; Listener listener; }; diff --git a/src/compositor/compositor_api/qwaylanddrag.cpp b/src/compositor/compositor_api/qwaylanddrag.cpp index 34f936a56..d79e4fa30 100644 --- a/src/compositor/compositor_api/qwaylanddrag.cpp +++ b/src/compositor/compositor_api/qwaylanddrag.cpp @@ -69,7 +69,7 @@ public: return QWaylandSeatPrivate::get(seat)->dataDevice(); } - QWaylandSeat *seat; + QWaylandSeat *seat = nullptr; }; QWaylandDrag::QWaylandDrag(QWaylandSeat *seat) diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.cpp b/src/compositor/compositor_api/qwaylandquickcompositor.cpp index 35cd49228..8e8a903e3 100644 --- a/src/compositor/compositor_api/qwaylandquickcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandquickcompositor.cpp @@ -135,7 +135,7 @@ void QWaylandQuickCompositor::grabSurface(QWaylandSurfaceGrabber *grabber, const class GrabState : public QRunnable { public: - QWaylandSurfaceGrabber *grabber; + QWaylandSurfaceGrabber *grabber = nullptr; QWaylandBufferRef buffer; void run() override diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp index ed9bef3cf..4d2676661 100644 --- a/src/compositor/compositor_api/qwaylandsurface.cpp +++ b/src/compositor/compositor_api/qwaylandsurface.cpp @@ -109,8 +109,8 @@ public: QWaylandSurfacePrivate::get(_this->surface)->removeFrameCallback(_this); delete _this; } - QWaylandSurface *surface; - wl_resource *resource; + QWaylandSurface *surface = nullptr; + wl_resource *resource = nullptr; bool canSend = false; }; } diff --git a/src/compositor/compositor_api/qwaylandsurface_p.h b/src/compositor/compositor_api/qwaylandsurface_p.h index 3dc9bf20e..9d4a3b03d 100644 --- a/src/compositor/compositor_api/qwaylandsurface_p.h +++ b/src/compositor/compositor_api/qwaylandsurface_p.h @@ -193,8 +193,8 @@ public: //member variables private: friend class QWaylandSurfacePrivate; - QWaylandSurfacePrivate *surface; - QWaylandSurfacePrivate *parentSurface; + QWaylandSurfacePrivate *surface = nullptr; + QWaylandSurfacePrivate *parentSurface = nullptr; QPoint position; }; diff --git a/src/compositor/compositor_api/qwaylandsurfacegrabber.cpp b/src/compositor/compositor_api/qwaylandsurfacegrabber.cpp index 7540437ac..5db576221 100644 --- a/src/compositor/compositor_api/qwaylandsurfacegrabber.cpp +++ b/src/compositor/compositor_api/qwaylandsurfacegrabber.cpp @@ -73,7 +73,7 @@ class QWaylandSurfaceGrabberPrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QWaylandSurfaceGrabber) - QWaylandSurface *surface; + QWaylandSurface *surface = nullptr; }; /*! diff --git a/src/compositor/compositor_api/qwaylandtouch_p.h b/src/compositor/compositor_api/qwaylandtouch_p.h index f29933c78..de1b748de 100644 --- a/src/compositor/compositor_api/qwaylandtouch_p.h +++ b/src/compositor/compositor_api/qwaylandtouch_p.h @@ -81,7 +81,7 @@ public: private: void touch_release(Resource *resource) override; - QWaylandSeat *seat; + QWaylandSeat *seat = nullptr; }; QT_END_NAMESPACE diff --git a/src/compositor/extensions/qwaylandivisurfaceintegration_p.h b/src/compositor/extensions/qwaylandivisurfaceintegration_p.h index 7825cabda..a28bd6de6 100644 --- a/src/compositor/extensions/qwaylandivisurfaceintegration_p.h +++ b/src/compositor/extensions/qwaylandivisurfaceintegration_p.h @@ -70,8 +70,8 @@ private Q_SLOTS: void handleIviSurfaceDestroyed(); private: - QWaylandQuickShellSurfaceItem *m_item; - QWaylandIviSurface *m_shellSurface; + QWaylandQuickShellSurfaceItem *m_item = nullptr; + QWaylandIviSurface *m_shellSurface = nullptr; }; } diff --git a/src/compositor/extensions/qwaylandwlshellintegration_p.h b/src/compositor/extensions/qwaylandwlshellintegration_p.h index 7b9569122..19ee07b80 100644 --- a/src/compositor/extensions/qwaylandwlshellintegration_p.h +++ b/src/compositor/extensions/qwaylandwlshellintegration_p.h @@ -92,16 +92,16 @@ private: void handlePopupRemoved(); qreal devicePixelRatio() const; - QWaylandQuickShellSurfaceItem *m_item; + QWaylandQuickShellSurfaceItem *m_item = nullptr; QPointer<QWaylandWlShellSurface> m_shellSurface; GrabberState grabberState = GrabberState::Default; struct { - QWaylandSeat *seat; + QWaylandSeat *seat = nullptr; QPointF initialOffset; bool initialized; } moveState; struct { - QWaylandSeat *seat; + QWaylandSeat *seat = nullptr; QWaylandWlShellSurface::ResizeEdge resizeEdges; QSizeF initialSize; QPointF initialMousePos; diff --git a/src/compositor/extensions/qwaylandxdgshellv5integration_p.h b/src/compositor/extensions/qwaylandxdgshellv5integration_p.h index 7ca04c029..271a5b257 100644 --- a/src/compositor/extensions/qwaylandxdgshellv5integration_p.h +++ b/src/compositor/extensions/qwaylandxdgshellv5integration_p.h @@ -84,18 +84,18 @@ private: Resize, Move }; - QWaylandQuickShellSurfaceItem *m_item; - QWaylandXdgSurfaceV5 *m_xdgSurface; + QWaylandQuickShellSurfaceItem *m_item = nullptr; + QWaylandXdgSurfaceV5 *m_xdgSurface = nullptr; GrabberState grabberState; struct { - QWaylandSeat *seat; + QWaylandSeat *seat = nullptr; QPointF initialOffset; bool initialized; } moveState; struct { - QWaylandSeat *seat; + QWaylandSeat *seat = nullptr; QWaylandXdgSurfaceV5::ResizeEdge resizeEdges; QSizeF initialWindowSize; QPointF initialMousePos; @@ -121,9 +121,9 @@ private Q_SLOTS: void handlePopupDestroyed(); private: - QWaylandQuickShellSurfaceItem *m_item; - QWaylandXdgPopupV5 *m_xdgPopup; - QWaylandXdgShellV5 *m_xdgShell; + QWaylandQuickShellSurfaceItem *m_item = nullptr; + QWaylandXdgPopupV5 *m_xdgPopup = nullptr; + QWaylandXdgShellV5 *m_xdgShell = nullptr; }; } diff --git a/src/compositor/extensions/qwaylandxdgshellv6_p.h b/src/compositor/extensions/qwaylandxdgshellv6_p.h index 191a936f9..6feb95060 100644 --- a/src/compositor/extensions/qwaylandxdgshellv6_p.h +++ b/src/compositor/extensions/qwaylandxdgshellv6_p.h @@ -168,7 +168,7 @@ protected: void zxdg_toplevel_v6_set_minimized(Resource *resource) override; public: - QWaylandXdgSurfaceV6 *m_xdgSurface; + QWaylandXdgSurfaceV6 *m_xdgSurface = nullptr; QWaylandXdgToplevelV6 *m_parentToplevel = nullptr; QList<ConfigureEvent> m_pendingConfigures; ConfigureEvent m_lastAckedConfigure; @@ -206,8 +206,8 @@ protected: void zxdg_popup_v6_grab(Resource *resource, struct ::wl_resource *seat, uint32_t serial) override; private: - QWaylandXdgSurfaceV6 *m_xdgSurface; - QWaylandXdgSurfaceV6 *m_parentXdgSurface; + QWaylandXdgSurfaceV6 *m_xdgSurface = nullptr; + QWaylandXdgSurfaceV6 *m_parentXdgSurface = nullptr; QWaylandXdgPositionerV6Data m_positionerData; QRect m_geometry; QList<ConfigureEvent> m_pendingConfigures; diff --git a/src/compositor/extensions/qwaylandxdgshellv6integration_p.h b/src/compositor/extensions/qwaylandxdgshellv6integration_p.h index 36dd21b6c..4ccabfa98 100644 --- a/src/compositor/extensions/qwaylandxdgshellv6integration_p.h +++ b/src/compositor/extensions/qwaylandxdgshellv6integration_p.h @@ -76,9 +76,9 @@ private Q_SLOTS: void handleSurfaceSizeChanged(); private: - QWaylandQuickShellSurfaceItem *m_item; - QWaylandXdgSurfaceV6 *m_xdgSurface; - QWaylandXdgToplevelV6 *m_toplevel; + QWaylandQuickShellSurfaceItem *m_item = nullptr; + QWaylandXdgSurfaceV6 *m_xdgSurface = nullptr; + QWaylandXdgToplevelV6 *m_toplevel = nullptr; enum class GrabberState { Default, @@ -88,13 +88,13 @@ private: GrabberState grabberState; struct { - QWaylandSeat *seat; + QWaylandSeat *seat = nullptr; QPointF initialOffset; bool initialized; } moveState; struct { - QWaylandSeat *seat; + QWaylandSeat *seat = nullptr; Qt::Edges resizeEdges; QSizeF initialWindowSize; QPointF initialMousePos; @@ -119,9 +119,9 @@ private Q_SLOTS: void handleGeometryChanged(); private: - QWaylandQuickShellSurfaceItem *m_item; - QWaylandXdgSurfaceV6 *m_xdgSurface; - QWaylandXdgPopupV6 *m_popup; + QWaylandQuickShellSurfaceItem *m_item = nullptr; + QWaylandXdgSurfaceV6 *m_xdgSurface = nullptr; + QWaylandXdgPopupV6 *m_popup = nullptr; }; } diff --git a/src/compositor/extensions/qwlqtkey_p.h b/src/compositor/extensions/qwlqtkey_p.h index fae02b0c2..d3f573757 100644 --- a/src/compositor/extensions/qwlqtkey_p.h +++ b/src/compositor/extensions/qwlqtkey_p.h @@ -73,7 +73,7 @@ public: bool postQtKeyEvent(QKeyEvent *event, QWaylandSurface *surface); private: - QWaylandCompositor *m_compositor; + QWaylandCompositor *m_compositor = nullptr; }; } diff --git a/src/compositor/extensions/qwlqttouch_p.h b/src/compositor/extensions/qwlqttouch_p.h index 3f046a576..1a22e0808 100644 --- a/src/compositor/extensions/qwlqttouch_p.h +++ b/src/compositor/extensions/qwlqttouch_p.h @@ -93,7 +93,7 @@ protected: void touch_extension_destroy_resource(Resource *resource) override; private: - QWaylandCompositor *m_compositor; + QWaylandCompositor *m_compositor = nullptr; BehaviorFlags m_flags = BehaviorFlag::None; QList<Resource *> m_resources; QVector<float> m_posData; diff --git a/src/compositor/wayland_wrapper/qwlbuffermanager_p.h b/src/compositor/wayland_wrapper/qwlbuffermanager_p.h index c1f907ff5..9243e36ea 100644 --- a/src/compositor/wayland_wrapper/qwlbuffermanager_p.h +++ b/src/compositor/wayland_wrapper/qwlbuffermanager_p.h @@ -71,7 +71,7 @@ private: static void destroy_listener_callback(wl_listener *listener, void *data); QHash<struct ::wl_resource *, ClientBuffer*> m_buffers; - QWaylandCompositor *m_compositor; + QWaylandCompositor *m_compositor = nullptr; }; } diff --git a/src/compositor/wayland_wrapper/qwlclientbuffer_p.h b/src/compositor/wayland_wrapper/qwlclientbuffer_p.h index 5f3475ed7..ac8c1ed01 100644 --- a/src/compositor/wayland_wrapper/qwlclientbuffer_p.h +++ b/src/compositor/wayland_wrapper/qwlclientbuffer_p.h @@ -73,7 +73,7 @@ namespace QtWayland { struct surface_buffer_destroy_listener { struct wl_listener listener; - class ClientBuffer *surfaceBuffer; + class ClientBuffer *surfaceBuffer = nullptr; }; class Q_WAYLAND_COMPOSITOR_EXPORT ClientBuffer @@ -112,7 +112,7 @@ protected: void sendRelease(); void setDestroyed(); - struct ::wl_resource *m_buffer; + struct ::wl_resource *m_buffer = nullptr; QRegion m_damage; bool m_textureDirty = false; diff --git a/src/compositor/wayland_wrapper/qwldatadevice_p.h b/src/compositor/wayland_wrapper/qwldatadevice_p.h index 4cb492509..8d27f41c2 100644 --- a/src/compositor/wayland_wrapper/qwldatadevice_p.h +++ b/src/compositor/wayland_wrapper/qwldatadevice_p.h @@ -96,8 +96,8 @@ private: void setDragIcon(QWaylandSurface *icon); #endif - QWaylandCompositor *m_compositor; - QWaylandSeat *m_seat; + QWaylandCompositor *m_compositor = nullptr; + QWaylandSeat *m_seat = nullptr; DataSource *m_selectionSource = nullptr; diff --git a/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h b/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h index 9c6672db6..eca6d4b54 100644 --- a/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h +++ b/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h @@ -101,7 +101,7 @@ private: void retain(); void finishReadFromClient(bool exhausted = false); - QWaylandCompositor *m_compositor; + QWaylandCompositor *m_compositor = nullptr; QList<DataDevice *> m_data_device_list; DataSource *m_current_selection_source = nullptr; |