Making the buffer intgrations private

Change-Id: Ifb6e2456c781e80f84e27e68c3e279ea993f9307
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

10 files changed, 25 insertions, 25 deletions

diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp
index a0be625dd..66533fecb 100644
--- a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp
+++ b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp
@@ -76,7 +76,7 @@ public:
 };
 
 BrcmEglIntegration::BrcmEglIntegration()
-    : QWaylandClientBufferIntegration()
+    : QtWayland::ClientBufferIntegration()
     , QtWaylandServer::qt_brcm()
     , d_ptr(new BrcmEglIntegrationPrivate)
 {
diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h
index 25c5ab71e..dca3fb667 100644
--- a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h
+++ b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h
@@ -41,7 +41,7 @@
 #ifndef BRCMEGLINTEGRATION_H
 #define BRCMEGLINTEGRATION_H
 
-#include <QtCompositor/qwaylandclientbufferintegration.h>
+#include <QtCompositor/private/qwlclientbufferintegration_p.h>
 #include "qwayland-server-brcm.h"
 
 #include <QtCore/QScopedPointer>
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 
 class BrcmEglIntegrationPrivate;
 
-class BrcmEglIntegration : public QWaylandClientBufferIntegration, public QtWaylandServer::qt_brcm
+class BrcmEglIntegration : public QtWayland::ClientBufferIntegration, public QtWaylandServer::qt_brcm
 {
     Q_DECLARE_PRIVATE(BrcmEglIntegration)
 public:
diff --git a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp
index 9c7440dc6..09588f6ff 100644
--- a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp
+++ b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp
@@ -44,8 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
-DrmEglServerBuffer::DrmEglServerBuffer(DrmEglServerBufferIntegration *integration, const QSize &size, QWaylandServerBuffer::Format format)
-    : QWaylandServerBuffer(size,format)
+DrmEglServerBuffer::DrmEglServerBuffer(DrmEglServerBufferIntegration *integration, const QSize &size, QtWayland::ServerBuffer::Format format)
+    : QtWayland::ServerBuffer(size,format)
     , m_integration(integration)
 {
     m_format = format;
@@ -169,12 +169,12 @@ void DrmEglServerBufferIntegration::initializeHardware(QWaylandCompositor *compo
     QtWaylandServer::qt_drm_egl_server_buffer::init(compositor->waylandDisplay());
 }
 
-bool DrmEglServerBufferIntegration::supportsFormat(QWaylandServerBuffer::Format format) const
+bool DrmEglServerBufferIntegration::supportsFormat(QtWayland::ServerBuffer::Format format) const
 {
     switch (format) {
-        case QWaylandServerBuffer::RGBA32:
+        case QtWayland::ServerBuffer::RGBA32:
             return true;
-        case QWaylandServerBuffer::A8:
+        case QtWayland::ServerBuffer::A8:
 #ifdef EGL_DRM_BUFFER_FORMAT_A8_MESA
             return true;
 #else
@@ -185,7 +185,7 @@ bool DrmEglServerBufferIntegration::supportsFormat(QWaylandServerBuffer::Format
     }
 }
 
-QWaylandServerBuffer *DrmEglServerBufferIntegration::createServerBuffer(const QSize &size, QWaylandServerBuffer::Format format)
+QtWayland::ServerBuffer *DrmEglServerBufferIntegration::createServerBuffer(const QSize &size, QtWayland::ServerBuffer::Format format)
 {
     return new DrmEglServerBuffer(this, size, format);
 }
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; }
 
diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
index ede8a9abf..caff5df12 100644
--- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
+++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
@@ -102,7 +102,7 @@ public:
 };
 
 WaylandEglClientBufferIntegration::WaylandEglClientBufferIntegration()
-    : QWaylandClientBufferIntegration()
+    : QtWayland::ClientBufferIntegration()
     , d_ptr(new WaylandEglClientBufferIntegrationPrivate)
 {
 }
@@ -208,7 +208,7 @@ bool WaylandEglClientBufferIntegration::isYInverted(struct ::wl_resource *buffer
         return true;
 #endif
 
-    return QWaylandClientBufferIntegration::isYInverted(buffer);
+    return QtWayland::ClientBufferIntegration::isYInverted(buffer);
 }
 
 
diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h
index 94d31fc80..322911892 100644
--- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h
+++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h
@@ -41,14 +41,14 @@
 #ifndef WAYLANDEGLINTEGRATION_H
 #define WAYLANDEGLINTEGRATION_H
 
-#include <QtCompositor/qwaylandclientbufferintegration.h>
+#include <QtCompositor/private/qwlclientbufferintegration_p.h>
 #include <QtCore/QScopedPointer>
 
 QT_BEGIN_NAMESPACE
 
 class WaylandEglClientBufferIntegrationPrivate;
 
-class WaylandEglClientBufferIntegration : public QWaylandClientBufferIntegration
+class WaylandEglClientBufferIntegration : public QtWayland::ClientBufferIntegration
 {
     Q_DECLARE_PRIVATE(WaylandEglClientBufferIntegration)
 public:
diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp
index c645b997f..2401d6710 100644
--- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp
+++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp
@@ -68,7 +68,7 @@ QVector<EGLint> eglbuildSpec()
 }
 
 XCompositeEglClientBufferIntegration::XCompositeEglClientBufferIntegration()
-    : QWaylandClientBufferIntegration()
+    : QtWayland::ClientBufferIntegration()
     , mDisplay(0)
 {
 
diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h
index 5497daed4..cf5acdd34 100644
--- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h
+++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h
@@ -41,7 +41,7 @@
 #ifndef XCOMPOSITEEGLINTEGRATION_H
 #define XCOMPOSITEEGLINTEGRATION_H
 
-#include <QtCompositor/qwaylandclientbufferintegration.h>
+#include <QtCompositor/private/qwlclientbufferintegration_p.h>
 
 #include "xlibinclude.h"
 
@@ -49,7 +49,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class XCompositeEglClientBufferIntegration : public QWaylandClientBufferIntegration
+class XCompositeEglClientBufferIntegration : public QtWayland::ClientBufferIntegration
 {
 public:
     XCompositeEglClientBufferIntegration();
diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp
index a58827cee..dce1fdc31 100644
--- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp
+++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp
@@ -72,7 +72,7 @@ QVector<int> qglx_buildSpec()
 
 
 XCompositeGLXClientBufferIntegration::XCompositeGLXClientBufferIntegration()
-    : QWaylandClientBufferIntegration()
+    : QtWayland::ClientBufferIntegration()
     , mDisplay(0)
     , mHandler(0)
 {
diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h
index 5a724eedf..6d28a3de4 100644
--- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h
+++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h
@@ -41,7 +41,7 @@
 #ifndef XCOMPOSITEGLXINTEGRATION_H
 #define XCOMPOSITEGLXINTEGRATION_H
 
-#include <QtCompositor/qwaylandclientbufferintegration.h>
+#include <QtCompositor/private/qwlclientbufferintegration_p.h>
 
 #include "xlibinclude.h"
 
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 
 class XCompositeHandler;
 
-class XCompositeGLXClientBufferIntegration : public QWaylandClientBufferIntegration
+class XCompositeGLXClientBufferIntegration : public QtWayland::ClientBufferIntegration
 {
 public:
     XCompositeGLXClientBufferIntegration();