summaryrefslogtreecommitdiffstats
path: root/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h
diff options
context:
space:
mode:
authorJorgen Lind <jorgen.lind@digia.com>2014-02-11 13:25:51 +0100
committerAndy Nichols <andy.nichols@digia.com>2014-02-11 17:38:36 +0100
commitaaa81b2bb5eb3b18cb80c71c6730db227f31825f (patch)
treeebb4831cd028fd9fba0e7696a5e45d17f568f856 /src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h
parent87d2b0b860e0250639d4fc9136ef23d3983f171a (diff)
Making the buffer intgrations private
Change-Id: Ifb6e2456c781e80f84e27e68c3e279ea993f9307 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h')
-rw-r--r--src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h
index 659b261e0..501f21d4e 100644
--- a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h
+++ b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h
@@ -41,7 +41,7 @@
#ifndef DRMEGLSERVERBUFFERINTEGRATION_H
#define DRMEGLSERVERBUFFERINTEGRATION_H
-#include <QtCompositor/qwaylandserverbufferintegration.h>
+#include <QtCompositor/private/qwlserverbufferintegration_p.h>
#include "qwayland-server-drm-egl-server-buffer.h"
@@ -74,10 +74,10 @@ QT_BEGIN_NAMESPACE
class DrmEglServerBufferIntegration;
-class DrmEglServerBuffer : public QWaylandServerBuffer, public QtWaylandServer::qt_server_buffer
+class DrmEglServerBuffer : public QtWayland::ServerBuffer, public QtWaylandServer::qt_server_buffer
{
public:
- DrmEglServerBuffer(DrmEglServerBufferIntegration *integration, const QSize &size, QWaylandServerBuffer::Format format);
+ DrmEglServerBuffer(DrmEglServerBufferIntegration *integration, const QSize &size, QtWayland::ServerBuffer::Format format);
struct ::wl_resource *resourceForClient(struct ::wl_client *) Q_DECL_OVERRIDE;
void bindTextureToBuffer() Q_DECL_OVERRIDE;
@@ -93,7 +93,7 @@ private:
};
class DrmEglServerBufferIntegration :
- public QWaylandServerBufferIntegration,
+ public QtWayland::ServerBufferIntegration,
public QtWaylandServer::qt_drm_egl_server_buffer
{
public:
@@ -102,8 +102,8 @@ public:
void initializeHardware(QWaylandCompositor *);
- bool supportsFormat(QWaylandServerBuffer::Format format) const Q_DECL_OVERRIDE;
- QWaylandServerBuffer *createServerBuffer(const QSize &size, QWaylandServerBuffer::Format format) Q_DECL_OVERRIDE;
+ bool supportsFormat(QtWayland::ServerBuffer::Format format) const Q_DECL_OVERRIDE;
+ QtWayland::ServerBuffer *createServerBuffer(const QSize &size, QtWayland::ServerBuffer::Format format) Q_DECL_OVERRIDE;
EGLDisplay display() const { return m_egl_display; }