diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-03 12:56:09 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-04 16:12:47 +0200 |
| commit | 7e9b31ecda04aa3ad5eea737c19cf2f204d208da (patch) | |
| tree | 3573eb3d319b0ece4028f2aa6d1ad35454b8b40a /src/compositor/compositor_api/qwaylandoutput.cpp | |
| parent | 4c5a796e96a66c18afbde0577d8b912a618fe710 (diff) | |
QWaylandOutput::outputForClient to QWaylandOutput::resourceForClient
Change-Id: I052286240ce986c9f5a4e897639f1e93e64d96da
Diffstat (limited to 'src/compositor/compositor_api/qwaylandoutput.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandoutput.cpp | 6 |
1 files changed, 3 insertions, 3 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 |