Improve wayland_cast and introduce resolve to simplify code.

Resolves the wl_resource by accessing the data member.

Change-Id: I10912acea0a3ca6abbc067d07d43a46ec65a77aa
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/compositor/wayland_wrapper/wlinputdevice.cpp b/src/compositor/wayland_wrapper/wlinputdevice.cpp
index edf55d7fb..72b735a2f 100644
--- a/src/compositor/wayland_wrapper/wlinputdevice.cpp
+++ b/src/compositor/wayland_wrapper/wlinputdevice.cpp
@@ -207,7 +207,7 @@ void InputDevice::sendFullTouchEvent(QTouchEvent *event)
 
 Surface *InputDevice::keyboardFocus() const
 {
-    return wayland_cast<Surface *>(base()->keyboard_focus);
+    return wayland_cast<Surface>(base()->keyboard_focus);
 }
 
 void InputDevice::setKeyboardFocus(Surface *surface)
@@ -218,7 +218,7 @@ void InputDevice::setKeyboardFocus(Surface *surface)
 
 Surface *InputDevice::mouseFocus() const
 {
-    return wayland_cast<Surface *>(base()->pointer_focus);
+    return wayland_cast<Surface>(base()->pointer_focus);
 }
 
 void InputDevice::setMouseFocus(Surface *surface, const QPoint &globalPos, const QPoint &localPos)
@@ -320,7 +320,7 @@ void InputDevice::input_device_attach(struct wl_client *client,
     struct wl_input_device *device_base = reinterpret_cast<struct wl_input_device *>(device_resource->data);
     struct wl_buffer *buffer = reinterpret_cast<struct wl_buffer *>(buffer_resource);
 
-    InputDevice *inputDevice = wayland_cast<InputDevice *>(device_base);
+    InputDevice *inputDevice = wayland_cast<InputDevice>(device_base);
     if (wl_buffer_is_shm(buffer)) {
         ShmBuffer *shmBuffer = static_cast<ShmBuffer *>(buffer->user_data);
         if (shmBuffer) {