From a544de1bc0e005ede75a510be0d97f98d44f87c9 Mon Sep 17 00:00:00 2001
From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
Date: Thu, 15 Nov 2018 10:01:16 +0100
Subject: [PATCH] qtwaylandscanner: Generate Resource::object without interface
 prefix

This allows writing template functions like this

    template<typename return_type>
    return_type *fromResource(struct ::wl_resource *resource) {
        if (auto *r = return_type::Resource::fromResource(resource))
            return static_cast<return_type *>(r->object());
        return nullptr;
    }

Letting us easily cast a wl_resource to a wrapper type, i.e.:

    wl_resource *resource = ...
    auto *surfacePrivate = fromResource<QWaylandSurfacePrivate>(resource);

This can hopefully let us reduce some boilerplate in the future.

Change-Id: I41630f35b3472baa39d88d89c1c6503cc0e6584a
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
---
 src/tools/qtwaylandscanner/qtwaylandscanner.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/tools/qtwaylandscanner/qtwaylandscanner.cpp b/src/tools/qtwaylandscanner/qtwaylandscanner.cpp
index bc0262bc0a2..91a6d6eef24 100644
--- a/src/tools/qtwaylandscanner/qtwaylandscanner.cpp
+++ b/src/tools/qtwaylandscanner/qtwaylandscanner.cpp
@@ -504,6 +504,7 @@ bool Scanner::process()
             printf("            virtual ~Resource() {}\n");
             printf("\n");
             printf("            %s *%s_object;\n", interfaceName, interfaceNameStripped);
+            printf("            %s *object() { return %s_object; } \n", interfaceName, interfaceNameStripped);
             printf("            struct ::wl_resource *handle;\n");
             printf("\n");
             printf("            struct ::wl_client *client() const { return wl_resource_get_client(handle); }\n");