Adapted Surface and Region to use the qtwaylandscanner.

This requires some slight additions to the qtwaylandscanner to handle
the pattern of the wl_resource not being owned by the generated class.

Change-Id: Ia49c8129cee3a203ca9a727e83fafd3dfc653e75
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>

1 files changed, 0 insertions, 30 deletions

diff --git a/src/compositor/global/qwaylandobject.h b/src/compositor/global/qwaylandobject.h
index 6d93297a1..9b3450397 100644
--- a/src/compositor/global/qwaylandobject.h
+++ b/src/compositor/global/qwaylandobject.h
@@ -60,38 +60,8 @@ public:
 
     const T *base() const { return this; }
     T *base() { return this; }
-
-    template <typename Implementation>
-    void addClientResource(wl_client *client,
-                           wl_resource *resource,
-                           int id, const struct wl_interface *interface,
-                           Implementation implementation,
-                           void (*destroy)(struct wl_resource *resource))
-    {
-        resource->object.id = id;
-        resource->object.interface = interface;
-        resource->object.implementation = (void (**)(void))implementation;
-        resource->data = this;
-        resource->destroy = destroy;
-
-        wl_client_add_resource(client, resource);
-    }
 };
 
-template <typename T>
-T *resolve(wl_resource *from)
-{
-    Object<typename T::Base> *object = reinterpret_cast<Object<typename T::Base> *>(from->data);
-    return static_cast<T *>(object);
-}
-
-template <typename T>
-T *wayland_cast(typename T::Base *from)
-{
-    Object<typename T::Base> *object = reinterpret_cast<Object<typename T::Base> *>(from);
-    return static_cast<T *>(object);
-}
-
 }
 
 QT_END_NAMESPACE