From 7e9b31ecda04aa3ad5eea737c19cf2f204d208da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@theqtcompany.com>
Date: Thu, 3 Sep 2015 12:56:09 +0200
Subject: QWaylandOutput::outputForClient to QWaylandOutput::resourceForClient

Change-Id: I052286240ce986c9f5a4e897639f1e93e64d96da
---
 src/compositor/compositor_api/qwaylandoutput.cpp | 6 +++---
 src/compositor/compositor_api/qwaylandoutput.h   | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/compositor')

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;
 
-- 
cgit v1.2.3