diff options
| author | Jan Arne Petersen <jan.petersen@kdab.com> | 2013-08-22 23:22:24 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@digia.com> | 2013-08-28 12:55:38 +0200 |
| commit | 12955f5ec724f15b6f5c740aef58eeb434b6639f (patch) | |
| tree | c61d78a8a50af26b2aa337ec4bcf86dacad4b030 /src/compositor/wayland_wrapper/qwltouch.cpp | |
| parent | c4e89d992e746f8957ef6934f6ee51f620e07cf7 (diff) | |
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>
Diffstat (limited to 'src/compositor/wayland_wrapper/qwltouch.cpp')
| -rw-r--r-- | src/compositor/wayland_wrapper/qwltouch.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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() |