diff options
Diffstat (limited to 'tests/auto/client/client')
-rw-r--r-- | tests/auto/client/client/mockcompositor.cpp | 10 | ||||
-rw-r--r-- | tests/auto/client/client/mockoutput.cpp | 4 | ||||
-rw-r--r-- | tests/auto/client/client/mockshell.cpp | 9 | ||||
-rw-r--r-- | tests/auto/client/client/mocksurface.cpp | 2 |
4 files changed, 12 insertions, 13 deletions
diff --git a/tests/auto/client/client/mockcompositor.cpp b/tests/auto/client/client/mockcompositor.cpp index c00d24bc3..45a35ea7d 100644 --- a/tests/auto/client/client/mockcompositor.cpp +++ b/tests/auto/client/client/mockcompositor.cpp @@ -274,7 +274,7 @@ Compositor::Compositor() exit(EXIT_FAILURE); } - wl_display_add_global(m_display, &wl_compositor_interface, this, bindCompositor); + wl_global_create(m_display, &wl_compositor_interface, 1, this, bindCompositor); m_data_device_manager.reset(new DataDeviceManager(this, m_display)); @@ -285,8 +285,8 @@ Compositor::Compositor() m_keyboard = m_seat->keyboard(); m_touch = m_seat->touch(); - wl_display_add_global(m_display, &wl_output_interface, this, bindOutput); - wl_display_add_global(m_display, &wl_shell_interface, this, bindShell); + wl_global_create(m_display, &wl_output_interface, 1, this, bindOutput); + wl_global_create(m_display, &wl_shell_interface, 1, this, bindShell); m_loop = wl_display_get_event_loop(m_display); m_fd = wl_event_loop_get_fd(m_loop); @@ -323,8 +323,8 @@ void Compositor::bindCompositor(wl_client *client, void *compositorData, uint32_ compositor_create_region }; - Q_UNUSED(version); - wl_client_add_object(client, &wl_compositor_interface, &compositorInterface, id, compositorData); + wl_resource *resource = wl_resource_create(client, &wl_compositor_interface, static_cast<int>(version), id); + wl_resource_set_implementation(resource, &compositorInterface, compositorData, nullptr); } static void unregisterResourceCallback(wl_listener *listener, void *data) diff --git a/tests/auto/client/client/mockoutput.cpp b/tests/auto/client/client/mockoutput.cpp index 057387160..86561976f 100644 --- a/tests/auto/client/client/mockoutput.cpp +++ b/tests/auto/client/client/mockoutput.cpp @@ -32,9 +32,7 @@ namespace Impl { void Compositor::bindOutput(wl_client *client, void *compositorData, uint32_t version, uint32_t id) { - Q_UNUSED(version); - - wl_resource *resource = wl_client_add_object(client, &wl_output_interface, 0, id, compositorData); + wl_resource *resource = wl_resource_create(client, &wl_output_interface, static_cast<int>(version), id); Compositor *compositor = static_cast<Compositor *>(compositorData); registerResource(&compositor->m_outputResources, resource); diff --git a/tests/auto/client/client/mockshell.cpp b/tests/auto/client/client/mockshell.cpp index 2ce5965a3..d5eede22e 100644 --- a/tests/auto/client/client/mockshell.cpp +++ b/tests/auto/client/client/mockshell.cpp @@ -159,8 +159,9 @@ static void get_shell_surface(wl_client *client, wl_resource *compositorResource shell_surface_set_class }; - Q_UNUSED(compositorResource); - wl_client_add_object(client, &wl_shell_surface_interface, &shellSurfaceInterface, id, surfaceResource->data); + int version = wl_resource_get_version(compositorResource); + wl_resource *shellSurface = wl_resource_create(client, &wl_shell_surface_interface, version, id); + wl_resource_set_implementation(shellSurface, &shellSurfaceInterface, surfaceResource->data, nullptr); Surface *surf = Surface::fromResource(surfaceResource); surf->map(); } @@ -171,8 +172,8 @@ void Compositor::bindShell(wl_client *client, void *compositorData, uint32_t ver get_shell_surface }; - Q_UNUSED(version); - wl_client_add_object(client, &wl_shell_interface, &shellInterface, id, compositorData); + wl_resource *resource = wl_resource_create(client, &wl_shell_interface, static_cast<int>(version), id); + wl_resource_set_implementation(resource, &shellInterface, compositorData, nullptr); } } diff --git a/tests/auto/client/client/mocksurface.cpp b/tests/auto/client/client/mocksurface.cpp index 749a1470d..55712af11 100644 --- a/tests/auto/client/client/mocksurface.cpp +++ b/tests/auto/client/client/mocksurface.cpp @@ -96,7 +96,7 @@ void Surface::surface_damage(Resource *resource, void Surface::surface_frame(Resource *resource, uint32_t callback) { - wl_resource *frameCallback = wl_client_add_object(resource->client(), &wl_callback_interface, 0, callback, this); + wl_resource *frameCallback = wl_resource_create(resource->client(), &wl_callback_interface, 1, callback); m_frameCallbackList << frameCallback; } |