Compositor: rename QWaylandGraphicsHardwareIntegration

to QWaylandClientBufferIntegration. I have checked this with
xcomposite-egl and wayland-egl, abd have tried to do a simple search and
replace for brcm-egl and xcomposite-glx, but there will likely be some
small fixup needed

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

9 files changed, 53 insertions, 53 deletions

diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp
index 0ef8318fb..e5975abc3 100644
--- a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp
+++ b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp
@@ -76,7 +76,7 @@ public:
 };
 
 BrcmEglIntegration::BrcmEglIntegration()
-    : QWaylandGraphicsHardwareIntegration()
+    : QWaylandClientBufferIntegration()
     , 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 229905612..7d94e315b 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/qwaylandgraphicshardwareintegration.h>
+#include <QtCompositor/qwaylandclientbufferintegration.h>
 #include "qwayland-server-brcm.h"
 
 #include <QtCore/QScopedPointer>
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 
 class BrcmEglIntegrationPrivate;
 
-class BrcmEglIntegration : public QWaylandGraphicsHardwareIntegration, public QtWaylandServer::qt_brcm
+class BrcmEglIntegration : public QWaylandClientBufferIntegration, public QtWaylandServer::qt_brcm
 {
     Q_DECLARE_PRIVATE(BrcmEglIntegration)
 public:
diff --git a/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri b/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri
index 27c219ac6..2d4771a2a 100644
--- a/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri
+++ b/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri
@@ -8,7 +8,7 @@ INCLUDEPATH += $$PWD
 }
 
 SOURCES += \
-    $$PWD/waylandeglintegration.cpp
+    $$PWD/waylandeglclientbufferintegration.cpp
 
 HEADERS += \
-    $$PWD/waylandeglintegration.h
+    $$PWD/waylandeglclientbufferintegration.h
diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglintegration.cpp b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
index e01de7984..ffefdc86d 100644
--- a/src/hardwareintegration/compositor/wayland-egl/waylandeglintegration.cpp
+++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include "waylandeglintegration.h"
+#include "waylandeglclientbufferintegration.h"
 
 #include <QtCompositor/private/qwlcompositor_p.h>
 #include <QtCompositor/private/qwlsurface_p.h>
@@ -72,10 +72,10 @@ typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenu
 
 QT_BEGIN_NAMESPACE
 
-class WaylandEglIntegrationPrivate
+class WaylandEglClientBufferIntegrationPrivate
 {
 public:
-    WaylandEglIntegrationPrivate()
+    WaylandEglClientBufferIntegrationPrivate()
         : egl_display(EGL_NO_DISPLAY)
         , valid(false)
         , display_bound(false)
@@ -101,15 +101,15 @@ public:
     PFNGLEGLIMAGETARGETTEXTURE2DOESPROC gl_egl_image_target_texture_2d;
 };
 
-WaylandEglIntegration::WaylandEglIntegration()
-    : QWaylandGraphicsHardwareIntegration()
-    , d_ptr(new WaylandEglIntegrationPrivate)
+WaylandEglClientBufferIntegration::WaylandEglClientBufferIntegration()
+    : QWaylandClientBufferIntegration()
+    , d_ptr(new WaylandEglClientBufferIntegrationPrivate)
 {
 }
 
-void WaylandEglIntegration::initializeHardware(QtWayland::Display *waylandDisplay)
+void WaylandEglClientBufferIntegration::initializeHardware(QtWayland::Display *waylandDisplay)
 {
-    Q_D(WaylandEglIntegration);
+    Q_D(WaylandEglClientBufferIntegration);
 
     const bool ignoreBindDisplay = !qgetenv("QT_WAYLAND_IGNORE_BIND_DISPLAY").isEmpty();
 
@@ -170,9 +170,9 @@ void WaylandEglIntegration::initializeHardware(QtWayland::Display *waylandDispla
     qWarning("EGL Wayland extension successfully initialized.%s\n", !d->display_bound ? " eglBindWaylandDisplayWL ignored" : "");
 }
 
-GLuint WaylandEglIntegration::createTextureFromBuffer(struct ::wl_resource *buffer, QOpenGLContext *)
+GLuint WaylandEglClientBufferIntegration::createTextureFromBuffer(struct ::wl_resource *buffer, QOpenGLContext *)
 {
-    Q_D(WaylandEglIntegration);
+    Q_D(WaylandEglClientBufferIntegration);
     if (!d->valid) {
         qWarning("createTextureFromBuffer() failed\n");
         return 0;
@@ -199,9 +199,9 @@ GLuint WaylandEglIntegration::createTextureFromBuffer(struct ::wl_resource *buff
     return textureId;
 }
 
-bool WaylandEglIntegration::isYInverted(struct ::wl_resource *buffer) const
+bool WaylandEglClientBufferIntegration::isYInverted(struct ::wl_resource *buffer) const
 {
-    Q_D(const WaylandEglIntegration);
+    Q_D(const WaylandEglClientBufferIntegration);
 
 #if defined(EGL_WAYLAND_Y_INVERTED_WL)
     EGLint isYInverted;
@@ -215,13 +215,13 @@ bool WaylandEglIntegration::isYInverted(struct ::wl_resource *buffer) const
         return true;
 #endif
 
-    return QWaylandGraphicsHardwareIntegration::isYInverted(buffer);
+    return QWaylandClientBufferIntegration::isYInverted(buffer);
 }
 
 
-bool WaylandEglIntegration::setDirectRenderSurface(QWaylandSurface *surface)
+bool WaylandEglClientBufferIntegration::setDirectRenderSurface(QWaylandSurface *surface)
 {
-    Q_D(WaylandEglIntegration);
+    Q_D(WaylandEglClientBufferIntegration);
 
     QPlatformScreen *screen = QPlatformScreen::platformScreenForWindow(m_compositor->window());
     QPlatformScreenPageFlipper *flipper = screen ? screen->pageFlipper() : 0;
@@ -233,9 +233,9 @@ bool WaylandEglIntegration::setDirectRenderSurface(QWaylandSurface *surface)
     return flipper;
 }
 
-void *WaylandEglIntegration::lockNativeBuffer(struct ::wl_resource *buffer, QOpenGLContext *) const
+void *WaylandEglClientBufferIntegration::lockNativeBuffer(struct ::wl_resource *buffer, QOpenGLContext *) const
 {
-    Q_D(const WaylandEglIntegration);
+    Q_D(const WaylandEglClientBufferIntegration);
 
     EGLImageKHR image = d->egl_create_image(d->egl_display, EGL_NO_CONTEXT,
                                           EGL_WAYLAND_BUFFER_WL,
@@ -243,17 +243,17 @@ void *WaylandEglIntegration::lockNativeBuffer(struct ::wl_resource *buffer, QOpe
     return image;
 }
 
-void WaylandEglIntegration::unlockNativeBuffer(void *native_buffer, QOpenGLContext *) const
+void WaylandEglClientBufferIntegration::unlockNativeBuffer(void *native_buffer, QOpenGLContext *) const
 {
-    Q_D(const WaylandEglIntegration);
+    Q_D(const WaylandEglClientBufferIntegration);
     EGLImageKHR image = static_cast<EGLImageKHR>(native_buffer);
 
     d->egl_destroy_image(d->egl_display, image);
 }
 
-QSize WaylandEglIntegration::bufferSize(struct ::wl_resource *buffer) const
+QSize WaylandEglClientBufferIntegration::bufferSize(struct ::wl_resource *buffer) const
 {
-    Q_D(const WaylandEglIntegration);
+    Q_D(const WaylandEglClientBufferIntegration);
 
     int width, height;
     d->egl_query_wayland_buffer(d->egl_display, reinterpret_cast<struct ::wl_buffer *>(buffer), EGL_WIDTH, &width);
diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglintegration.h b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h
index ce3284291..2f93e9052 100644
--- a/src/hardwareintegration/compositor/wayland-egl/waylandeglintegration.h
+++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h
@@ -41,18 +41,18 @@
 #ifndef WAYLANDEGLINTEGRATION_H
 #define WAYLANDEGLINTEGRATION_H
 
-#include <QtCompositor/qwaylandgraphicshardwareintegration.h>
+#include <QtCompositor/qwaylandclientbufferintegration.h>
 #include <QtCore/QScopedPointer>
 
 QT_BEGIN_NAMESPACE
 
-class WaylandEglIntegrationPrivate;
+class WaylandEglClientBufferIntegrationPrivate;
 
-class WaylandEglIntegration : public QWaylandGraphicsHardwareIntegration
+class WaylandEglClientBufferIntegration : public QWaylandClientBufferIntegration
 {
-    Q_DECLARE_PRIVATE(WaylandEglIntegration)
+    Q_DECLARE_PRIVATE(WaylandEglClientBufferIntegration)
 public:
-    WaylandEglIntegration();
+    WaylandEglClientBufferIntegration();
 
     void initializeHardware(QtWayland::Display *waylandDisplay) Q_DECL_OVERRIDE;
 
@@ -67,8 +67,8 @@ public:
     QSize bufferSize(struct ::wl_resource *buffer) const Q_DECL_OVERRIDE;
 
 private:
-    Q_DISABLE_COPY(WaylandEglIntegration)
-    QScopedPointer<WaylandEglIntegrationPrivate> d_ptr;
+    Q_DISABLE_COPY(WaylandEglClientBufferIntegration)
+    QScopedPointer<WaylandEglClientBufferIntegrationPrivate> d_ptr;
 };
 
 QT_END_NAMESPACE
diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp
index b80858b2c..55b0cc15e 100644
--- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp
+++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp
@@ -67,14 +67,14 @@ QVector<EGLint> eglbuildSpec()
     return spec;
 }
 
-XCompositeEglIntegration::XCompositeEglIntegration()
-    : QWaylandGraphicsHardwareIntegration()
+XCompositeEglClientBufferIntegration::XCompositeEglClientBufferIntegration()
+    : QWaylandClientBufferIntegration()
     , mDisplay(0)
 {
 
 }
 
-void XCompositeEglIntegration::initializeHardware(QtWayland::Display *)
+void XCompositeEglClientBufferIntegration::initializeHardware(QtWayland::Display *)
 {
     QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface();
     if (nativeInterface) {
@@ -91,7 +91,7 @@ void XCompositeEglIntegration::initializeHardware(QtWayland::Display *)
     new XCompositeHandler(m_compositor->handle(), mDisplay);
 }
 
-GLuint XCompositeEglIntegration::createTextureFromBuffer(struct ::wl_resource *buffer, QOpenGLContext *)
+GLuint XCompositeEglClientBufferIntegration::createTextureFromBuffer(struct ::wl_resource *buffer, QOpenGLContext *)
 {
     XCompositeBuffer *compositorBuffer = XCompositeBuffer::fromResource(buffer);
     Pixmap pixmap = XCompositeNameWindowPixmap(mDisplay, compositorBuffer->window());
@@ -134,13 +134,13 @@ GLuint XCompositeEglIntegration::createTextureFromBuffer(struct ::wl_resource *b
     return textureId;
 }
 
-bool XCompositeEglIntegration::isYInverted(struct ::wl_resource *buffer) const
+bool XCompositeEglClientBufferIntegration::isYInverted(struct ::wl_resource *buffer) const
 {
     XCompositeBuffer *compositorBuffer = XCompositeBuffer::fromResource(buffer);
     return compositorBuffer->isYInverted();
 }
 
-QSize XCompositeEglIntegration::bufferSize(struct ::wl_resource *buffer) const
+QSize XCompositeEglClientBufferIntegration::bufferSize(struct ::wl_resource *buffer) const
 {
     XCompositeBuffer *compositorBuffer = XCompositeBuffer::fromResource(buffer);
 
diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h
index 562fce140..65a574d1e 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/qwaylandgraphicshardwareintegration.h>
+#include <QtCompositor/qwaylandclientbufferintegration.h>
 
 #include "xlibinclude.h"
 
@@ -49,10 +49,10 @@
 
 QT_BEGIN_NAMESPACE
 
-class XCompositeEglIntegration : public QWaylandGraphicsHardwareIntegration
+class XCompositeEglClientBufferIntegration : public QWaylandClientBufferIntegration
 {
 public:
-    XCompositeEglIntegration();
+    XCompositeEglClientBufferIntegration();
 
     void initializeHardware(QtWayland::Display *waylandDisplay) Q_DECL_OVERRIDE;
 
diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp
index 421e5df1a..1df6a4c99 100644
--- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp
+++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp
@@ -71,19 +71,19 @@ QVector<int> qglx_buildSpec()
 }
 
 
-XCompositeGLXIntegration::XCompositeGLXIntegration()
-    : QWaylandGraphicsHardwareIntegration()
+XCompositeGLXClientBufferIntegration::XCompositeGLXClientBufferIntegration()
+    : QWaylandClientBufferIntegration()
     , mDisplay(0)
     , mHandler(0)
 {
 }
 
-XCompositeGLXIntegration::~XCompositeGLXIntegration()
+XCompositeGLXClientBufferIntegration::~XCompositeGLXClientBufferIntegration()
 {
     delete mHandler;
 }
 
-void XCompositeGLXIntegration::initializeHardware(QtWayland::Display *)
+void XCompositeGLXClientBufferIntegration::initializeHardware(QtWayland::Display *)
 {
     QPlatformNativeInterface *nativeInterface = QGuiApplicationPrivate::platformIntegration()->nativeInterface();
     if (nativeInterface) {
@@ -112,7 +112,7 @@ void XCompositeGLXIntegration::initializeHardware(QtWayland::Display *)
     delete glContext;
 }
 
-GLuint XCompositeGLXIntegration::createTextureFromBuffer(struct ::wl_resource *buffer, QOpenGLContext *)
+GLuint XCompositeGLXClientBufferIntegration::createTextureFromBuffer(struct ::wl_resource *buffer, QOpenGLContext *)
 {
     XCompositeBuffer *compositorBuffer = XCompositeBuffer::fromResource(buffer);
     Pixmap pixmap = XCompositeNameWindowPixmap(mDisplay, compositorBuffer->window());
@@ -145,12 +145,12 @@ GLuint XCompositeGLXIntegration::createTextureFromBuffer(struct ::wl_resource *b
     return textureId;
 }
 
-bool XCompositeGLXIntegration::isYInverted(struct ::wl_resource *buffer) const
+bool XCompositeGLXClientBufferIntegration::isYInverted(struct ::wl_resource *buffer) const
 {
     return XCompositeBuffer::fromResource(buffer)->isYInverted();
 }
 
-QSize XCompositeGLXIntegration::bufferSize(struct ::wl_resource *buffer) const
+QSize XCompositeGLXClientBufferIntegration::bufferSize(struct ::wl_resource *buffer) const
 {
     XCompositeBuffer *compositorBuffer = XCompositeBuffer::fromResource(buffer);
 
diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h
index 11146ef23..be6b02028 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/qwaylandgraphicshardwareintegration.h>
+#include <QtCompositor/qwaylandclientbufferintegration.h>
 
 #include "xlibinclude.h"
 
@@ -53,11 +53,11 @@ QT_BEGIN_NAMESPACE
 
 class XCompositeHandler;
 
-class XCompositeGLXIntegration : public QWaylandGraphicsHardwareIntegration
+class XCompositeGLXClientBufferIntegration : public QWaylandClientBufferIntegration
 {
 public:
-    XCompositeGLXIntegration();
-    ~XCompositeGLXIntegration();
+    XCompositeGLXClientBufferIntegration();
+    ~XCompositeGLXClientBufferIntegration();
 
     void initializeHardware(QtWayland::Display *waylandDisplay) Q_DECL_OVERRIDE;