diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-02-27 16:21:17 +0100 |
---|---|---|
committer | Johan Helsing <johan.helsing@qt.io> | 2018-02-28 10:51:35 +0000 |
commit | 1fab644753443a525475740fc23172dedaa70d0e (patch) | |
tree | bca0a88662679acd150172f5a73f64d1604960cf | |
parent | c4bd9198b4a0fac809903dd2c09276c2c3c1b22e (diff) | |
download | qtwayland-1fab644753443a525475740fc23172dedaa70d0e.tar.gz |
Use default member initialization for raw pointers
Initialize to nullptr to prevent undefined behavior.
Change-Id: I7753c0be77a886d62ecb1cd7b86fc8c98340b0b8
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
79 files changed, 150 insertions, 150 deletions
diff --git a/examples/wayland/custom-extension/cpp-client/main.cpp b/examples/wayland/custom-extension/cpp-client/main.cpp index da6230cc..78eac44b 100644 --- a/examples/wayland/custom-extension/cpp-client/main.cpp +++ b/examples/wayland/custom-extension/cpp-client/main.cpp @@ -148,7 +148,7 @@ protected: } private: - CustomExtension *m_extension; + CustomExtension *m_extension = nullptr; QRect rect1; QRect rect2; QRect rect3; diff --git a/examples/wayland/minimal-cpp/compositor.h b/examples/wayland/minimal-cpp/compositor.h index 9dd5cb2f..2a4ab7d8 100644 --- a/examples/wayland/minimal-cpp/compositor.h +++ b/examples/wayland/minimal-cpp/compositor.h @@ -92,7 +92,7 @@ private slots: void viewSurfaceDestroyed(); private: - Window *m_window; + Window *m_window = nullptr; QList<View*> m_views; }; diff --git a/examples/wayland/qwindow-compositor/compositor.h b/examples/wayland/qwindow-compositor/compositor.h index d1b501ff..5cc3e28c 100644 --- a/examples/wayland/qwindow-compositor/compositor.h +++ b/examples/wayland/qwindow-compositor/compositor.h @@ -180,10 +180,10 @@ private slots: void viewAnimationDone(); private: View *findView(const QWaylandSurface *s) const; - QWindow *m_window; + QWindow *m_window = nullptr; QList<View*> m_views; - QWaylandWlShell *m_wlShell; - QWaylandXdgShellV5 *m_xdgShell; + QWaylandWlShell *m_wlShell = nullptr; + QWaylandXdgShellV5 *m_xdgShell = nullptr; QWaylandView m_cursorView; int m_cursorHotspotX; int m_cursorHotspotY; diff --git a/examples/wayland/server-buffer/cpp-client/main.cpp b/examples/wayland/server-buffer/cpp-client/main.cpp index 7ff34072..70509d06 100644 --- a/examples/wayland/server-buffer/cpp-client/main.cpp +++ b/examples/wayland/server-buffer/cpp-client/main.cpp @@ -116,7 +116,7 @@ protected: private: - QOpenGLTextureBlitter *m_blitter; + QOpenGLTextureBlitter *m_blitter = nullptr; ShareBufferExtension *m_extension = nullptr; QList<QtWaylandClient::QWaylandServerBuffer*> m_buffers; diff --git a/examples/wayland/server-buffer/cpp-client/sharebufferextension.h b/examples/wayland/server-buffer/cpp-client/sharebufferextension.h index 6ea19c08..1440187d 100644 --- a/examples/wayland/server-buffer/cpp-client/sharebufferextension.h +++ b/examples/wayland/server-buffer/cpp-client/sharebufferextension.h @@ -75,7 +75,7 @@ signals: private: void share_buffer_cross_buffer(struct ::qt_server_buffer *buffer) override; - QtWaylandClient::QWaylandServerBufferIntegration *m_server_buffer_integration; + QtWaylandClient::QWaylandServerBufferIntegration *m_server_buffer_integration = nullptr; }; QT_END_NAMESPACE diff --git a/src/client/qwaylandclipboard_p.h b/src/client/qwaylandclipboard_p.h index 28336202..42202285 100644 --- a/src/client/qwaylandclipboard_p.h +++ b/src/client/qwaylandclipboard_p.h @@ -78,7 +78,7 @@ public: bool ownsMode(QClipboard::Mode mode) const override; private: - QWaylandDisplay *mDisplay; + QWaylandDisplay *mDisplay = nullptr; QMimeData m_emptyData; }; diff --git a/src/client/qwaylandcursor_p.h b/src/client/qwaylandcursor_p.h index 916a464e..b7b1c2a7 100644 --- a/src/client/qwaylandcursor_p.h +++ b/src/client/qwaylandcursor_p.h @@ -119,8 +119,8 @@ private: struct wl_cursor* requestCursor(WaylandCursor shape); void initCursorMap(); - QWaylandDisplay *mDisplay; - struct wl_cursor_theme *mCursorTheme; + QWaylandDisplay *mDisplay = nullptr; + struct wl_cursor_theme *mCursorTheme = nullptr; QPoint mLastPos; QMap<WaylandCursor, wl_cursor *> mCursors; QMultiMap<WaylandCursor, QByteArray> mCursorNamesMap; diff --git a/src/client/qwaylanddatadevice.cpp b/src/client/qwaylanddatadevice.cpp index 4411ba65..300c9de0 100644 --- a/src/client/qwaylanddatadevice.cpp +++ b/src/client/qwaylanddatadevice.cpp @@ -203,7 +203,7 @@ void QWaylandDataDevice::data_device_motion(uint32_t time, wl_fixed_t x, wl_fixe m_dragPoint = calculateDragPosition(x, y, m_dragWindow); - QMimeData *dragData; + QMimeData *dragData = nullptr; Qt::DropActions supportedActions; if (drag) { dragData = drag->mimeData(); diff --git a/src/client/qwaylanddatadevicemanager_p.h b/src/client/qwaylanddatadevicemanager_p.h index 3daf780a..10df1bca 100644 --- a/src/client/qwaylanddatadevicemanager_p.h +++ b/src/client/qwaylanddatadevicemanager_p.h @@ -76,7 +76,7 @@ public: QWaylandDisplay *display() const; private: - QWaylandDisplay *m_display; + QWaylandDisplay *m_display = nullptr; }; } diff --git a/src/client/qwaylanddataoffer_p.h b/src/client/qwaylanddataoffer_p.h index c9b9c21f..932506bf 100644 --- a/src/client/qwaylanddataoffer_p.h +++ b/src/client/qwaylanddataoffer_p.h @@ -98,8 +98,8 @@ protected: private: int readData(int fd, QByteArray &data) const; - mutable QWaylandDataOffer *m_dataOffer; - QWaylandDisplay *m_display; + mutable QWaylandDataOffer *m_dataOffer = nullptr; + QWaylandDisplay *m_display = nullptr; mutable QStringList m_types; mutable QHash<QString, QByteArray> m_data; }; diff --git a/src/client/qwaylanddatasource_p.h b/src/client/qwaylanddatasource_p.h index bba003f5..a79cdcbf 100644 --- a/src/client/qwaylanddatasource_p.h +++ b/src/client/qwaylanddatasource_p.h @@ -86,8 +86,8 @@ protected: void data_source_target(const QString &mime_type) override; private: - QWaylandDisplay *m_display; - QMimeData *m_mime_data; + QWaylandDisplay *m_display = nullptr; + QMimeData *m_mime_data = nullptr; }; } diff --git a/src/client/qwaylanddisplay_p.h b/src/client/qwaylanddisplay_p.h index 0a7ea427..dbcc2112 100644 --- a/src/client/qwaylanddisplay_p.h +++ b/src/client/qwaylanddisplay_p.h @@ -149,7 +149,7 @@ public: uint32_t id; QString interface; uint32_t version; - struct ::wl_registry *registry; + struct ::wl_registry *registry = nullptr; RegistryGlobal(uint32_t id_, const QString &interface_, uint32_t version_, struct ::wl_registry *registry_) : id(id_), interface(interface_), version(version_), registry(registry_) { } }; @@ -191,17 +191,17 @@ private: void requestWaylandSync(); struct Listener { - RegistryListener listener; - void *data; + RegistryListener listener = nullptr; + void *data = nullptr; }; - struct wl_display *mDisplay; + struct wl_display *mDisplay = nullptr; QtWayland::wl_compositor mCompositor; QScopedPointer<QWaylandShm> mShm; QList<QWaylandScreen *> mScreens; QList<QWaylandInputDevice *> mInputDevices; QList<Listener> mRegistryListeners; - QWaylandIntegration *mWaylandIntegration; + QWaylandIntegration *mWaylandIntegration = nullptr; #if QT_CONFIG(wayland_datadevice) QScopedPointer<QWaylandDataDeviceManager> mDndSelectionHandler; #endif @@ -212,7 +212,7 @@ private: QScopedPointer<QWaylandWindowManagerIntegration> mWindowManagerIntegration; QScopedPointer<QtWayland::zwp_text_input_manager_v2> mTextInputManager; QScopedPointer<QWaylandHardwareIntegration> mHardwareIntegration; - QSocketNotifier *mReadNotifier; + QSocketNotifier *mReadNotifier = nullptr; int mFd; int mWritableNotificationFd; QList<RegistryGlobal> mGlobals; diff --git a/src/client/qwaylanddnd_p.h b/src/client/qwaylanddnd_p.h index 8a1d7f1f..0f14eb00 100644 --- a/src/client/qwaylanddnd_p.h +++ b/src/client/qwaylanddnd_p.h @@ -84,7 +84,7 @@ protected: private: - QWaylandDisplay *m_display; + QWaylandDisplay *m_display = nullptr; }; #endif } diff --git a/src/client/qwaylandextendedsurface_p.h b/src/client/qwaylandextendedsurface_p.h index 02700b29..dffd0428 100644 --- a/src/client/qwaylandextendedsurface_p.h +++ b/src/client/qwaylandextendedsurface_p.h @@ -83,7 +83,7 @@ private: void extended_surface_set_generic_property(const QString &name, wl_array *value) override; void extended_surface_close() override; - QWaylandWindow *m_window; + QWaylandWindow *m_window = nullptr; QVariantMap m_properties; }; diff --git a/src/client/qwaylandinputcontext_p.h b/src/client/qwaylandinputcontext_p.h index a554f230..cbb2e18d 100644 --- a/src/client/qwaylandinputcontext_p.h +++ b/src/client/qwaylandinputcontext_p.h @@ -107,7 +107,7 @@ protected: private: Qt::KeyboardModifiers modifiersToQtModifiers(uint32_t modifiers); - QWaylandDisplay *m_display; + QWaylandDisplay *m_display = nullptr; QWaylandInputMethodEventBuilder m_builder; QVector<Qt::KeyboardModifier> m_modifiersMap; @@ -155,7 +155,7 @@ public: private: QWaylandTextInput *textInput() const; - QWaylandDisplay *mDisplay; + QWaylandDisplay *mDisplay = nullptr; QPointer<QWindow> mCurrentWindow; }; diff --git a/src/client/qwaylandinputdevice_p.h b/src/client/qwaylandinputdevice_p.h index 8a02769e..2c7d2cff 100644 --- a/src/client/qwaylandinputdevice_p.h +++ b/src/client/qwaylandinputdevice_p.h @@ -143,13 +143,13 @@ public: private: void setCursor(Qt::CursorShape cursor, QWaylandScreen *screen); - QWaylandDisplay *mQDisplay; - struct wl_display *mDisplay; + QWaylandDisplay *mQDisplay = nullptr; + struct wl_display *mDisplay = nullptr; int mVersion; uint32_t mCaps = 0; - struct wl_surface *pointerSurface; + struct wl_surface *pointerSurface = nullptr; #if QT_CONFIG(wayland_datadevice) QWaylandDataDevice *mDataDevice = nullptr; @@ -207,7 +207,7 @@ public: uint32_t mods_locked, uint32_t group) override; - QWaylandInputDevice *mParent; + QWaylandInputDevice *mParent = nullptr; QPointer<QWaylandWindow> mFocus; #if QT_CONFIG(xkbcommon_evdev) xkb_context *mXkbContext = nullptr; @@ -262,7 +262,7 @@ public: void releaseButtons(); - QWaylandInputDevice *mParent; + QWaylandInputDevice *mParent = nullptr; QPointer<QWaylandWindow> mFocus; uint32_t mEnterSerial = 0; #if QT_CONFIG(cursor) @@ -302,7 +302,7 @@ public: bool allTouchPointsReleased(); void releasePoints(); - QWaylandInputDevice *mParent; + QWaylandInputDevice *mParent = nullptr; QPointer<QWaylandWindow> mFocus; QList<QWindowSystemInterface::TouchPoint> mTouchPoints; QList<QWindowSystemInterface::TouchPoint> mPrevTouchPoints; diff --git a/src/client/qwaylandnativeinterface_p.h b/src/client/qwaylandnativeinterface_p.h index c83180c0..3de80eb6 100644 --- a/src/client/qwaylandnativeinterface_p.h +++ b/src/client/qwaylandnativeinterface_p.h @@ -85,7 +85,7 @@ public: QFunctionPointer platformFunction(const QByteArray &resource) const override; private: - QWaylandIntegration *m_integration; + QWaylandIntegration *m_integration = nullptr; QHash<QPlatformWindow*, QVariantMap> m_windowProperties; static void setSync(QWindow *window); diff --git a/src/client/qwaylandqtkey_p.h b/src/client/qwaylandqtkey_p.h index 3374b907..9091cf81 100644 --- a/src/client/qwaylandqtkey_p.h +++ b/src/client/qwaylandqtkey_p.h @@ -68,7 +68,7 @@ public: QWaylandQtKeyExtension(QWaylandDisplay *display, uint32_t id); private: - QWaylandDisplay *m_display; + QWaylandDisplay *m_display = nullptr; void key_extension_qtkey(struct wl_surface *surface, uint32_t time, diff --git a/src/client/qwaylandshellsurface_p.h b/src/client/qwaylandshellsurface_p.h index 06d92ba0..3a725d82 100644 --- a/src/client/qwaylandshellsurface_p.h +++ b/src/client/qwaylandshellsurface_p.h @@ -104,7 +104,7 @@ protected: virtual void setMinimized() {} private: - QWaylandWindow *m_window; + QWaylandWindow *m_window = nullptr; friend class QWaylandWindow; }; diff --git a/src/client/qwaylandsubsurface_p.h b/src/client/qwaylandsubsurface_p.h index 36a92a75..a9fd76a8 100644 --- a/src/client/qwaylandsubsurface_p.h +++ b/src/client/qwaylandsubsurface_p.h @@ -86,8 +86,8 @@ private: // to keep track of the sync state void set_sync(); void set_desync(); - QWaylandWindow *m_window; - QWaylandWindow *m_parent; + QWaylandWindow *m_window = nullptr; + QWaylandWindow *m_parent = nullptr; bool m_synchronized = false; QMutex m_syncLock; diff --git a/src/client/qwaylandtouch_p.h b/src/client/qwaylandtouch_p.h index 7d909769..93a829e2 100644 --- a/src/client/qwaylandtouch_p.h +++ b/src/client/qwaylandtouch_p.h @@ -73,7 +73,7 @@ public: private: void registerDevice(int caps); - QWaylandDisplay *mDisplay; + QWaylandDisplay *mDisplay = nullptr; void touch_extension_touch(uint32_t time, uint32_t id, @@ -95,15 +95,15 @@ private: QList<QWindowSystemInterface::TouchPoint> mTouchPoints; QList<QWindowSystemInterface::TouchPoint> mPrevTouchPoints; - QTouchDevice *mTouchDevice; + QTouchDevice *mTouchDevice = nullptr; uint32_t mTimestamp; int mPointsLeft; uint32_t mFlags; int mMouseSourceId; QPointF mLastMouseLocal; QPointF mLastMouseGlobal; - QWindow *mTargetWindow; - QWaylandInputDevice *mInputDevice; + QWindow *mTargetWindow = nullptr; + QWaylandInputDevice *mInputDevice = nullptr; }; } diff --git a/src/client/qwaylandwindowmanagerintegration.cpp b/src/client/qwaylandwindowmanagerintegration.cpp index 785a0a44..17ae8a5a 100644 --- a/src/client/qwaylandwindowmanagerintegration.cpp +++ b/src/client/qwaylandwindowmanagerintegration.cpp @@ -61,7 +61,7 @@ class QWaylandWindowManagerIntegrationPrivate { public: QWaylandWindowManagerIntegrationPrivate(QWaylandDisplay *waylandDisplay); bool m_blockPropertyUpdates = false; - QWaylandDisplay *m_waylandDisplay; + QWaylandDisplay *m_waylandDisplay = nullptr; QHash<QWindow*, QVariantMap> m_queuedProperties; bool m_showIsFullScreen = false; }; diff --git a/src/client/qwaylandwlshellsurface_p.h b/src/client/qwaylandwlshellsurface_p.h index 708c6f11..b0e67795 100644 --- a/src/client/qwaylandwlshellsurface_p.h +++ b/src/client/qwaylandwlshellsurface_p.h @@ -104,7 +104,7 @@ private: void updateTransientParent(QWindow *parent); void setPopup(QWaylandWindow *parent, QWaylandInputDevice *device, uint serial); - QWaylandWindow *m_window; + QWaylandWindow *m_window = nullptr; bool m_maximized = false; bool m_fullscreen = false; QSize m_size; diff --git a/src/client/qwaylandxdgpopup_p.h b/src/client/qwaylandxdgpopup_p.h index 85bd589b..74c0dca2 100644 --- a/src/client/qwaylandxdgpopup_p.h +++ b/src/client/qwaylandxdgpopup_p.h @@ -81,7 +81,7 @@ protected: private: QWaylandExtendedSurface *m_extendedWindow = nullptr; - QWaylandWindow *m_window; + QWaylandWindow *m_window = nullptr; }; QT_END_NAMESPACE diff --git a/src/client/qwaylandxdgshellv6_p.h b/src/client/qwaylandxdgshellv6_p.h index 122beed0..e59a67d6 100644 --- a/src/client/qwaylandxdgshellv6_p.h +++ b/src/client/qwaylandxdgshellv6_p.h @@ -106,7 +106,7 @@ private: QVarLengthArray<uint32_t> states; } m_configureState; - QWaylandXdgSurfaceV6 *m_xdgSurface; + QWaylandXdgSurfaceV6 *m_xdgSurface = nullptr; }; class Popup : public QtWayland::zxdg_popup_v6 { @@ -117,14 +117,14 @@ private: void applyConfigure(); void zxdg_popup_v6_popup_done() override; - QWaylandXdgSurfaceV6 *m_xdgSurface; + QWaylandXdgSurfaceV6 *m_xdgSurface = nullptr; }; void setToplevel(); void setPopup(QWaylandWindow *parent, QWaylandInputDevice *device, int serial, bool grab); - QWaylandXdgShellV6 *m_shell; - QWaylandWindow *m_window; + QWaylandXdgShellV6 *m_shell = nullptr; + QWaylandWindow *m_window = nullptr; Toplevel *m_toplevel = nullptr; Popup *m_popup = nullptr; bool m_configured = false; diff --git a/src/client/qwaylandxdgsurface_p.h b/src/client/qwaylandxdgsurface_p.h index fa796320..42846c66 100644 --- a/src/client/qwaylandxdgsurface_p.h +++ b/src/client/qwaylandxdgsurface_p.h @@ -110,8 +110,8 @@ private: void updateTransientParent(QWaylandWindow *parent); private: - QWaylandWindow *m_window; - QWaylandXdgShell* m_shell; + QWaylandWindow *m_window = nullptr; + QWaylandXdgShell* m_shell = nullptr; bool m_maximized = false; bool m_minimized = false; bool m_fullscreen = false; diff --git a/src/client/shellintegration/qwaylandshellintegration_p.h b/src/client/shellintegration/qwaylandshellintegration_p.h index ab9b736b..7f3a2cef 100644 --- a/src/client/shellintegration/qwaylandshellintegration_p.h +++ b/src/client/shellintegration/qwaylandshellintegration_p.h @@ -81,7 +81,7 @@ public: } protected: - QWaylandDisplay *m_display; + QWaylandDisplay *m_display = nullptr; }; } diff --git a/src/compositor/compositor_api/qwaylandbufferref.cpp b/src/compositor/compositor_api/qwaylandbufferref.cpp index affd7af3..82997a5d 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 471c1b5a..bde24be1 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 ae5ed1ec..8c476cf1 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 b1959e68..340860a9 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 0cc10dca..7c6001c3 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 34f936a5..d79e4fa3 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 35cd4922..8e8a903e 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 ed9bef3c..4d267666 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 3dc9bf20..9d4a3b03 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 7540437a..5db57622 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 f29933c7..de1b748d 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 7825cabd..a28bd6de 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 7b956912..19ee07b8 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 7ca04c02..271a5b25 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 191a936f..6feb9506 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 36dd21b6..4ccabfa9 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 fae02b0c..d3f57375 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 3f046a57..1a22e080 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 c1f907ff..9243e36e 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 5f3475ed..ac8c1ed0 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 4cb49250..8d27f41c 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 9c6672db..eca6d4b5 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; diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h index 8d89ebf7..651400d8 100644 --- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h +++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h @@ -86,7 +86,7 @@ private: static void wlDisplayHandleGlobal(void *data, struct wl_registry *registry, uint32_t id, const QString &interface, uint32_t version); struct wl_display *m_waylandDisplay = nullptr; - struct qt_brcm *m_waylandBrcm; + struct qt_brcm *m_waylandBrcm = nullptr; EGLDisplay m_eglDisplay; }; diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp index 6b3c614a..5cd52f67 100644 --- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp +++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp @@ -120,9 +120,9 @@ private: QSize m_size; bool m_released = true; wl_array m_array; - EGLint *m_data; - QWaylandDisplay *m_display; - struct wl_event_queue *m_eventQueue; + EGLint *m_data = nullptr; + QWaylandDisplay *m_display = nullptr; + struct wl_event_queue *m_eventQueue = nullptr; }; QWaylandBrcmEglWindow::QWaylandBrcmEglWindow(QWindow *window) diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h index 28376669..2d418eca 100644 --- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h +++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h @@ -72,10 +72,10 @@ private: void createEglSurfaces(); void destroyEglSurfaces(); - QWaylandBrcmEglIntegration *m_eglIntegration; - struct wl_egl_window *m_waylandEglWindow; + QWaylandBrcmEglIntegration *m_eglIntegration = nullptr; + struct wl_egl_window *m_waylandEglWindow = nullptr; - const QWaylandWindow *m_parentWindow; + const QWaylandWindow *m_parentWindow = nullptr; EGLConfig m_eglConfig = 0; @@ -85,7 +85,7 @@ private: QWaylandBrcmBuffer *m_buffers[3]; QSurfaceFormat m_format; - struct wl_event_queue *m_eventQueue; + struct wl_event_queue *m_eventQueue = nullptr; int m_current = 0; int m_count = 0; diff --git a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h index f1b72299..f9eb2d1d 100644 --- a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h +++ b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h @@ -73,7 +73,7 @@ public: ~DrmServerBuffer(); QOpenGLTexture* toOpenGlTexture() override; private: - DrmEglServerBufferIntegration *m_integration; + DrmEglServerBufferIntegration *m_integration = nullptr; EGLImageKHR m_image; QOpenGLTexture *m_texture = nullptr; }; diff --git a/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h b/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h index 1ba38e6e..0bfbe0ea 100644 --- a/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h +++ b/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h @@ -81,7 +81,7 @@ protected: void libhybris_buffer_add_fd(int32_t fd) override; private: - LibHybrisEglServerBufferIntegration *m_integration; + LibHybrisEglServerBufferIntegration *m_integration = nullptr; EGLImageKHR m_image; QOpenGLTexture *m_texture = nullptr; int m_numFds; diff --git a/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h b/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h index 788344ff..5c63092f 100644 --- a/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h +++ b/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.h @@ -61,7 +61,7 @@ public: ~ShmServerBuffer(); QOpenGLTexture* toOpenGlTexture() override; private: - ShmServerBufferIntegration *m_integration; + ShmServerBufferIntegration *m_integration = nullptr; QOpenGLTexture *m_texture = nullptr; QString m_key; int m_bpl; diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h index 94947365..c5ba072a 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h +++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h @@ -81,10 +81,10 @@ private Q_SLOTS: void doInvalidateSurface(); private: - QWaylandEglClientBufferIntegration *m_clientBufferIntegration; + QWaylandEglClientBufferIntegration *m_clientBufferIntegration = nullptr; struct wl_egl_window *m_waylandEglWindow = nullptr; - const QWaylandWindow *m_parentWindow; + const QWaylandWindow *m_parentWindow = nullptr; EGLSurface m_eglSurface = EGL_NO_SURFACE; EGLConfig m_eglConfig; diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp index 740ad6b1..740e9641 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp +++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp @@ -219,8 +219,8 @@ public: m_blitProgram->disableAttributeArray(1); } - QOpenGLShaderProgram *m_blitProgram; - QWaylandGLContext *m_context; + QOpenGLShaderProgram *m_blitProgram = nullptr; + QWaylandGLContext *m_context = nullptr; }; @@ -512,7 +512,7 @@ private: GLint stride; GLenum type; bool normalized; - void *pointer; + void *pointer = nullptr; } m_vertexAttribs[STATE_GUARD_VERTEX_ATTRIB_COUNT]; GLenum m_minFilter; GLenum m_magFilter; diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h index af1c4e04..9e876ac1 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h +++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h @@ -84,7 +84,7 @@ private: void updateGLFormat(); EGLDisplay m_eglDisplay; - QWaylandDisplay *m_display; + QWaylandDisplay *m_display = nullptr; EGLContext m_context; EGLContext m_shareEGLContext; EGLConfig m_config; diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h index 3742e1f5..2adaf0ac 100644 --- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h +++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h @@ -93,7 +93,7 @@ public: private: QWaylandDisplay *mWaylandDisplay = nullptr; - struct qt_xcomposite *mWaylandComposite; + struct qt_xcomposite *mWaylandComposite = nullptr; Display *mDisplay = nullptr; EGLDisplay mEglDisplay; diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h index d90159fa..0c8bcf44 100644 --- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h +++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h @@ -65,7 +65,7 @@ public: private: void createEglSurface(); - QWaylandXCompositeEGLClientBufferIntegration *m_glxIntegration; + QWaylandXCompositeEGLClientBufferIntegration *m_glxIntegration = nullptr; QWaylandBuffer *m_buffer = nullptr; Window m_xWindow = 0; diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h index d95f57be..1bb2f4f7 100644 --- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h +++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h @@ -69,7 +69,7 @@ public: private: GLXContext m_context; - Display *m_display; + Display *m_display = nullptr; QSurfaceFormat m_format; }; diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h index c2df592e..45a77a29 100644 --- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h +++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h @@ -67,7 +67,7 @@ public: private: void createSurface(); - QWaylandXCompositeGLXIntegration *m_glxIntegration; + QWaylandXCompositeGLXIntegration *m_glxIntegration = nullptr; Window m_xWindow = 0; GLXFBConfig m_config; diff --git a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h index b3bcc310..f6f16299 100644 --- a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h +++ b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h @@ -83,7 +83,7 @@ public: QOpenGLTexture *toOpenGlTexture() override; private: - DrmEglServerBufferIntegration *m_integration; + DrmEglServerBufferIntegration *m_integration = nullptr; EGLImageKHR m_image; diff --git a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h index f99dacd9..f4b29778 100644 --- a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h +++ b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h @@ -84,7 +84,7 @@ public: QOpenGLTexture *toOpenGlTexture() override; private: - LibHybrisEglServerBufferIntegration *m_integration; + LibHybrisEglServerBufferIntegration *m_integration = nullptr; EGLImageKHR m_image; EGLClientBuffer m_buffer; diff --git a/src/hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.h b/src/hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.h index c303e5f1..850ad040 100644 --- a/src/hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.h +++ b/src/hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.h @@ -67,9 +67,9 @@ public: QOpenGLTexture *toOpenGlTexture() override; private: - ShmServerBufferIntegration *m_integration; + ShmServerBufferIntegration *m_integration = nullptr; - QSharedMemory *m_shm; + QSharedMemory *m_shm = nullptr; int m_width; int m_height; int m_bpl; diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h index 60ce814d..04b99ea3 100644 --- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h +++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h @@ -85,8 +85,8 @@ private: WaylandEglClientBuffer(WaylandEglClientBufferIntegration* integration, wl_resource *bufferResource); - BufferState *d; - WaylandEglClientBufferIntegration *m_integration; + BufferState *d = nullptr; + WaylandEglClientBufferIntegration *m_integration = nullptr; }; QT_END_NAMESPACE diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h index f57f741c..aa6c5b87 100644 --- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h +++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h @@ -79,7 +79,7 @@ public: private: QOpenGLTexture *m_texture = nullptr; - XCompositeEglClientBufferIntegration *m_integration; + XCompositeEglClientBufferIntegration *m_integration = nullptr; }; QT_END_NAMESPACE diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h index 23b856e9..948632ef 100644 --- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h +++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h @@ -87,7 +87,7 @@ public: private: QOpenGLTexture *m_texture = nullptr; - XCompositeGLXClientBufferIntegration *m_integration; + XCompositeGLXClientBufferIntegration *m_integration = nullptr; GLXPixmap m_glxPixmap = 0; }; diff --git a/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h b/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h index b30d5cca..bb43ed1a 100644 --- a/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h +++ b/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h @@ -55,7 +55,7 @@ public: XCompositeHandler(QWaylandCompositor *compositor, Display *display); private: - QWindow *mFakeRootWindow; + QWindow *mFakeRootWindow = nullptr; QString mDisplayString; diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h index 32e286c5..3e6eeea4 100644 --- a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h +++ b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h @@ -62,7 +62,7 @@ public: { return m_client_buffer_integration; } private: - QWaylandClientBufferIntegration *m_client_buffer_integration; + QWaylandClientBufferIntegration *m_client_buffer_integration = nullptr; }; } diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h index f24ecd37..6cab1c98 100644 --- a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h +++ b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h @@ -69,7 +69,7 @@ private: virtual void ivi_surface_configure(int32_t width, int32_t height) override; void ivi_controller_surface_visibility(int32_t visibility) override; - QWaylandWindow *m_window; + QWaylandWindow *m_window = nullptr; QWaylandExtendedSurface *m_extendedWindow = nullptr; }; diff --git a/src/shared/qwaylandsharedmemoryformathelper_p.h b/src/shared/qwaylandsharedmemoryformathelper_p.h index 7f2f77cc..e5b5faf0 100644 --- a/src/shared/qwaylandsharedmemoryformathelper_p.h +++ b/src/shared/qwaylandsharedmemoryformathelper_p.h @@ -63,7 +63,7 @@ private: , data(data) { } const size_t size; - const wl_shm_format *data; + const wl_shm_format *data = nullptr; }; static const Array getData() diff --git a/tests/auto/client/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp index 8ee52d73..4eb85818 100644 --- a/tests/auto/client/client/tst_client.cpp +++ b/tests/auto/client/client/tst_client.cpp @@ -170,7 +170,7 @@ private slots: void glWindow(); private: - MockCompositor *compositor; + MockCompositor *compositor = nullptr; }; void tst_WaylandClient::primaryScreen() diff --git a/tests/auto/client/shared/mockcompositor.h b/tests/auto/client/shared/mockcompositor.h index c6de1237..c0c3c884 100644 --- a/tests/auto/client/shared/mockcompositor.h +++ b/tests/auto/client/shared/mockcompositor.h @@ -141,7 +141,7 @@ private: friend class Impl::Compositor; friend class Impl::Surface; - Impl::Surface *m_surface; + Impl::Surface *m_surface = nullptr; }; Q_DECLARE_METATYPE(QSharedPointer<MockSurface>) @@ -151,7 +151,7 @@ public: Impl::Output *handle() const { return m_output; } MockOutput(Impl::Output *output); private: - Impl::Output *m_output; + Impl::Output *m_output = nullptr; }; Q_DECLARE_METATYPE(QSharedPointer<MockOutput>) @@ -201,7 +201,7 @@ private: typedef void (*Callback)(void *target, const QList<QVariant> ¶meters); Callback callback; - void *target; + void *target = nullptr; QList<QVariant> parameters; }; diff --git a/tests/auto/client/shared/mockinput.h b/tests/auto/client/shared/mockinput.h index 5760ab40..d9adb362 100644 --- a/tests/auto/client/shared/mockinput.h +++ b/tests/auto/client/shared/mockinput.h @@ -60,7 +60,7 @@ protected: void seat_get_touch(Resource *resource, uint32_t id) override; private: - Compositor *m_compositor; + Compositor *m_compositor = nullptr; QScopedPointer<Keyboard> m_keyboard; QScopedPointer<Pointer> m_pointer; @@ -83,7 +83,7 @@ protected: void keyboard_destroy_resource(wl_keyboard::Resource *resource) override; private: - Compositor *m_compositor; + Compositor *m_compositor = nullptr; Resource *m_focusResource = nullptr; Surface *m_focus = nullptr; @@ -106,7 +106,7 @@ protected: void pointer_destroy_resource(wl_pointer::Resource *resource) override; private: - Compositor *m_compositor; + Compositor *m_compositor = nullptr; Resource *m_focusResource = nullptr; Surface *m_focus = nullptr; @@ -121,7 +121,7 @@ public: void sendMotion(Surface *surface, const QPoint &position, int id); void sendFrame(Surface *surface); private: - Compositor *m_compositor; + Compositor *m_compositor = nullptr; }; class DataOffer : public QtWaylandServer::wl_data_offer @@ -145,7 +145,7 @@ protected: void data_device_start_drag(Resource *resource, struct ::wl_resource *source, struct ::wl_resource *origin, struct ::wl_resource *icon, uint32_t serial) override; private: - Compositor *m_compositor; + Compositor *m_compositor = nullptr; QtWaylandServer::wl_data_offer *m_dataOffer = nullptr; Surface* m_focus = nullptr; }; @@ -162,7 +162,7 @@ protected: void data_device_manager_create_data_source(Resource *resource, uint32_t id) override; private: - Compositor *m_compositor; + Compositor *m_compositor = nullptr; QScopedPointer<DataDevice> m_data_device; }; diff --git a/tests/auto/client/shared/mocksurface.h b/tests/auto/client/shared/mocksurface.h index 8bf6eb75..68fe9b94 100644 --- a/tests/auto/client/shared/mocksurface.h +++ b/tests/auto/client/shared/mocksurface.h @@ -65,7 +65,7 @@ protected: private: wl_resource *m_buffer = nullptr; - Compositor *m_compositor; + Compositor *m_compositor = nullptr; QSharedPointer<MockSurface> m_mockSurface; QList<wl_resource *> m_frameCallbackList; bool m_mapped = false; diff --git a/tests/auto/client/xdgshellv6/tst_xdgshellv6.cpp b/tests/auto/client/xdgshellv6/tst_xdgshellv6.cpp index 5aac336f..9e4aa8c0 100644 --- a/tests/auto/client/xdgshellv6/tst_xdgshellv6.cpp +++ b/tests/auto/client/xdgshellv6/tst_xdgshellv6.cpp @@ -82,7 +82,7 @@ private slots: void createDestroyWindow(); private: - MockCompositor *m_compositor; + MockCompositor *m_compositor = nullptr; }; void tst_WaylandClientXdgShellV6::createDestroyWindow() diff --git a/tests/auto/compositor/compositor/mockclient.h b/tests/auto/compositor/compositor/mockclient.h index 8933f832..820f2df3 100644 --- a/tests/auto/compositor/compositor/mockclient.h +++ b/tests/auto/compositor/compositor/mockclient.h @@ -45,7 +45,7 @@ public: ~ShmBuffer(); struct wl_buffer *handle = nullptr; - struct wl_shm_pool *shm_pool; + struct wl_shm_pool *shm_pool = nullptr; QImage image; }; @@ -62,10 +62,10 @@ public: xdg_surface *createXdgSurface(wl_surface *surface); ivi_surface *createIviSurface(wl_surface *surface, uint iviId); - wl_display *display; + wl_display *display = nullptr; wl_compositor *compositor = nullptr; QMap<uint, wl_output *> m_outputs; - wl_shm *shm; + wl_shm *shm = nullptr; wl_registry *registry = nullptr; wl_shell *wlshell = nullptr; xdg_shell *xdgShell = nullptr; diff --git a/tests/auto/compositor/compositor/mockseat.h b/tests/auto/compositor/compositor/mockseat.h index e6d5e0b1..2cdd1df5 100644 --- a/tests/auto/compositor/compositor/mockseat.h +++ b/tests/auto/compositor/compositor/mockseat.h @@ -42,8 +42,8 @@ public: ~MockSeat(); MockPointer *pointer() const { return m_pointer.data(); } - wl_seat *m_seat; - wl_keyboard *m_keyboard; + wl_seat *m_seat = nullptr; + wl_keyboard *m_keyboard = nullptr; private: QScopedPointer<MockPointer> m_pointer; |