summaryrefslogtreecommitdiffstats
path: root/src/compositor
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@theqtcompany.com>2015-09-18 16:28:52 +0200
committerPaul Olav Tvete <paul.tvete@theqtcompany.com>2015-09-18 14:47:21 +0000
commit660880a997a892e7f65d0d7b4e2f974fc4e487ad (patch)
tree2c9ee7b95664c34f4f032ab0fe97471ed6b9877f /src/compositor
parentdca52a541eaf61269c8e746555380a7aef942b1e (diff)
Remove nativeBuffer from QWaylandBufferRef
Change-Id: I0f95ee3a93e7884c730492d324b5430f7be0502d Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
Diffstat (limited to 'src/compositor')
-rw-r--r--src/compositor/compositor_api/qwaylandbufferref.cpp5
-rw-r--r--src/compositor/compositor_api/qwaylandbufferref.h4
2 files changed, 1 insertions, 8 deletions
diff --git a/src/compositor/compositor_api/qwaylandbufferref.cpp b/src/compositor/compositor_api/qwaylandbufferref.cpp
index 4c020e603..057a47148 100644
--- a/src/compositor/compositor_api/qwaylandbufferref.cpp
+++ b/src/compositor/compositor_api/qwaylandbufferref.cpp
@@ -164,9 +164,4 @@ void QWaylandBufferRef::bindToTexture() const
}
-void *QWaylandBufferRef::nativeBuffer() const
-{
- return d->buffer->waylandBufferHandle();
-}
-
QT_END_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandbufferref.h b/src/compositor/compositor_api/qwaylandbufferref.h
index 24d4e4a9e..d67d8178c 100644
--- a/src/compositor/compositor_api/qwaylandbufferref.h
+++ b/src/compositor/compositor_api/qwaylandbufferref.h
@@ -70,7 +70,7 @@ public:
bool operator==(const QWaylandBufferRef &ref);
bool operator!=(const QWaylandBufferRef &ref);
- wl_resource *wl_buffer() const;
+ struct wl_resource *wl_buffer() const;
QSize size() const;
QWaylandSurface::Origin origin() const;
@@ -80,8 +80,6 @@ public:
void bindToTexture() const;
- void *nativeBuffer() const;
-
private:
class QWaylandBufferRefPrivate *const d;
friend class QWaylandBufferRefPrivate;