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>

src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration.cpp

@@ -43,6 +43,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandClientBufferIntegration::QWaylandClientBufferIntegration()
 {
 
@@ -53,4 +55,6 @@ QWaylandClientBufferIntegration::~QWaylandClientBufferIntegration()
 
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h

@@ -47,13 +47,15 @@
 
 QT_BEGIN_NAMESPACE
 
-class QWaylandWindow;
-class QWaylandDisplay;
 class QWindow;
-
 class QPlatformOpenGLContext;
 class QSurfaceFormat;
 
+namespace QtWaylandClient {
+
+class QWaylandWindow;
+class QWaylandDisplay;
+
 class Q_WAYLAND_CLIENT_EXPORT QWaylandClientBufferIntegration
 {
 public:
@@ -79,6 +81,8 @@ public:
     virtual void *nativeResourceForContext(NativeResource /*resource*/, QPlatformOpenGLContext */*context*/) { return Q_NULLPTR; }
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDCLIENTBUFFERINTEGRATION_H

src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory.cpp

@@ -48,6 +48,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 #ifndef QT_NO_LIBRARY
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
     (QWaylandClientBufferIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration-client"), Qt::CaseInsensitive))
@@ -93,4 +95,6 @@ QWaylandClientBufferIntegration *QWaylandClientBufferIntegrationFactory::create(
     return 0;
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h

@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandClientBufferIntegration;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandClientBufferIntegrationFactory
@@ -56,6 +58,8 @@ public:
     static QWaylandClientBufferIntegration *create(const QString &name, const QStringList &args, const QString &pluginPath = QString());
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDCLIENTBUFFERINTEGRATIONFACTORY_H

src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin.cpp

@@ -43,6 +43,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandClientBufferIntegrationPlugin::QWaylandClientBufferIntegrationPlugin(QObject *parent) :
     QObject(parent)
 {
@@ -52,4 +54,6 @@ QWaylandClientBufferIntegrationPlugin::~QWaylandClientBufferIntegrationPlugin()
 {
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h

@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandClientBufferIntegration;
 
 #define QWaylandClientBufferIntegrationFactoryInterface_iid "org.qt-project.Qt.WaylandClient.QWaylandClientBufferIntegrationFactoryInterface.5.3"
@@ -64,6 +66,8 @@ public:
     virtual QWaylandClientBufferIntegration *create(const QString &key, const QStringList &paramList) = 0;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDCLIENTBUFFERINTEGRATIONPLUGIN_H

src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration.cpp

@@ -44,6 +44,8 @@
 #include "qwaylanddisplay_p.h"
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandHardwareIntegration::QWaylandHardwareIntegration(struct ::wl_registry *registry, int id)
     : qt_hardware_integration(registry, id, 1)
 {
@@ -69,4 +71,6 @@ void QWaylandHardwareIntegration::hardware_integration_server_backend(const QStr
     m_server_buffer = name;
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration_p.h

@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandHardwareIntegration : public QtWayland::qt_hardware_integration
@@ -66,6 +68,8 @@ private:
     QString m_server_buffer;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif

src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration.cpp

@@ -43,6 +43,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandServerBuffer::QWaylandServerBuffer()
     : m_user_data(0)
 {
@@ -79,4 +81,6 @@ QWaylandServerBufferIntegration::~QWaylandServerBufferIntegration()
 {
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration_p.h

@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandServerBuffer
@@ -90,6 +92,8 @@ public:
     virtual QWaylandServerBuffer *serverBuffer(struct qt_server_buffer *buffer) = 0;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif

src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory.cpp

@@ -48,6 +48,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 #ifndef QT_NO_LIBRARY
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
     (QWaylandServerBufferIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration-client"), Qt::CaseInsensitive))
@@ -93,4 +95,6 @@ QWaylandServerBufferIntegration *QWaylandServerBufferIntegrationFactory::create(
     return 0;
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h

@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandServerBufferIntegration;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandServerBufferIntegrationFactory
@@ -56,6 +58,8 @@ public:
     static QWaylandServerBufferIntegration *create(const QString &name, const QStringList &args, const QString &pluginPath = QString());
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDSERVERBUFFERINTEGRATIONFACTORY_H

src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin.cpp

@@ -43,6 +43,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandServerBufferIntegrationPlugin::QWaylandServerBufferIntegrationPlugin(QObject *parent)
     : QObject(parent)
 {
@@ -51,4 +53,6 @@ QWaylandServerBufferIntegrationPlugin::~QWaylandServerBufferIntegrationPlugin()
 {
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h

@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandServerBufferIntegration;
 
 #define QWaylandServerBufferIntegrationFactoryInterface_iid "org.qt-project.Qt.WaylandClient.QWaylandServerBufferIntegrationFactoryInterface.5.3"
@@ -64,6 +66,8 @@ public:
     virtual QWaylandServerBufferIntegration *create(const QString &key, const QStringList &paramList) = 0;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDSERVERBUFFERINTEGRATIONPLUGIN_H

src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegration_p.h

@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 class QWaylandInputDevice;
 
@@ -59,6 +61,8 @@ public:
     virtual QWaylandInputDevice *createInputDevice(QWaylandDisplay *d, int version, uint32_t id) = 0;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDINPUTDEVICEINTEGRATION_H

src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationfactory.cpp

@@ -48,6 +48,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 #ifndef QT_NO_LIBRARY
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
     (QWaylandInputDeviceIntegrationFactoryInterface_iid, QLatin1String("/wayland-inputdevice-integration"), Qt::CaseInsensitive))
@@ -93,4 +95,6 @@ QWaylandInputDeviceIntegration *QWaylandInputDeviceIntegrationFactory::create(co
     return Q_NULLPTR;
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationfactory_p.h

@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandInputDeviceIntegration;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandInputDeviceIntegrationFactory
@@ -56,6 +58,8 @@ public:
     static QWaylandInputDeviceIntegration *create(const QString &name, const QStringList &args, const QString &pluginPath = QString());
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDINPUTDEVICENTEGRATIONFACTORY_H

src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationplugin.cpp

@@ -43,6 +43,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandInputDeviceIntegrationPlugin::QWaylandInputDeviceIntegrationPlugin(QObject *parent)
                               : QObject(parent)
 {
@@ -52,4 +54,6 @@ QWaylandInputDeviceIntegrationPlugin::~QWaylandInputDeviceIntegrationPlugin()
 {
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h

@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandInputDeviceIntegration;
 
 #define QWaylandInputDeviceIntegrationFactoryInterface_iid "org.qt-project.Qt.WaylandClient.QWaylandInputDeviceIntegrationFactoryInterface.5.3"
@@ -64,6 +66,8 @@ public:
     virtual QWaylandInputDeviceIntegration *create(const QString &key, const QStringList &paramList) = 0;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDINPUTDEVICEINTEGRATIONPLUGIN_H

src/plugins/platforms/wayland/plugins/decorations/bradient/main.cpp

@@ -54,6 +54,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 #define BUTTON_SPACING 5
 
 #ifndef QT_NO_IMAGEFORMAT_XPM
@@ -446,6 +448,7 @@ QWaylandAbstractDecoration *QWaylandBradientDecorationPlugin::create(const QStri
     return new QWaylandBradientDecoration();
 }
 
+}
 
 QT_END_NAMESPACE
 

src/plugins/platforms/wayland/plugins/hardwareintegration/brcm-egl/main.cpp

@@ -44,6 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandBrcmEglClientBufferPlugin : public QWaylandClientBufferIntegrationPlugin
 {
     Q_OBJECT
@@ -59,6 +61,8 @@ QWaylandClientBufferIntegration *QWaylandBrcmEglClientBufferPlugin::create(const
     return new QWaylandBrcmEglIntegration();
 }
 
+}
+
 QT_END_NAMESPACE
 
 #include "main.moc"

src/plugins/platforms/wayland/plugins/hardwareintegration/drm-egl-server/main.cpp

@@ -44,6 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class DrmEglServerBufferPlugin : public QWaylandServerBufferIntegrationPlugin
 {
     Q_OBJECT
@@ -59,6 +61,8 @@ QWaylandServerBufferIntegration *DrmEglServerBufferPlugin::create(const QString&
     return new DrmEglServerBufferIntegration();
 }
 
+}
+
 QT_END_NAMESPACE
 
 #include "main.moc"

src/plugins/platforms/wayland/plugins/hardwareintegration/libhybris-egl-server/main.cpp

@@ -44,6 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class LibHybrisEglServerBufferPlugin : public QWaylandServerBufferIntegrationPlugin
 {
     Q_OBJECT
@@ -59,6 +61,8 @@ QWaylandServerBufferIntegration *LibHybrisEglServerBufferPlugin::create(const QS
     return new LibHybrisEglServerBufferIntegration();
 }
 
+}
+
 QT_END_NAMESPACE
 
 #include "main.moc"

src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/main.cpp

@@ -44,6 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandEglClientBufferPlugin : public QWaylandClientBufferIntegrationPlugin
 {
     Q_OBJECT
@@ -59,6 +61,8 @@ QWaylandClientBufferIntegration *QWaylandEglClientBufferPlugin::create(const QSt
     return new QWaylandEglClientBufferIntegration();
 }
 
+}
+
 QT_END_NAMESPACE
 
 #include "main.moc"

src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-egl/main.cpp

@@ -44,6 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandXCompositeEglClientBufferIntegrationPlugin : public QWaylandClientBufferIntegrationPlugin
 {
     Q_OBJECT
@@ -59,6 +61,8 @@ QWaylandClientBufferIntegration *QWaylandXCompositeEglClientBufferIntegrationPlu
     return new QWaylandXCompositeEGLClientBufferIntegration();
 }
 
+}
+
 QT_END_NAMESPACE
 
 #include "main.moc"

src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-glx/main.cpp

@@ -44,6 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandXCompositeGlxClientBufferIntegrationPlugin : public QWaylandClientBufferIntegrationPlugin
 {
     Q_OBJECT
@@ -59,6 +61,8 @@ QWaylandClientBufferIntegration *QWaylandXCompositeGlxClientBufferIntegrationPlu
     return new QWaylandXCompositeGLXIntegration();
 }
 
+}
+
 QT_END_NAMESPACE
 
 #include "main.moc"

src/plugins/platforms/wayland/qwaylandabstractdecoration.cpp

@@ -52,6 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandAbstractDecorationPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QWaylandAbstractDecoration)
@@ -184,4 +186,6 @@ QWaylandWindow *QWaylandAbstractDecoration::waylandWindow() const
     return d->m_wayland_window;
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylandabstractdecoration_p.h

@@ -62,6 +62,9 @@ class QWindow;
 class QPaintDevice;
 class QPainter;
 class QEvent;
+
+namespace QtWaylandClient {
+
 class QWaylandScreen;
 class QWaylandWindow;
 class QWaylandInputDevice;
@@ -100,6 +103,8 @@ protected:
     bool isLeftReleased(Qt::MouseButtons newMouseButtonState);
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDABSTRACTDECORATION_H

src/plugins/platforms/wayland/qwaylandbuffer_p.h

@@ -52,6 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class Q_WAYLAND_CLIENT_EXPORT QWaylandBuffer {
 public:
     QWaylandBuffer() { }
@@ -64,6 +66,8 @@ protected:
     struct wl_buffer *mBuffer;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDBUFFER_H

src/plugins/platforms/wayland/qwaylandclipboard.cpp

@@ -48,6 +48,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandClipboard::QWaylandClipboard(QWaylandDisplay *display)
     : mDisplay(display)
 {
@@ -108,4 +110,6 @@ bool QWaylandClipboard::ownsMode(QClipboard::Mode mode) const
     return inputDevice->dataDevice()->selectionSource() != 0;
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylandclipboard_p.h

@@ -49,6 +49,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandClipboard : public QPlatformClipboard
@@ -67,6 +69,8 @@ private:
     QWaylandDisplay *mDisplay;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDCLIPBOARD_H

src/plugins/platforms/wayland/qwaylandcursor.cpp

@@ -53,6 +53,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandCursor::QWaylandCursor(QWaylandScreen *screen)
     : mDisplay(screen->display())
 {
@@ -305,4 +307,6 @@ void QWaylandCursor::initCursorMap()
     mCursorNamesMap.insert(ResizeSouthWestCursor, "bottom_left_corner");
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylandcursor_p.h

@@ -52,6 +52,8 @@ struct wl_cursor_theme;
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 class QWaylandScreen;
 
@@ -111,6 +113,8 @@ private:
     QMultiMap<WaylandCursor, QByteArray> mCursorNamesMap;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDCURSOR_H

src/plugins/platforms/wayland/qwaylanddatadevice.cpp

@@ -57,6 +57,10 @@
 
 #include <QDebug>
 
+QT_BEGIN_NAMESPACE
+
+namespace QtWaylandClient {
+
 QWaylandDataDevice::QWaylandDataDevice(QWaylandDataDeviceManager *manager, QWaylandInputDevice *inputDevice)
     : QtWayland::wl_data_device(manager->get_data_device(inputDevice->wl_seat()))
     , m_display(manager->display())
@@ -249,3 +253,7 @@ void QWaylandDataDevice::dragSourceTargetChanged(const QString &mimeType)
 {
     static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->updateTarget(mimeType);
 }
+
+}
+
+QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylanddatadevice_p.h

@@ -48,12 +48,15 @@
 
 QT_BEGIN_NAMESPACE
 
-class QWaylandDisplay;
 class QMimeData;
+class QWindow;
+
+namespace QtWaylandClient {
+
+class QWaylandDisplay;
 class QWaylandDataDeviceManager;
 class QWaylandDataOffer;
 class QWaylandDataSource;
-class QWindow;
 class QWaylandInputDevice;
 class QWaylandWindow;
 
@@ -99,6 +102,8 @@ private:
     QScopedPointer<QWaylandDataSource> m_dragSource;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDDATADEVICE_H

src/plugins/platforms/wayland/qwaylanddatadevicemanager.cpp

@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandDataDeviceManager::QWaylandDataDeviceManager(QWaylandDisplay *display, uint32_t id)
     : wl_data_device_manager(display->wl_registry(), id, 1)
     , m_display(display)
@@ -77,5 +79,6 @@ QWaylandDisplay *QWaylandDataDeviceManager::display() const
     return m_display;
 }
 
+}
 
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylanddatadevicemanager_p.h

@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 class QWaylandDataDevice;
 class QWaylandDataSource;
@@ -66,6 +68,8 @@ private:
     QWaylandDisplay *m_display;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDDATADEVICEMANAGER_H

src/plugins/platforms/wayland/qwaylanddataoffer.cpp

@@ -51,6 +51,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandDataOffer::QWaylandDataOffer(QWaylandDisplay *display, struct ::wl_data_offer *offer)
     : QtWayland::wl_data_offer(offer)
     , m_mimeData(new QWaylandMimeData(this, display))
@@ -161,4 +163,6 @@ int QWaylandMimeData::readData(int fd, QByteArray &data) const
     return n;
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylanddataoffer_p.h

@@ -49,6 +49,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 class QWaylandMimeData;
 
@@ -91,6 +93,8 @@ private:
     mutable QHash<QString, QByteArray> m_data;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif

src/plugins/platforms/wayland/qwaylanddatasource.cpp

@@ -53,6 +53,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandDataSource::QWaylandDataSource(QWaylandDataDeviceManager *dataDeviceManager, QMimeData *mimeData)
     : QtWayland::wl_data_source(dataDeviceManager->create_data_source())
     , m_mime_data(mimeData)
@@ -93,4 +95,6 @@ void QWaylandDataSource::data_source_target(const QString &mime_type)
     Q_EMIT targetChanged(mime_type);
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylanddatasource_p.h

@@ -50,6 +50,9 @@
 QT_BEGIN_NAMESPACE
 
 class QMimeData;
+
+namespace QtWaylandClient {
+
 class QWaylandDataDeviceManager;
 class QWaylandDisplay;
 
@@ -76,6 +79,8 @@ private:
     QMimeData *m_mime_data;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDDATASOURCE_H

src/plugins/platforms/wayland/qwaylanddecorationfactory.cpp

@@ -48,6 +48,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 #ifndef QT_NO_LIBRARY
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
     (QWaylandDecorationFactoryInterface_iid, QLatin1String("/wayland-decoration-client"), Qt::CaseInsensitive))
@@ -94,4 +96,6 @@ QWaylandAbstractDecoration *QWaylandDecorationFactory::create(const QString &nam
     return 0;
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylanddecorationfactory_p.h

@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandAbstractDecoration;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandDecorationFactory
@@ -56,6 +58,8 @@ public:
     static QWaylandAbstractDecoration *create(const QString &name, const QStringList &args, const QString &pluginPath = QString());
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDDECORATIONFACTORY_H

src/plugins/platforms/wayland/qwaylanddecorationplugin.cpp

@@ -43,6 +43,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandDecorationPlugin::QWaylandDecorationPlugin(QObject *parent)
     : QObject(parent)
 {
@@ -51,4 +53,6 @@ QWaylandDecorationPlugin::~QWaylandDecorationPlugin()
 {
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylanddecorationplugin_p.h

@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandAbstractDecoration;
 
 #define QWaylandDecorationFactoryInterface_iid "org.qt-project.Qt.WaylandClient.QWaylandDecorationFactoryInterface.5.4"
@@ -64,6 +66,8 @@ public:
     virtual QWaylandAbstractDecoration *create(const QString &key, const QStringList &paramList) = 0;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDDECORATIONPLUGIN_H

src/plugins/platforms/wayland/qwaylanddisplay.cpp

@@ -76,6 +76,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 struct wl_surface *QWaylandDisplay::createSurface(void *handle)
 {
     struct wl_surface *surface = mCompositor.create_surface();
@@ -371,4 +373,6 @@ bool QWaylandDisplay::supportsWindowDecoration() const
     return integrationSupport;
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylanddisplay_p.h

@@ -58,10 +58,22 @@ struct wl_cursor_image;
 QT_BEGIN_NAMESPACE
 
 class QAbstractEventDispatcher;
-class QWaylandInputDevice;
 class QSocketNotifier;
-class QWaylandBuffer;
 class QPlatformScreen;
+
+namespace QtWayland {
+    class qt_output_extension;
+    class qt_shell;
+    class qt_sub_surface_extension;
+    class qt_surface_extension;
+    class wl_text_input_manager;
+    class xdg_shell;
+}
+
+namespace QtWaylandClient {
+
+class QWaylandInputDevice;
+class QWaylandBuffer;
 class QWaylandScreen;
 class QWaylandClientBufferIntegration;
 class QWaylandWindowManagerIntegration;
@@ -75,15 +87,6 @@ class QWaylandHardwareIntegration;
 class QWaylandXdgShell;
 class QWaylandShellSurface;
 
-namespace QtWayland {
-    class qt_output_extension;
-    class qt_shell;
-    class qt_sub_surface_extension;
-    class qt_surface_extension;
-    class wl_text_input_manager;
-    class xdg_shell;
-}
-
 typedef void (*RegistryListener)(void *data,
                                  struct wl_registry *registry,
                                  uint32_t id,
@@ -211,6 +214,8 @@ private:
                                      int32_t width, int32_t height);
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDDISPLAY_H

src/plugins/platforms/wayland/qwaylanddnd.cpp

@@ -53,6 +53,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandDrag::QWaylandDrag(QWaylandDisplay *display)
     : m_display(display)
 {
@@ -134,4 +136,6 @@ void QWaylandDrag::finishDrag(const QPlatformDropQtResponse &response)
     eventFilter(shapedPixmapWindow(), &event);
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylanddnd_p.h

@@ -52,6 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandDrag : public QBasicDrag
@@ -78,6 +80,8 @@ private:
     QWaylandDisplay *m_display;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDDND_H

src/plugins/platforms/wayland/qwaylandeventthread.cpp

@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandEventThread::QWaylandEventThread(QObject *parent)
     : QObject(parent)
     , m_display(0)
@@ -117,4 +119,6 @@ wl_display *QWaylandEventThread::display() const
     return m_display;
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylandeventthread_p.h

@@ -52,6 +52,8 @@ QT_BEGIN_NAMESPACE
 
 class QSocketNotifier;
 
+namespace QtWaylandClient {
+
 class Q_WAYLAND_CLIENT_EXPORT QWaylandEventThread : public QObject
 {
     Q_OBJECT
@@ -85,6 +87,8 @@ private:
 
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDEVENTTHREAD_H

src/plugins/platforms/wayland/qwaylandextendedoutput.cpp

@@ -49,10 +49,13 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandExtendedOutput::QWaylandExtendedOutput(QWaylandScreen *screen, ::qt_extended_output *extended_output)
     : QtWayland::qt_extended_output(extended_output)
 {
     Q_UNUSED(screen);
 }
 
+}
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylandextendedoutput_p.h

@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 class QWaylandScreen;
 class QWaylandExtendedOutput;
@@ -57,6 +59,8 @@ public:
     QWaylandExtendedOutput(QWaylandScreen *screen, struct ::qt_extended_output *extended_output);
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDEXTENDEDOUTPUT_H

src/plugins/platforms/wayland/qwaylandextendedsurface.cpp

@@ -53,6 +53,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandExtendedSurface::QWaylandExtendedSurface(QWaylandWindow *window)
     : QtWayland::qt_extended_surface(window->display()->windowExtension()->get_extended_surface(window->object()))
     , m_window(window)
@@ -123,4 +125,6 @@ Qt::WindowFlags QWaylandExtendedSurface::setWindowFlags(Qt::WindowFlags flags)
     return flags & (Qt::WindowStaysOnTopHint | Qt::WindowOverridesSystemGestures | Qt::BypassWindowManagerHint);
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylandextendedsurface_p.h

@@ -52,6 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 class QWaylandWindow;
 
@@ -76,6 +78,8 @@ private:
     QVariantMap m_properties;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDEXTENDEDSURFACE_H

src/plugins/platforms/wayland/qwaylandinputcontext.cpp

@@ -52,6 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 static Qt::Key toQtKey(uint32_t sym)
 {
 #ifndef QT_NO_WAYLAND_XKB
@@ -277,5 +279,7 @@ bool QWaylandInputContext::ensureTextInput()
     return true;
 }
 
+}
+
 QT_END_NAMESPACE
 

src/plugins/platforms/wayland/qwaylandinputcontext_p.h

@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 
 class QWaylandTextInput : public QtWayland::wl_text_input
@@ -99,6 +101,8 @@ private:
     QScopedPointer<QWaylandTextInput> mTextInput;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDINPUTCONTEXT_H

src/plugins/platforms/wayland/qwaylandinputdevice.cpp

@@ -65,6 +65,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandInputDevice::Keyboard::Keyboard(QWaylandInputDevice *p)
     : mParent(p)
     , mFocus(0)
@@ -973,4 +975,6 @@ void QWaylandInputDevice::Touch::touch_frame()
     mTouchPoints.clear();
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylandinputdevice_p.h

@@ -66,6 +66,7 @@ struct wl_cursor_image;
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
 
 class QWaylandWindow;
 class QWaylandDisplay;
@@ -284,6 +285,8 @@ public:
     Qt::KeyboardModifiers modifiers;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif

src/plugins/platforms/wayland/qwaylandintegration.cpp

@@ -82,6 +82,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class GenericWaylandTheme: public QGenericUnixTheme
 {
 public:
@@ -395,4 +397,6 @@ void QWaylandIntegration::initializeInputDeviceIntegration()
     }
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylandintegration_p.h

@@ -47,6 +47,8 @@
 #include <QtWaylandClient/private/qwaylandclientexport_p.h>
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandBuffer;
 class QWaylandDisplay;
 class QWaylandClientBufferIntegration;
@@ -125,6 +127,8 @@ private:
     friend class QWaylandDisplay;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif

src/plugins/platforms/wayland/qwaylandnativeinterface.cpp

@@ -53,6 +53,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandNativeInterface::QWaylandNativeInterface(QWaylandIntegration *integration)
     : m_integration(integration)
 {
@@ -147,4 +149,6 @@ void QWaylandNativeInterface::emitWindowPropertyChanged(QPlatformWindow *window,
     emit windowPropertyChanged(window,name);
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylandnativeinterface_p.h

@@ -49,6 +49,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandIntegration;
 class QWaylandScreen;
 
@@ -75,6 +77,8 @@ private:
     QHash<QPlatformWindow*, QVariantMap> m_windowProperties;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDNATIVEINTERFACE_H

src/plugins/platforms/wayland/qwaylandqtkey.cpp

@@ -45,6 +45,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandQtKeyExtension::QWaylandQtKeyExtension(QWaylandDisplay *display, uint32_t id)
     : QtWayland::qt_key_extension(display->wl_registry(), id, 2)
     , m_display(display)
@@ -83,4 +85,6 @@ void QWaylandQtKeyExtension::key_extension_qtkey(struct wl_surface *surface,
                                                    autorep, count);
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylandqtkey_p.h

@@ -49,6 +49,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandQtKeyExtension : public QtWayland::qt_key_extension
@@ -73,6 +75,8 @@ private:
 
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDQTKEY_H

src/plugins/platforms/wayland/qwaylandscreen.cpp

@@ -53,6 +53,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandScreen::QWaylandScreen(QWaylandDisplay *waylandDisplay, int version, uint32_t id)
     : QPlatformScreen()
     , QtWayland::wl_output(waylandDisplay->wl_registry(), id, qMin(version, 2))
@@ -242,4 +244,6 @@ void QWaylandScreen::output_done()
     QWindowSystemInterface::handleScreenRefreshRateChange(screen(), refreshRate());
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylandscreen_p.h

@@ -49,6 +49,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 class QWaylandCursor;
 class QWaylandExtendedOutput;
@@ -116,6 +118,8 @@ private:
     QWaylandCursor *mWaylandCursor;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDSCREEN_H

src/plugins/platforms/wayland/qwaylandshellsurface.cpp

@@ -43,6 +43,10 @@
 #include "qwaylandwindow_p.h"
 #include "qwaylandextendedsurface_p.h"
 
+QT_BEGIN_NAMESPACE
+
+namespace QtWaylandClient {
+
 QWaylandShellSurface::QWaylandShellSurface(QWaylandWindow *window)
                     : m_window(window)
 {
@@ -58,3 +62,7 @@ void QWaylandShellSurface::sendProperty(const QString &name, const QVariant &val
     Q_UNUSED(name)
     Q_UNUSED(value)
 }
+
+}
+
+QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylandshellsurface_p.h

@@ -52,9 +52,12 @@
 QT_BEGIN_NAMESPACE
 
 class QVariant;
+class QWindow;
+
+namespace QtWaylandClient {
+
 class QWaylandWindow;
 class QWaylandInputDevice;
-class QWindow;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandShellSurface
 {
@@ -94,6 +97,8 @@ private:
     friend class QWaylandWindow;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDSHELLSURFACE_H

src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp

@@ -56,6 +56,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandShmBuffer::QWaylandShmBuffer(QWaylandDisplay *display,
                      const QSize &size, QImage::Format format, int scale)
     : mMarginsImage(0)
@@ -372,4 +374,6 @@ const struct wl_callback_listener QWaylandShmBackingStore::frameCallbackListener
     QWaylandShmBackingStore::done
 };
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylandshmbackingstore_p.h

@@ -51,6 +51,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 class QWaylandAbstractDecoration;
 class QWaylandWindow;
@@ -120,6 +122,8 @@ private:
     struct wl_callback *mFrameCallback;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif

src/plugins/platforms/wayland/qwaylandshmwindow.cpp

@@ -49,6 +49,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandShmWindow::QWaylandShmWindow(QWindow *window)
     : QWaylandWindow(window)
 {
@@ -63,4 +65,6 @@ QWaylandWindow::WindowType QWaylandShmWindow::windowType() const
     return QWaylandWindow::Shm;
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylandshmwindow_p.h

@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class Q_WAYLAND_CLIENT_EXPORT QWaylandShmWindow : public QWaylandWindow
 {
 public:
@@ -57,6 +59,8 @@ public:
     QSurfaceFormat format() const { return QSurfaceFormat(); }
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDSHMWINDOW_H

src/plugins/platforms/wayland/qwaylandsubsurface.cpp

@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandSubSurface::QWaylandSubSurface(QWaylandWindow *window, struct ::qt_sub_surface *sub_surface)
     : QtWayland::qt_sub_surface(sub_surface)
     , m_window(window)
@@ -88,4 +90,6 @@ void QWaylandSubSurface::adjustPositionOfChildren()
     setPositionToParent(m_window);
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylandsubsurface_p.h

@@ -52,6 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 class QWaylandWindow;
 class QWaylandSubSurface;
@@ -70,4 +72,6 @@ private:
 
 QT_END_NAMESPACE
 
+}
+
 #endif // QWAYLANDSUBSURFACE_H

src/plugins/platforms/wayland/qwaylandtouch.cpp

@@ -45,6 +45,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandTouchExtension::QWaylandTouchExtension(QWaylandDisplay *display, uint32_t id)
     : QtWayland::qt_touch_extension(display->wl_registry(), id, 1),
       mDisplay(display),
@@ -207,4 +209,6 @@ void QWaylandTouchExtension::touch_extension_configure(uint32_t flags)
     mFlags = flags;
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylandtouch_p.h

@@ -49,6 +49,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 class QWaylandInputDevice;
 
@@ -95,6 +97,8 @@ private:
     QWaylandInputDevice *mInputDevice;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDTOUCH_H

src/plugins/platforms/wayland/qwaylandwindow.cpp

@@ -67,6 +67,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandWindow *QWaylandWindow::mMouseGrab = 0;
 
 QWaylandWindow::QWaylandWindow(QWindow *window)
@@ -809,4 +811,6 @@ QVariant QWaylandWindow::property(const QString &name, const QVariant &defaultVa
     return m_properties.value(name, defaultValue);
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylandwindow_p.h

@@ -56,6 +56,8 @@ struct wl_egl_window;
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 class QWaylandBuffer;
 class QWaylandShellSurface;
@@ -253,4 +255,6 @@ inline QPoint QWaylandWindow::attachOffset() const
 
 QT_END_NAMESPACE
 
+}
+
 #endif // QWAYLANDWINDOW_H

src/plugins/platforms/wayland/qwaylandwindowmanagerintegration.cpp

@@ -57,6 +57,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandWindowManagerIntegrationPrivate {
 public:
     QWaylandWindowManagerIntegrationPrivate(QWaylandDisplay *waylandDisplay);
@@ -157,4 +159,6 @@ bool QWaylandWindowManagerIntegration::openDocument(const QUrl &url)
     return true;
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h

@@ -53,6 +53,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandWindow;
 class QWaylandDisplay;
 
@@ -87,4 +89,6 @@ private:
 
 QT_END_NAMESPACE
 
+}
+
 #endif // QWAYLANDWINDOWMANAGERINTEGRATION_H

src/plugins/platforms/wayland/qwaylandwlshellsurface.cpp

@@ -52,6 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandWlShellSurface::QWaylandWlShellSurface(struct ::wl_shell_surface *shell_surface, QWaylandWindow *window)
     : QtWayland::wl_shell_surface(shell_surface)
     , QWaylandShellSurface(window)
@@ -219,4 +221,6 @@ void QWaylandWlShellSurface::shell_surface_popup_done()
     QCoreApplication::postEvent(m_window->window(), new QCloseEvent());
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylandwlshellsurface_p.h

@@ -52,9 +52,12 @@
 
 QT_BEGIN_NAMESPACE
 
+class QWindow;
+
+namespace QtWaylandClient {
+
 class QWaylandWindow;
 class QWaylandInputDevice;
-class QWindow;
 class QWaylandExtendedSurface;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandWlShellSurface : public QtWayland::wl_shell_surface
@@ -106,4 +109,6 @@ private:
 
 QT_END_NAMESPACE
 
+}
+
 #endif // QWAYLANDSHELLSURFACE_H

src/plugins/platforms/wayland/qwaylandxdgshell.cpp

@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandXdgShell::QWaylandXdgShell(struct ::xdg_shell *shell)
     : QtWayland::xdg_shell(shell)
 {
@@ -72,5 +74,6 @@ void QWaylandXdgShell::xdg_shell_ping(uint32_t serial)
     pong(serial);
 }
 
+}
 
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylandxdgshell_p.h

@@ -52,9 +52,12 @@
 
 QT_BEGIN_NAMESPACE
 
+class QWindow;
+
+namespace QtWaylandClient {
+
 class QWaylandWindow;
 class QWaylandInputDevice;
-class QWindow;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgShell : public QtWayland::xdg_shell
 {
@@ -70,4 +73,6 @@ private:
 
 QT_END_NAMESPACE
 
+}
+
 #endif // QWAYLANDXDGSHELL_H

src/plugins/platforms/wayland/qwaylandxdgsurface.cpp

@@ -51,6 +51,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandXdgSurface::QWaylandXdgSurface(struct ::xdg_surface *xdg_surface, QWaylandWindow *window)
     : QtWayland::xdg_surface(xdg_surface)
     , QWaylandShellSurface(window)
@@ -240,4 +242,6 @@ void QWaylandXdgSurface::xdg_surface_close()
 {
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/qwaylandxdgsurface_p.h

@@ -53,9 +53,12 @@
 
 QT_BEGIN_NAMESPACE
 
+class QWindow;
+
+namespace QtWaylandClient {
+
 class QWaylandWindow;
 class QWaylandInputDevice;
-class QWindow;
 class QWaylandExtendedSurface;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgSurface : public QtWayland::xdg_surface
@@ -114,4 +117,6 @@ private:
 
 QT_END_NAMESPACE
 
+}
+
 #endif // QWAYLANDXDGSURFACE_H

src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h

@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandWindow;
 class QWaylandDisplay;
 class QWaylandShellSurface;
@@ -61,6 +63,8 @@ public:
     virtual QWaylandShellSurface *createShellSurface(QWaylandWindow *window) = 0;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDSHELLINTEGRATION_H

src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationfactory.cpp

@@ -48,6 +48,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 #ifndef QT_NO_LIBRARY
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
     (QWaylandShellIntegrationFactoryInterface_iid, QLatin1String("/wayland-shell-integration"), Qt::CaseInsensitive))
@@ -93,4 +95,6 @@ QWaylandShellIntegration *QWaylandShellIntegrationFactory::create(const QString
     return Q_NULLPTR;
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationfactory_p.h

@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandShellIntegration;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandShellIntegrationFactory
@@ -56,6 +58,8 @@ public:
     static QWaylandShellIntegration *create(const QString &name, const QStringList &args, const QString &pluginPath = QString());
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDSHELLINTEGRATIONFACTORY_H

src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationplugin.cpp

@@ -43,6 +43,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandShellIntegrationPlugin::QWaylandShellIntegrationPlugin(QObject *parent)
                               : QObject(parent)
 {
@@ -52,4 +54,6 @@ QWaylandShellIntegrationPlugin::~QWaylandShellIntegrationPlugin()
 {
 }
 
+}
+
 QT_END_NAMESPACE

src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationplugin_p.h

@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandShellIntegration;
 
 #define QWaylandShellIntegrationFactoryInterface_iid "org.qt-project.Qt.WaylandClient.QWaylandShellIntegrationFactoryInterface.5.3"
@@ -64,6 +66,8 @@ public:
     virtual QWaylandShellIntegration *create(const QString &key, const QStringList &paramList) = 0;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDSHELLINTEGRATIONPLUGIN_H