summaryrefslogtreecommitdiffstats
path: root/src/compositor/hardware_integration
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2012-04-11 17:31:40 +0200
committerSamuel Rødal <samuel.rodal@nokia.com>2012-04-11 17:37:51 +0200
commitc6c28935a2040aa0477a7844afbf934b0eda2fa2 (patch)
treefc31847c348b701379f5a0402bdf9386de42fcf2 /src/compositor/hardware_integration
parentf984c7985ca26096dd293f18ba4d0b8271fdb4f5 (diff)
Fixed xcomposite_share compile errors.
Change-Id: I1fac804abcb09bd760246c95a961a2d5b91de03a Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Diffstat (limited to 'src/compositor/hardware_integration')
-rw-r--r--src/compositor/hardware_integration/xcomposite_share/xcompositebuffer.cpp16
-rw-r--r--src/compositor/hardware_integration/xcomposite_share/xcompositebuffer.h6
-rw-r--r--src/compositor/hardware_integration/xcomposite_share/xcompositehandler.h1
3 files changed, 1 insertions, 22 deletions
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"