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>

9 files changed, 40 insertions, 0 deletions

diff --git a/src/plugins/platforms/qwayland-brcm-egl/main.cpp b/src/plugins/platforms/qwayland-brcm-egl/main.cpp
index 73b2d3b64..3c6fdc5fa 100644
--- a/src/plugins/platforms/qwayland-brcm-egl/main.cpp
+++ b/src/plugins/platforms/qwayland-brcm-egl/main.cpp
@@ -44,6 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
@@ -59,6 +61,8 @@ QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, c
     return new QWaylandBrcmEglPlatformIntegration();
 }
 
+}
+
 QT_END_NAMESPACE
 
 #include "main.moc"
diff --git a/src/plugins/platforms/qwayland-brcm-egl/qwaylandbrcmeglplatformintegration.h b/src/plugins/platforms/qwayland-brcm-egl/qwaylandbrcmeglplatformintegration.h
index 8260a2671..3ef9f2e07 100644
--- a/src/plugins/platforms/qwayland-brcm-egl/qwaylandbrcmeglplatformintegration.h
+++ b/src/plugins/platforms/qwayland-brcm-egl/qwaylandbrcmeglplatformintegration.h
@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandBrcmEglPlatformIntegration : public QWaylandIntegration
 {
 public:
@@ -65,6 +67,8 @@ private:
     QWaylandClientBufferIntegration *m_gl_integration;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/plugins/platforms/qwayland-egl/main.cpp b/src/plugins/platforms/qwayland-egl/main.cpp
index 010a23e25..41de23053 100644
--- a/src/plugins/platforms/qwayland-egl/main.cpp
+++ b/src/plugins/platforms/qwayland-egl/main.cpp
@@ -44,6 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
@@ -59,6 +61,8 @@ QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, c
     return new QWaylandEglPlatformIntegration();
 }
 
+}
+
 QT_END_NAMESPACE
 
 #include "main.moc"
diff --git a/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h b/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h
index 5f23f68de..153f3ef9a 100644
--- a/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h
+++ b/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h
@@ -48,6 +48,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandEglPlatformIntegration : public QWaylandIntegration
 {
 public:
@@ -65,6 +67,8 @@ private:
     QWaylandEglClientBufferIntegration *m_client_buffer_integration;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/plugins/platforms/qwayland-generic/main.cpp b/src/plugins/platforms/qwayland-generic/main.cpp
index e1761d8e8..1f9cb4a63 100644
--- a/src/plugins/platforms/qwayland-generic/main.cpp
+++ b/src/plugins/platforms/qwayland-generic/main.cpp
@@ -44,6 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
@@ -59,6 +61,8 @@ QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, c
     return new QWaylandIntegration();
 }
 
+}
+
 QT_END_NAMESPACE
 
 #include "main.moc"
diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp b/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp
index d3f5a0b54..e2cc53307 100644
--- a/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp
+++ b/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp
@@ -44,6 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
@@ -59,6 +61,8 @@ QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, c
     return new QWaylandXCompositeEglPlatformIntegration();
 }
 
+}
+
 QT_END_NAMESPACE
 
 #include "main.moc"
diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h
index 340ab03c3..2c017064b 100644
--- a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h
+++ b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h
@@ -48,6 +48,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandXCompositeEglPlatformIntegration : public QWaylandIntegration
 {
 public:
@@ -65,6 +67,8 @@ private:
     QWaylandClientBufferIntegration *m_client_buffer_integration;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
index fb2b1414e..9c6bc08c4 100644
--- a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
+++ b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
@@ -46,6 +46,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
@@ -61,6 +63,8 @@ QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, c
     return new QWaylandXCompositeGlxPlatformIntegration();
 }
 
+}
+
 QT_END_NAMESPACE
 
 #include "main.moc"
diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h
index a7308f643..7825e2cfe 100644
--- a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h
+++ b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h
@@ -47,6 +47,10 @@
 
 #include "qwaylandxcompositeglxintegration.h"
 
+QT_BEGIN_NAMESPACE
+
+namespace QtWaylandClient {
+
 class QWaylandXCompositeGlxPlatformIntegration : public QWaylandIntegration
 {
 public:
@@ -64,4 +68,8 @@ private:
     QWaylandClientBufferIntegration *m_client_buffer_integration;
 };
 
+}
+
+QT_END_NAMESPACE
+
 #endif