6 files changed, 14 insertions, 28 deletions
diff --git a/tests/auto/client/shared/mockcompositor.cpp b/tests/auto/client/shared/mockcompositor.cpp
index 2f1d68b01..1d76cec12 100644
--- a/tests/auto/client/shared/mockcompositor.cpp
+++ b/tests/auto/client/shared/mockcompositor.cpp
@@ -37,9 +37,6 @@
 
 #include <stdio.h>
 MockCompositor::MockCompositor()
-    : m_alive(true)
-    , m_ready(false)
-    , m_compositor(0)
 {
     pthread_create(&m_thread, 0, run, this);
 
diff --git a/tests/auto/client/shared/mockcompositor.h b/tests/auto/client/shared/mockcompositor.h
index 747da38fa..c6de12376 100644
--- a/tests/auto/client/shared/mockcompositor.h
+++ b/tests/auto/client/shared/mockcompositor.h
@@ -212,13 +212,13 @@ private:
 
     static void *run(void *data);
 
-    bool m_alive;
-    bool m_ready;
+    bool m_alive = true;
+    bool m_ready = false;
     pthread_t m_thread;
     QMutex m_mutex;
     QWaitCondition m_waitCondition;
 
-    Impl::Compositor *m_compositor;
+    Impl::Compositor *m_compositor = nullptr;
 
     QList<Command> m_commandQueue;
 };
diff --git a/tests/auto/client/shared/mockinput.cpp b/tests/auto/client/shared/mockinput.cpp
index 9cea85b6d..8b7592824 100644
--- a/tests/auto/client/shared/mockinput.cpp
+++ b/tests/auto/client/shared/mockinput.cpp
@@ -232,10 +232,7 @@ void Seat::seat_get_touch(Resource *resource, uint32_t id)
 }
 
 Keyboard::Keyboard(Compositor *compositor)
-    : wl_keyboard()
-    , m_compositor(compositor)
-    , m_focusResource(nullptr)
-    , m_focus(nullptr)
+    : m_compositor(compositor)
 {
 }
 
@@ -286,10 +283,7 @@ void Keyboard::keyboard_destroy_resource(wl_keyboard::Resource *resource)
 }
 
 Pointer::Pointer(Compositor *compositor)
-    : wl_pointer()
-    , m_compositor(compositor)
-    , m_focusResource(nullptr)
-    , m_focus(nullptr)
+    : m_compositor(compositor)
 {
 }
 
@@ -393,10 +387,7 @@ DataOffer::DataOffer()
 }
 
 DataDevice::DataDevice(Compositor *compositor)
-    : wl_data_device()
-    , m_compositor(compositor)
-    , m_dataOffer(nullptr)
-    , m_focus(nullptr)
+    : m_compositor(compositor)
 {
 
 }
diff --git a/tests/auto/client/shared/mockinput.h b/tests/auto/client/shared/mockinput.h
index 9c217b6ac..5760ab40c 100644
--- a/tests/auto/client/shared/mockinput.h
+++ b/tests/auto/client/shared/mockinput.h
@@ -85,8 +85,8 @@ protected:
 private:
     Compositor *m_compositor;
 
-    Resource *m_focusResource;
-    Surface *m_focus;
+    Resource *m_focusResource = nullptr;
+    Surface *m_focus = nullptr;
 };
 
 class Pointer : public QtWaylandServer::wl_pointer
@@ -108,8 +108,8 @@ protected:
 private:
     Compositor *m_compositor;
 
-    Resource *m_focusResource;
-    Surface *m_focus;
+    Resource *m_focusResource = nullptr;
+    Surface *m_focus = nullptr;
 };
 
 class Touch : public QtWaylandServer::wl_touch
@@ -146,8 +146,8 @@ protected:
 
 private:
     Compositor *m_compositor;
-    QtWaylandServer::wl_data_offer *m_dataOffer;
-    Surface* m_focus;
+    QtWaylandServer::wl_data_offer *m_dataOffer = nullptr;
+    Surface* m_focus = nullptr;
 };
 
 class DataDeviceManager : public QtWaylandServer::wl_data_device_manager
diff --git a/tests/auto/client/shared/mocksurface.cpp b/tests/auto/client/shared/mocksurface.cpp
index 7aa2a00b2..98a9615a6 100644
--- a/tests/auto/client/shared/mocksurface.cpp
+++ b/tests/auto/client/shared/mocksurface.cpp
@@ -62,10 +62,8 @@ void Compositor::sendSurfaceLeave(void *data, const QList<QVariant> &parameters)
 
 Surface::Surface(wl_client *client, uint32_t id, int v, Compositor *compositor)
     : QtWaylandServer::wl_surface(client, id, v)
-    , m_buffer(nullptr)
     , m_compositor(compositor)
     , m_mockSurface(new MockSurface(this))
-    , m_mapped(false)
 {
 }
 
diff --git a/tests/auto/client/shared/mocksurface.h b/tests/auto/client/shared/mocksurface.h
index 5155599bb..8bf6eb755 100644
--- a/tests/auto/client/shared/mocksurface.h
+++ b/tests/auto/client/shared/mocksurface.h
@@ -63,12 +63,12 @@ protected:
                        uint32_t callback) override;
     void surface_commit(Resource *resource) override;
 private:
-    wl_resource *m_buffer;
+    wl_resource *m_buffer = nullptr;
 
     Compositor *m_compositor;
     QSharedPointer<MockSurface> m_mockSurface;
     QList<wl_resource *> m_frameCallbackList;
-    bool m_mapped;
+    bool m_mapped = false;
 };
 
 }