diff options
author | Paul Olav Tvete <paul.tvete@qt.io> | 2020-07-07 16:27:32 +0200 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@qt.io> | 2020-07-09 12:29:10 +0200 |
commit | e88cb48b8d0db81cc29ebe47968860b86f65b455 (patch) | |
tree | d5128532dfe8522b5dc4bf2540cbb688bba5449d /src/qtwaylandscanner | |
parent | 8141399afc2b037f3033b755d60efb958d562802 (diff) | |
download | qtwayland-e88cb48b8d0db81cc29ebe47968860b86f65b455.tar.gz |
Fix inconsistent signedness in qtwaylandscanner
Use uint32_t everywhere for id. This is what libwayland does.
Fixes: QTBUG-73098
Change-Id: Ie9564e59001cd9b29481d982b3136a4f31ece717
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/qtwaylandscanner')
-rw-r--r-- | src/qtwaylandscanner/qtwaylandscanner.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/qtwaylandscanner/qtwaylandscanner.cpp b/src/qtwaylandscanner/qtwaylandscanner.cpp index f550651b..8cc5fd47 100644 --- a/src/qtwaylandscanner/qtwaylandscanner.cpp +++ b/src/qtwaylandscanner/qtwaylandscanner.cpp @@ -532,7 +532,7 @@ bool Scanner::process() printf(" class %s %s\n {\n", serverExport.constData(), interfaceName); printf(" public:\n"); - printf(" %s(struct ::wl_client *client, int id, int version);\n", interfaceName); + printf(" %s(struct ::wl_client *client, uint32_t id, int version);\n", interfaceName); printf(" %s(struct ::wl_display *display, int version);\n", interfaceName); printf(" %s(struct ::wl_resource *resource);\n", interfaceName); printf(" %s();\n", interfaceName); @@ -555,13 +555,13 @@ bool Scanner::process() printf(" static Resource *fromResource(struct ::wl_resource *resource);\n"); printf(" };\n"); printf("\n"); - printf(" void init(struct ::wl_client *client, int id, int version);\n"); + printf(" void init(struct ::wl_client *client, uint32_t id, int version);\n"); printf(" void init(struct ::wl_display *display, int version);\n"); printf(" void init(struct ::wl_resource *resource);\n"); printf("\n"); printf(" Resource *add(struct ::wl_client *client, int version);\n"); - printf(" Resource *add(struct ::wl_client *client, int id, int version);\n"); - printf(" Resource *add(struct wl_list *resource_list, struct ::wl_client *client, int id, int version);\n"); + printf(" Resource *add(struct ::wl_client *client, uint32_t id, int version);\n"); + printf(" Resource *add(struct wl_list *resource_list, struct ::wl_client *client, uint32_t id, int version);\n"); printf("\n"); printf(" Resource *resource() { return m_resource; }\n"); printf(" const Resource *resource() const { return m_resource; }\n"); @@ -681,7 +681,7 @@ bool Scanner::process() QByteArray stripped = stripInterfaceName(interface.name); const char *interfaceNameStripped = stripped.constData(); - printf(" %s::%s(struct ::wl_client *client, int id, int version)\n", interfaceName, interfaceName); + printf(" %s::%s(struct ::wl_client *client, uint32_t id, int version)\n", interfaceName, interfaceName); printf(" : m_resource_map()\n"); printf(" , m_resource(nullptr)\n"); printf(" , m_global(nullptr)\n"); @@ -728,7 +728,7 @@ bool Scanner::process() printf(" }\n"); printf("\n"); - printf(" void %s::init(struct ::wl_client *client, int id, int version)\n", interfaceName); + printf(" void %s::init(struct ::wl_client *client, uint32_t id, int version)\n", interfaceName); printf(" {\n"); printf(" m_resource = bind(client, id, version);\n"); printf(" }\n"); @@ -748,7 +748,7 @@ bool Scanner::process() printf(" }\n"); printf("\n"); - printf(" %s::Resource *%s::add(struct ::wl_client *client, int id, int version)\n", interfaceName, interfaceName); + printf(" %s::Resource *%s::add(struct ::wl_client *client, uint32_t id, int version)\n", interfaceName, interfaceName); printf(" {\n"); printf(" Resource *resource = bind(client, id, version);\n"); printf(" m_resource_map.insert(client, resource);\n"); @@ -1016,13 +1016,13 @@ bool Scanner::process() printf(" class %s %s\n {\n", clientExport.constData(), interfaceName); printf(" public:\n"); - printf(" %s(struct ::wl_registry *registry, int id, int version);\n", interfaceName); + printf(" %s(struct ::wl_registry *registry, uint32_t id, int version);\n", interfaceName); printf(" %s(struct ::%s *object);\n", interfaceName, interfaceName); printf(" %s();\n", interfaceName); printf("\n"); printf(" virtual ~%s();\n", interfaceName); printf("\n"); - printf(" void init(struct ::wl_registry *registry, int id, int version);\n"); + printf(" void init(struct ::wl_registry *registry, uint32_t id, int version);\n"); printf(" void init(struct ::%s *object);\n", interfaceName); printf("\n"); printf(" struct ::%s *object() { return m_%s; }\n", interfaceName, interfaceName); @@ -1127,7 +1127,7 @@ bool Scanner::process() bool hasEvents = !interface.events.empty(); - printf(" %s::%s(struct ::wl_registry *registry, int id, int version)\n", interfaceName, interfaceName); + printf(" %s::%s(struct ::wl_registry *registry, uint32_t id, int version)\n", interfaceName, interfaceName); printf(" {\n"); printf(" init(registry, id, version);\n"); printf(" }\n"); @@ -1152,7 +1152,7 @@ bool Scanner::process() printf(" }\n"); printf("\n"); - printf(" void %s::init(struct ::wl_registry *registry, int id, int version)\n", interfaceName); + printf(" void %s::init(struct ::wl_registry *registry, uint32_t id, int version)\n", interfaceName); printf(" {\n"); printf(" m_%s = static_cast<struct ::%s *>(wlRegistryBind(registry, id, &%s_interface, version));\n", interfaceName, interfaceName, interfaceName); if (hasEvents) |