summaryrefslogtreecommitdiffstats
path: root/src/compositor/wayland_wrapper
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2018-02-27 16:21:17 +0100
committerJohan Helsing <johan.helsing@qt.io>2018-02-28 10:51:35 +0000
commit1fab644753443a525475740fc23172dedaa70d0e (patch)
treebca0a88662679acd150172f5a73f64d1604960cf /src/compositor/wayland_wrapper
parentc4bd9198b4a0fac809903dd2c09276c2c3c1b22e (diff)
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>
Diffstat (limited to 'src/compositor/wayland_wrapper')
-rw-r--r--src/compositor/wayland_wrapper/qwlbuffermanager_p.h2
-rw-r--r--src/compositor/wayland_wrapper/qwlclientbuffer_p.h4
-rw-r--r--src/compositor/wayland_wrapper/qwldatadevice_p.h4
-rw-r--r--src/compositor/wayland_wrapper/qwldatadevicemanager_p.h2
4 files changed, 6 insertions, 6 deletions
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;