Making the buffer intgrations private

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

5 files changed, 26 insertions, 26 deletions

diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp b/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp
index bfdfa6432..53a3f3c3e 100644
--- a/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp
+++ b/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp
@@ -39,18 +39,18 @@
 **
 ****************************************************************************/
 
-#include <QtCompositor/qwaylandclientbufferintegrationplugin.h>
+#include <QtCompositor/private/qwlclientbufferintegrationplugin_p.h>
 #include "brcmeglintegration.h"
 
 QT_BEGIN_NAMESPACE
 
-class QWaylandBrcmClientBufferIntegration : public QWaylandClientBufferIntegrationPlugin
+class QWaylandBrcmClientBufferIntegration : public QtWayland::ClientBufferIntegrationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandClientBufferIntegrationFactoryInterface.5.3" FILE "brcm-egl.json")
+    Q_PLUGIN_METADATA(IID QtWaylandClientBufferIntegrationFactoryInterface_iid FILE "brcm-egl.json")
 public:
     QStringList keys() const;
-    QWaylandClientBufferIntegration *create(const QString&, const QStringList&);
+    QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&);
 };
 
 QStringList QWaylandBrcmClientBufferIntegration::keys() const
@@ -60,7 +60,7 @@ QStringList QWaylandBrcmClientBufferIntegration::keys() const
     return list;
 }
 
-QWaylandClientBufferIntegration *QWaylandBrcmClientBufferIntegration::create(const QString& system, const QStringList& paramList)
+QtWayland::ClientBufferIntegration *QWaylandBrcmClientBufferIntegration::create(const QString& system, const QStringList& paramList)
 {
     Q_UNUSED(paramList);
     if (system.toLower() == "wayland-brcm")
diff --git a/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp b/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp
index 17079cec7..4bfc1b483 100644
--- a/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp
+++ b/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp
@@ -39,18 +39,18 @@
 **
 ****************************************************************************/
 
-#include <QtCompositor/qwaylandserverbufferintegrationplugin.h>
+#include <QtCompositor/private/qwlserverbufferintegrationplugin_p.h>
 #include "drmeglserverbufferintegration.h"
 
 QT_BEGIN_NAMESPACE
 
-class DrmEglServerBufferIntegrationPlugin : public QWaylandServerBufferIntegrationPlugin
+class DrmEglServerBufferIntegrationPlugin : public QtWayland::ServerBufferIntegrationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandServerBufferIntegrationFactoryInterface.5.3" FILE "drm-egl-server.json")
+    Q_PLUGIN_METADATA(IID QtWaylandServerBufferIntegrationFactoryInterface_iid FILE "drm-egl-server.json")
 public:
     QStringList keys() const;
-    QWaylandServerBufferIntegration *create(const QString&, const QStringList&);
+    QtWayland::ServerBufferIntegration *create(const QString&, const QStringList&);
 };
 
 QStringList DrmEglServerBufferIntegrationPlugin::keys() const
@@ -60,7 +60,7 @@ QStringList DrmEglServerBufferIntegrationPlugin::keys() const
     return list;
 }
 
-QWaylandServerBufferIntegration *DrmEglServerBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList)
+QtWayland::ServerBufferIntegration *DrmEglServerBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList)
 {
     Q_UNUSED(paramList);
     if (system.toLower() == "drm-egl-server")
diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp b/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp
index 8a2225894..274dff1e6 100644
--- a/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp
+++ b/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp
@@ -39,19 +39,19 @@
 **
 ****************************************************************************/
 
-#include <QtCompositor/qwaylandclientbufferintegrationfactory.h>
-#include <QtCompositor/qwaylandclientbufferintegrationplugin.h>
+#include <QtCompositor/private/qwlclientbufferintegrationfactory_p.h>
+#include <QtCompositor/private/qwlclientbufferintegrationplugin_p.h>
 #include "waylandeglclientbufferintegration.h"
 
 QT_BEGIN_NAMESPACE
 
-class QWaylandIntegrationPlugin : public QWaylandClientBufferIntegrationPlugin
+class QWaylandIntegrationPlugin : public QtWayland::ClientBufferIntegrationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandClientBufferIntegrationFactoryInterface.5.3" FILE "wayland-egl.json")
+    Q_PLUGIN_METADATA(IID QtWaylandClientBufferIntegrationFactoryInterface_iid FILE "wayland-egl.json")
 public:
     QStringList keys() const;
-    QWaylandClientBufferIntegration *create(const QString&, const QStringList&);
+    QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&);
 };
 
 QStringList QWaylandIntegrationPlugin::keys() const
@@ -61,7 +61,7 @@ QStringList QWaylandIntegrationPlugin::keys() const
     return list;
 }
 
-QWaylandClientBufferIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList)
+QtWayland::ClientBufferIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList)
 {
     Q_UNUSED(paramList);
     if (system.toLower() == "wayland-egl")
diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp b/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp
index 8dd43e915..4ae206fa2 100644
--- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp
+++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp
@@ -39,18 +39,18 @@
 **
 ****************************************************************************/
 
-#include <QtCompositor/qwaylandclientbufferintegrationplugin.h>
+#include <QtCompositor/private/qwlclientbufferintegrationplugin_p.h>
 #include "xcompositeeglintegration.h"
 
 QT_BEGIN_NAMESPACE
 
-class QWaylandXCompositeClientBufferIntegration : public QWaylandClientBufferIntegrationPlugin
+class QWaylandXCompositeClientBufferIntegration : public QtWayland::ClientBufferIntegrationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandClientBufferIntegrationFactoryInterface.5.3" FILE "xcomposite-egl.json")
+    Q_PLUGIN_METADATA(IID QtWaylandClientBufferIntegrationFactoryInterface_iid FILE "xcomposite-egl.json")
 public:
     QStringList keys() const;
-    QWaylandClientBufferIntegration *create(const QString&, const QStringList&);
+    QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&);
 };
 
 QStringList QWaylandXCompositeClientBufferIntegration::keys() const
@@ -60,7 +60,7 @@ QStringList QWaylandXCompositeClientBufferIntegration::keys() const
     return list;
 }
 
-QWaylandClientBufferIntegration *QWaylandXCompositeClientBufferIntegration::create(const QString& system, const QStringList& paramList)
+QtWayland::ClientBufferIntegration *QWaylandXCompositeClientBufferIntegration::create(const QString& system, const QStringList& paramList)
 {
     Q_UNUSED(paramList);
     if (system.toLower() == "wayland-xcomposite")
diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp b/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp
index b7673893e..4dcd9136f 100644
--- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp
+++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp
@@ -39,18 +39,18 @@
 **
 ****************************************************************************/
 
-#include <QtCompositor/qwaylandclientbufferintegrationplugin.h>
+#include <QtCompositor/private/qwlclientbufferintegrationplugin_p.h>
 #include "xcompositeglxintegration.h"
 
 QT_BEGIN_NAMESPACE
 
-class QWaylandXCompositeClientBufferIntegration : public QWaylandClientBufferIntegrationPlugin
+class QWaylandXCompositeClientBufferIntegration : public QtWayland::ClientBufferIntegrationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandClientBufferIntegrationFactoryInterface.5.3" FILE "xcomposite-glx.json")
+    Q_PLUGIN_METADATA(IID QtWaylandClientBufferIntegrationFactoryInterface_iid FILE "xcomposite-glx.json")
 public:
     QStringList keys() const;
-    QWaylandClientBufferIntegration *create(const QString&, const QStringList&);
+    QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&);
 };
 
 QStringList QWaylandXCompositeClientBufferIntegration::keys() const
@@ -60,7 +60,7 @@ QStringList QWaylandXCompositeClientBufferIntegration::keys() const
     return list;
 }
 
-QWaylandClientBufferIntegration *QWaylandXCompositeClientBufferIntegration::create(const QString& system, const QStringList& paramList)
+QtWayland::ClientBufferIntegration *QWaylandXCompositeClientBufferIntegration::create(const QString& system, const QStringList& paramList)
 {
     Q_UNUSED(paramList);
     if (system.toLower() == "wayland-xcomposite-glx")