diff options
Diffstat (limited to 'src/compositor')
-rw-r--r-- | src/compositor/compositor_api/qwaylandoutput.cpp | 6 | ||||
-rw-r--r-- | src/compositor/compositor_api/qwaylandoutput.h | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/compositor/compositor_api/qwaylandoutput.cpp b/src/compositor/compositor_api/qwaylandoutput.cpp index 363cf4653..33b0acf80 100644 --- a/src/compositor/compositor_api/qwaylandoutput.cpp +++ b/src/compositor/compositor_api/qwaylandoutput.cpp @@ -232,7 +232,7 @@ QWaylandOutput *QWaylandOutput::fromResource(wl_resource *resource) return static_cast<QWaylandOutputPrivate *>(QWaylandOutputPrivate::Resource::fromResource(resource)->output_object)->q_func(); } -struct ::wl_resource *QWaylandOutput::outputForClient(QWaylandClient *client) const +struct ::wl_resource *QWaylandOutput::resourceForClient(QWaylandClient *client) const { Q_D(const QWaylandOutput); QWaylandOutputPrivate::Resource *r = d->resourceMap().value(client->client()); @@ -555,14 +555,14 @@ void QWaylandOutput::surfaceEnter(QWaylandSurface *surface) { if (!surface) return; - QWaylandSurfacePrivate::get(surface)->send_enter(outputForClient(surface->client())); + QWaylandSurfacePrivate::get(surface)->send_enter(resourceForClient(surface->client())); } void QWaylandOutput::surfaceLeave(QWaylandSurface *surface) { if (!surface) return; - QWaylandSurfacePrivate::get(surface)->send_leave(outputForClient(surface->client())); + QWaylandSurfacePrivate::get(surface)->send_leave(resourceForClient(surface->client())); } QWaylandView *QWaylandOutput::pickView(const QPointF &outputPosition) const diff --git a/src/compositor/compositor_api/qwaylandoutput.h b/src/compositor/compositor_api/qwaylandoutput.h index 63ef384b7..edb08d226 100644 --- a/src/compositor/compositor_api/qwaylandoutput.h +++ b/src/compositor/compositor_api/qwaylandoutput.h @@ -109,8 +109,7 @@ public: ~QWaylandOutput(); static QWaylandOutput *fromResource(wl_resource *resource); - //### rename to resourceForClient - struct ::wl_resource *outputForClient(QWaylandClient *client) const; + struct ::wl_resource *resourceForClient(QWaylandClient *client) const; QWaylandCompositor *compositor() const; |