From: Jørgen Lind Date: Mon, 23 Apr 2012 10:21:29 +0000 (+0200) Subject: Fix warnings in compositor and 1 wl_resource_send event X-Git-Tag: TIZEN~66 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=85005363229b165c94a9899632cb35e5f4ddfe01;p=profile%2Fivi%2Fqtwayland.git Fix warnings in compositor and 1 wl_resource_send event Change-Id: I3eb46559c6b19abcc625cd09c8d2921956fc8ec9 Reviewed-by: Laszlo Agocs --- diff --git a/src/compositor/wayland_wrapper/wlshellsurface.cpp b/src/compositor/wayland_wrapper/wlshellsurface.cpp index 7f0a3ee..a89cd0a 100644 --- a/src/compositor/wayland_wrapper/wlshellsurface.cpp +++ b/src/compositor/wayland_wrapper/wlshellsurface.cpp @@ -89,7 +89,7 @@ ShellSurface::ShellSurface(wl_client *client, uint32_t id, Surface *surface) void ShellSurface::sendConfigure(uint32_t edges, int32_t width, int32_t height) { - wl_resource_post_event(m_shellSurface,WL_SHELL_SURFACE_CONFIGURE, Compositor::currentTimeMsecs(),edges,width,height); + wl_shell_surface_send_configure(m_shellSurface,edges,width,height); } Surface *ShellSurface::surface() const @@ -303,6 +303,7 @@ void ShellSurfaceGrabber::destroy(wl_listener *listener, wl_resource *resource, { Q_UNUSED(resource); Q_UNUSED(time); + Q_UNUSED(listener); //ShellSurfaceGrabber *shell_surface_grabber = container_of(listener, ShellSurfaceGrabber,surface_destroy_listener); Q_ASSERT(false); //hasn't been enabled yet //wl_input_device_end_grab(shell_surface_grabber->base()->input_device,Compositor::currentTimeMsecs()); @@ -316,10 +317,17 @@ ShellSurfaceResizeGrabber::ShellSurfaceResizeGrabber(ShellSurface *shellSurface) void ShellSurfaceResizeGrabber::focus(wl_pointer_grab *grab, wl_surface *surface, int32_t x, int32_t y) { + Q_UNUSED(grab); + Q_UNUSED(surface); + Q_UNUSED(x); + Q_UNUSED(y); } void ShellSurfaceResizeGrabber::motion(wl_pointer_grab *grab, uint32_t time, int32_t x, int32_t y) { + Q_UNUSED(time); + Q_UNUSED(x); + Q_UNUSED(y); //Should be more structured ShellSurfaceResizeGrabber *resize_grabber = reinterpret_cast(grab); ShellSurface *shell_surface = resize_grabber->shell_surface; @@ -388,10 +396,17 @@ ShellSurfaceMoveGrabber::ShellSurfaceMoveGrabber(ShellSurface *shellSurface) void ShellSurfaceMoveGrabber::focus(wl_pointer_grab *grab, wl_surface *surface, int32_t x, int32_t y) { + Q_UNUSED(grab); + Q_UNUSED(surface); + Q_UNUSED(x); + Q_UNUSED(y); } void ShellSurfaceMoveGrabber::motion(wl_pointer_grab *grab, uint32_t time, int32_t x, int32_t y) { + Q_UNUSED(time); + Q_UNUSED(x); + Q_UNUSED(y); ShellSurfaceMoveGrabber *shell_surface_grabber = reinterpret_cast(grab); ShellSurface *shell_surface = shell_surface_grabber->shell_surface; InputDevice *input_device = reinterpret_cast(grab->input_device);