From c6c28935a2040aa0477a7844afbf934b0eda2fa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Wed, 11 Apr 2012 17:31:40 +0200 Subject: Fixed xcomposite_share compile errors. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1fac804abcb09bd760246c95a961a2d5b91de03a Reviewed-by: Jørgen Lind --- .../xcomposite_share/xcompositebuffer.cpp | 16 ---------------- .../xcomposite_share/xcompositebuffer.h | 6 ------ .../xcomposite_share/xcompositehandler.h | 1 + 3 files changed, 1 insertion(+), 22 deletions(-) (limited to 'src/compositor/hardware_integration') diff --git a/src/compositor/hardware_integration/xcomposite_share/xcompositebuffer.cpp b/src/compositor/hardware_integration/xcomposite_share/xcompositebuffer.cpp index 8d14cb757..29f6ceb13 100644 --- a/src/compositor/hardware_integration/xcomposite_share/xcompositebuffer.cpp +++ b/src/compositor/hardware_integration/xcomposite_share/xcompositebuffer.cpp @@ -49,25 +49,9 @@ XCompositeBuffer::XCompositeBuffer(Wayland::Compositor *compositor, Window windo } struct wl_buffer_interface XCompositeBuffer::buffer_interface = { - XCompositeBuffer::buffer_interface_damage, XCompositeBuffer::buffer_interface_destroy }; -void XCompositeBuffer::buffer_interface_damage(struct wl_client *client, - struct wl_resource *buffer, - int x, - int y, - int width, - int height) -{ - Q_UNUSED(client); - Q_UNUSED(buffer); - Q_UNUSED(x); - Q_UNUSED(y); - Q_UNUSED(width); - Q_UNUSED(height); -} - void XCompositeBuffer::buffer_interface_destroy(wl_client *client, wl_resource *buffer) { Q_UNUSED(client); diff --git a/src/compositor/hardware_integration/xcomposite_share/xcompositebuffer.h b/src/compositor/hardware_integration/xcomposite_share/xcompositebuffer.h index 00a7b689f..406860ed6 100644 --- a/src/compositor/hardware_integration/xcomposite_share/xcompositebuffer.h +++ b/src/compositor/hardware_integration/xcomposite_share/xcompositebuffer.h @@ -71,12 +71,6 @@ private: static void buffer_interface_destroy(struct wl_client *client, struct wl_resource *buffer); - static void buffer_interface_damage(struct wl_client *client, - struct wl_resource *buffer, - int x, - int y, - int width, - int height); }; #endif // XCOMPOSITORBUFFER_H diff --git a/src/compositor/hardware_integration/xcomposite_share/xcompositehandler.h b/src/compositor/hardware_integration/xcomposite_share/xcompositehandler.h index 0b92f9ad1..5da4315a1 100644 --- a/src/compositor/hardware_integration/xcomposite_share/xcompositehandler.h +++ b/src/compositor/hardware_integration/xcomposite_share/xcompositehandler.h @@ -42,6 +42,7 @@ #define XCOMPOSITEHANDLER_H #include "wayland_wrapper/wlcompositor.h" +#include "waylandobject.h" #include "xlibinclude.h" -- cgit v1.2.3