Fix compiler warnings because of deprecated apis

Change-Id: I60faee3fb4b9a74a13c8489a5dd1df7a2a5a4ae4
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>

6 files changed, 29 insertions, 19 deletions

diff --git a/src/compositor/wayland_wrapper/qwlcompositor.cpp b/src/compositor/wayland_wrapper/qwlcompositor.cpp
index 3c606d21..d1aa6fc0 100644
--- a/src/compositor/wayland_wrapper/qwlcompositor.cpp
+++ b/src/compositor/wayland_wrapper/qwlcompositor.cpp
@@ -120,7 +120,8 @@ void Compositor::bind_func(struct wl_client *client, void *data,
                       uint32_t version, uint32_t id)
 {
     Q_UNUSED(version);
-    wl_client_add_object(client,&wl_compositor_interface, &compositor_interface, id,data);
+    struct wl_resource *resource = wl_resource_create(client, &wl_compositor_interface, version, id);
+    wl_resource_set_implementation(resource, &compositor_interface, data, 0);
 }
 
 Compositor *Compositor::instance()
@@ -161,7 +162,11 @@ Compositor::Compositor(QWaylandCompositor *qt_compositor, QWaylandCompositor::Ex
     if (extensions & QWaylandCompositor::WindowManagerExtension)
         m_windowManagerIntegration = new WindowManagerServerIntegration(qt_compositor, this);
 
-    wl_display_add_global(m_display->handle(),&wl_compositor_interface,this,Compositor::bind_func);
+    wl_global_create(m_display->handle(),
+                     &wl_compositor_interface,
+                     wl_compositor_interface.version,
+                     this,
+                     Compositor::bind_func);
 
     m_data_device_manager =  new DataDeviceManager(this);
 
@@ -170,7 +175,11 @@ Compositor::Compositor(QWaylandCompositor *qt_compositor, QWaylandCompositor::Ex
     m_output_global = new OutputGlobal(m_display->handle());
 
     m_shell = new Shell();
-    wl_display_add_global(m_display->handle(), &wl_shell_interface, m_shell, Shell::bind_func);
+    wl_global_create(m_display->handle(),
+                     &wl_shell_interface,
+                     wl_shell_interface.version,
+                     m_shell,
+                     Shell::bind_func);
 
 #if defined (QT_COMPOSITOR_WAYLAND_GL)
     if (extensions & QWaylandCompositor::HardwareIntegrationExtension)
diff --git a/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp b/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp
index 7730e034..98852a2b 100644
--- a/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp
+++ b/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp
@@ -217,7 +217,8 @@ bool DataDeviceManager::offerFromCompositorToClient(wl_resource *clientDataDevic
     //qDebug("compositor offers %d types to %p", m_retainedData.formats().count(), client);
 
     struct wl_resource *selectionOffer =
-             wl_client_new_object(client, &wl_data_offer_interface, &compositor_offer_interface, this);
+             wl_resource_create(client, &wl_data_offer_interface, -1, 0);
+    wl_resource_set_implementation(selectionOffer, &compositor_offer_interface, this, 0);
     wl_data_device_send_data_offer(clientDataDeviceResource, selectionOffer);
     foreach (const QString &format, m_retainedData.formats()) {
         QByteArray ba = format.toLatin1();
diff --git a/src/compositor/wayland_wrapper/qwlshellsurface.cpp b/src/compositor/wayland_wrapper/qwlshellsurface.cpp
index 9b61d60b..8762d365 100644
--- a/src/compositor/wayland_wrapper/qwlshellsurface.cpp
+++ b/src/compositor/wayland_wrapper/qwlshellsurface.cpp
@@ -62,7 +62,8 @@ void Shell::bind_func(struct wl_client *client, void *data,
                             uint32_t version, uint32_t id)
 {
     Q_UNUSED(version);
-    wl_client_add_object(client,&wl_shell_interface,&shell_interface,id,data);
+    struct wl_resource *resource = wl_resource_create(client, &wl_shell_interface, version, id);
+    wl_resource_set_implementation(resource, &shell_interface, data, 0);
 }
 
 ShellSurfacePopupGrabber *Shell::getPopupGrabber(InputDevice *input)
diff --git a/src/compositor/wayland_wrapper/qwlsubsurface.cpp b/src/compositor/wayland_wrapper/qwlsubsurface.cpp
index 145f86ab..82ecbcfe 100644
--- a/src/compositor/wayland_wrapper/qwlsubsurface.cpp
+++ b/src/compositor/wayland_wrapper/qwlsubsurface.cpp
@@ -50,16 +50,18 @@ namespace QtWayland {
 SubSurfaceExtensionGlobal::SubSurfaceExtensionGlobal(Compositor *compositor)
     : m_compositor(compositor)
 {
-    wl_display_add_global(m_compositor->wl_display(),
-                          &qt_sub_surface_extension_interface,
-                          this,
-                          SubSurfaceExtensionGlobal::bind_func);
+    wl_global_create(m_compositor->wl_display(),
+                     &qt_sub_surface_extension_interface,
+                     qt_sub_surface_extension_interface.version,
+                     this,
+                     SubSurfaceExtensionGlobal::bind_func);
 }
 
 void SubSurfaceExtensionGlobal::bind_func(wl_client *client, void *data, uint32_t version, uint32_t id)
 {
     Q_UNUSED(version);
-    wl_client_add_object(client, &qt_sub_surface_extension_interface,&sub_surface_extension_interface,id,data);
+    struct wl_resource *resource = wl_resource_create(client, &qt_sub_surface_extension_interface,version,id);
+    wl_resource_set_implementation(resource, &sub_surface_extension_interface, data, 0);
 }
 
 void SubSurfaceExtensionGlobal::get_sub_surface_aware_surface(wl_client *client, wl_resource *sub_surface_extension_resource, uint32_t id, wl_resource *surface_resource)
@@ -78,11 +80,8 @@ SubSurface::SubSurface(wl_client *client, uint32_t id, Surface *surface)
     , m_parent(0)
 {
     surface->setSubSurface(this);
-    m_sub_surface_resource = wl_client_add_object(client,
-                                                       &qt_sub_surface_interface,
-                                                       &sub_surface_interface,
-                                                       id,
-                                                       this);
+    m_sub_surface_resource = wl_resource_create(client, &qt_sub_surface_interface, qt_sub_surface_interface.version, id);
+    wl_resource_set_implementation(m_sub_surface_resource, &sub_surface_interface, this, 0);
 }
 
 SubSurface::~SubSurface()
diff --git a/src/compositor/wayland_wrapper/qwlsurface.cpp b/src/compositor/wayland_wrapper/qwlsurface.cpp
index 2b410948..e313193f 100644
--- a/src/compositor/wayland_wrapper/qwlsurface.cpp
+++ b/src/compositor/wayland_wrapper/qwlsurface.cpp
@@ -480,7 +480,7 @@ void Surface::surface_damage(Resource *, int32_t x, int32_t y, int32_t width, in
 
 void Surface::surface_frame(Resource *resource, uint32_t callback)
 {
-    struct wl_resource *frame_callback = wl_client_add_object(resource->client(), &wl_callback_interface, 0, callback, this);
+    struct wl_resource *frame_callback = wl_resource_create(resource->client(), &wl_callback_interface, wl_callback_interface.version, callback);
     wl_list_insert(&m_frame_callback_list, &frame_callback->link);
 }
 
diff --git a/src/qtwaylandscanner/qtwaylandscanner.cpp b/src/qtwaylandscanner/qtwaylandscanner.cpp
index 43783222..df751a8c 100644
--- a/src/qtwaylandscanner/qtwaylandscanner.cpp
+++ b/src/qtwaylandscanner/qtwaylandscanner.cpp
@@ -604,7 +604,7 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath)
 
             printf("    void %s::init(struct ::wl_display *display)\n", interfaceName);
             printf("    {\n");
-            printf("        m_global = wl_display_add_global(display, &::%s_interface, this, bind_func);\n", interfaceName);
+            printf("        m_global = wl_global_create(display, &::%s_interface, ::%s_interface.version, this, bind_func);\n", interfaceName, interfaceName);
             printf("    }\n");
             printf("\n");
 
@@ -655,9 +655,9 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath)
             printf("        Resource *resource = %s_allocate();\n", interfaceNameStripped);
             printf("        resource->%s = this;\n", interfaceNameStripped);
             printf("\n");
-            printf("        struct ::wl_resource *handle = id != 0 ? wl_client_add_object(client, &::%s_interface, %s, id, resource) : wl_client_new_object(client, &::%s_interface, %s, resource);\n", interfaceName, interfaceMember.constData(), interfaceName, interfaceMember.constData());
+            printf("        struct ::wl_resource *handle = wl_resource_create(client, &::%s_interface, ::%s_interface.version, id);\n", interfaceName, interfaceName);
+            printf("        wl_resource_set_implementation(handle, %s, resource, destroy_func);", interfaceMember.constData());
             printf("\n");
-            printf("        handle->destroy = destroy_func;\n");
             printf("        resource->handle = handle;\n");
             printf("        %s_bind_resource(resource);\n", interfaceNameStripped);
             printf("        return resource;\n");