Namespace the platform plugins

There currently is a QWaylandInputDevice class both in the wayland QPA
plugin and in the QtCompositor API. This causes the qwindow-compositor
example to crash when running nested in a wayland session due to a
mismatch between the two classes.
By namespacing all the plugin code we make sure that name clashes
will not happen anymore.

Change-Id: I17497cff697599200bea68bf01dfde474526390f
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>

3 files changed, 8 insertions, 8 deletions

diff --git a/examples/wayland/server-buffer/client/main.cpp b/examples/wayland/server-buffer/client/main.cpp
index 54c586ce6..c15a091c0 100644
--- a/examples/wayland/server-buffer/client/main.cpp
+++ b/examples/wayland/server-buffer/client/main.cpp
@@ -83,7 +83,7 @@ public:
             return;
         }
 
-        QWaylandIntegration *wayland_integration = static_cast<QWaylandIntegration *>(QGuiApplicationPrivate::platformIntegration());
+        QtWaylandClient::QWaylandIntegration *wayland_integration = static_cast<QtWaylandClient::QWaylandIntegration *>(QGuiApplicationPrivate::platformIntegration());
 
         m_server_buffer_integration = wayland_integration->serverBufferIntegration();
         if (!m_server_buffer_integration) {
@@ -93,7 +93,7 @@ public:
         }
 
 
-        QWaylandDisplay *wayland_display = wayland_integration->display();
+        QtWaylandClient::QWaylandDisplay *wayland_display = wayland_integration->display();
         struct ::wl_registry *registry = wl_display_get_registry(wayland_display->wl_display());
         wl_proxy_set_queue(reinterpret_cast<struct wl_proxy *>(registry), wayland_display->wl_event_queue());
         QtWayland::wl_registry::init(registry);
@@ -155,7 +155,7 @@ protected:
 
     void share_buffer_cross_buffer(struct ::qt_server_buffer *buffer) Q_DECL_OVERRIDE
     {
-        QWaylandServerBuffer *serverBuffer = m_server_buffer_integration->serverBuffer(buffer);
+        QtWaylandClient::QWaylandServerBuffer *serverBuffer = m_server_buffer_integration->serverBuffer(buffer);
         if (m_server_buffer_list.isEmpty()) {
             setWidth(serverBuffer->size().width());
             setHeight(serverBuffer->size().height());
@@ -168,8 +168,8 @@ protected:
     }
 
 private:
-    QWaylandServerBufferIntegration *m_server_buffer_integration;
-    QList<QWaylandServerBuffer *>m_server_buffer_list;
+    QtWaylandClient::QWaylandServerBufferIntegration *m_server_buffer_integration;
+    QList<QtWaylandClient::QWaylandServerBuffer *>m_server_buffer_list;
     GLuint m_server_buffer_texture;
     QOpenGLContext *m_context;
     QOpenGLVertexArrayObject *m_vao;
diff --git a/examples/wayland/server-buffer/client/serverbufferrenderer.cpp b/examples/wayland/server-buffer/client/serverbufferrenderer.cpp
index 2f0d204d3..732f746a2 100644
--- a/examples/wayland/server-buffer/client/serverbufferrenderer.cpp
+++ b/examples/wayland/server-buffer/client/serverbufferrenderer.cpp
@@ -74,7 +74,7 @@ static const char fragment_shader[] =
     "   gl_FragColor = texture2D(textureSampler, uv);"
     "}";
 
-ServerBufferRenderer::ServerBufferRenderer(QWaylandServerBuffer *serverBuffer)
+ServerBufferRenderer::ServerBufferRenderer(QtWaylandClient::QWaylandServerBuffer *serverBuffer)
     : QOpenGLFunctions(QOpenGLContext::currentContext())
     , m_server_buffer(serverBuffer)
     , m_texture(0)
diff --git a/examples/wayland/server-buffer/client/serverbufferrenderer.h b/examples/wayland/server-buffer/client/serverbufferrenderer.h
index 7e8999b1c..4fd5e06fa 100644
--- a/examples/wayland/server-buffer/client/serverbufferrenderer.h
+++ b/examples/wayland/server-buffer/client/serverbufferrenderer.h
@@ -52,11 +52,11 @@ class QOpenGLShaderProgram;
 class ServerBufferRenderer : public QOpenGLFunctions
 {
 public:
-    ServerBufferRenderer(QWaylandServerBuffer *serverBuffer);
+    ServerBufferRenderer(QtWaylandClient::QWaylandServerBuffer *serverBuffer);
 
     void render(const QMatrix4x4 &transform);
 private:
-    QWaylandServerBuffer *m_server_buffer;
+    QtWaylandClient::QWaylandServerBuffer *m_server_buffer;
     GLuint m_texture;
 
     QOpenGLVertexArrayObject *m_vao;