From 12955f5ec724f15b6f5c740aef58eeb434b6639f Mon Sep 17 00:00:00 2001
From: Jan Arne Petersen <jan.petersen@kdab.com>
Date: Thu, 22 Aug 2013 23:22:24 +0200
Subject: Use QMultiMap instead of wl_list for resources

Change generated code in qtwaylandscanner to generate resourceMap()
methods returning a QMultiMap<wl_client*, Resource*>. Adapt code using
resource lists to use the map instead.

Remove Compositor::resourceForSurface().

Change-Id: Id41a1712f9c2477c1a1af843bba2795dd90391e5
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
---
 src/compositor/wayland_wrapper/qwltouch.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/compositor/wayland_wrapper/qwltouch.cpp')

diff --git a/src/compositor/wayland_wrapper/qwltouch.cpp b/src/compositor/wayland_wrapper/qwltouch.cpp
index 54290136e..e595440d7 100644
--- a/src/compositor/wayland_wrapper/qwltouch.cpp
+++ b/src/compositor/wayland_wrapper/qwltouch.cpp
@@ -57,8 +57,7 @@ Touch::Touch(Compositor *compositor)
 void Touch::setFocus(Surface *surface)
 {
     m_focus = surface;
-    struct ::wl_resource *r = Compositor::resourceForSurface(resourceList(), surface);
-    m_focusResource = r ? Resource::fromResource(r) : 0;
+    m_focusResource = surface ? resourceMap().value(surface->resource()->client()) : 0;
 }
 
 void Touch::sendCancel()
-- 
cgit v1.2.3