Make test compile with Wayland 1.2

Tests still fail when running like before.

Change-Id: I9c0a5e8068fa7af7abc0018e6e9c4f08aa39533b
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

1 files changed, 6 insertions, 10 deletions

diff --git a/tests/auto/client/mockcompositor.h b/tests/auto/client/mockcompositor.h
index 6bfd5d6bd..7f3e22683 100644
--- a/tests/auto/client/mockcompositor.h
+++ b/tests/auto/client/mockcompositor.h
@@ -58,6 +58,9 @@ namespace Impl {
 
 typedef void (**Implementation)(void);
 
+class Keyboard;
+class Pointer;
+class Seat;
 class Surface;
 
 class Compositor
@@ -87,16 +90,9 @@ public:
 
 private:
     static void bindCompositor(wl_client *client, void *data, uint32_t version, uint32_t id);
-    static void bindSeat(wl_client *client, void *data, uint32_t version, uint32_t id);
     static void bindOutput(wl_client *client, void *data, uint32_t version, uint32_t id);
     static void bindShell(wl_client *client, void *data, uint32_t version, uint32_t id);
 
-    static void get_pointer(wl_client *client, wl_resource *resource, uint32_t id);
-    static void get_keyboard(wl_client *client, wl_resource *resource, uint32_t id);
-    static void get_touch(wl_client *client, wl_resource *resource, uint32_t id);
-
-    static void destroyInputResource(wl_resource *resource);
-
     void initShm();
 
     void sendOutputGeometry(wl_resource *resource);
@@ -112,9 +108,9 @@ private:
     wl_list m_outputResources;
     uint32_t m_time;
 
-    wl_seat m_seat;
-    wl_pointer m_pointer;
-    wl_keyboard m_keyboard;
+    QScopedPointer<Seat> m_seat;
+    Pointer *m_pointer;
+    Keyboard *m_keyboard;
     QVector<Surface *> m_surfaces;
 };