From 6129b75ded703dda1080067b6a614e1f44cc292d Mon Sep 17 00:00:00 2001 From: Jan Arne Petersen Date: Wed, 21 Aug 2013 09:34:12 +0200 Subject: Make test compile with Wayland 1.2 Tests still fail when running like before. Change-Id: I9c0a5e8068fa7af7abc0018e6e9c4f08aa39533b Reviewed-by: Andy Nichols --- tests/auto/client/mockcompositor.h | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'tests/auto/client/mockcompositor.h') 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 m_seat; + Pointer *m_pointer; + Keyboard *m_keyboard; QVector m_surfaces; }; -- cgit v1.2.3