1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compiler warnings because of deprecated apis

Browse Source 
Change-Id: I60faee3fb4b9a74a13c8489a5dd1df7a2a5a4ae4
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
This commit is contained in:
Jorgen Lind 2014-01-16 15:33:21 +01:00 committed by Laszlo Agocs
parent 9a6a2fbe21
commit 47d8cb089e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/qtwaylandscanner/qtwaylandscanner.cpp
View File

@ -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");