wasm: Fix up namespacing in wasm platform plugin

Pick-to: 6.4
Change-Id: I2fdbb6688b252743578dfcd58f9259eb5ac3cca8
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>

13 files changed, 40 insertions, 7 deletions

diff --git a/src/plugins/platforms/wasm/qwasmclipboard.cpp b/src/plugins/platforms/wasm/qwasmclipboard.cpp
index a10e15f421..88043ba092 100644
--- a/src/plugins/platforms/wasm/qwasmclipboard.cpp
+++ b/src/plugins/platforms/wasm/qwasmclipboard.cpp
@@ -16,6 +16,7 @@
 #include <QBuffer>
 #include <QString>
 
+QT_BEGIN_NAMESPACE
 using namespace emscripten;
 
 static void pasteClipboardData(emscripten::val format, emscripten::val dataPtr)
@@ -438,3 +439,4 @@ void QWasmClipboard::writeToClipboard(const QMimeData *data)
     val document = val::global("document");
     document.call<val>("execCommand", val("copy"));
 }
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/wasm/qwasmclipboard.h b/src/plugins/platforms/wasm/qwasmclipboard.h
index 4fcb712764..ef11fd2e49 100644
--- a/src/plugins/platforms/wasm/qwasmclipboard.h
+++ b/src/plugins/platforms/wasm/qwasmclipboard.h
@@ -12,6 +12,8 @@
 #include <emscripten/bind.h>
 #include <emscripten/val.h>
 
+QT_BEGIN_NAMESPACE
+
 class QWasmClipboard : public QObject, public QPlatformClipboard
 {
 public:
@@ -36,4 +38,6 @@ public:
     bool isSafari;
 };
 
+QT_END_NAMESPACE
+
 #endif // QWASMCLIPBOARD_H
diff --git a/src/plugins/platforms/wasm/qwasmcursor.cpp b/src/plugins/platforms/wasm/qwasmcursor.cpp
index 199fc1bf00..f1f5e77bcb 100644
--- a/src/plugins/platforms/wasm/qwasmcursor.cpp
+++ b/src/plugins/platforms/wasm/qwasmcursor.cpp
@@ -11,6 +11,7 @@
 #include <emscripten/emscripten.h>
 #include <emscripten/bind.h>
 
+QT_BEGIN_NAMESPACE
 using namespace emscripten;
 
 void QWasmCursor::changeCursor(QCursor *windowCursor, QWindow *window)
@@ -133,3 +134,5 @@ void QWasmCursor::clearOverrideWasmCursor(QScreen *screen)
     QWasmCursor *wCursor = static_cast<QWasmCursor *>(QWasmScreen::get(screen)->cursor());
     wCursor->setWasmCursor(screen, wCursor->htmlCursorName);
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/wasm/qwasmcursor.h b/src/plugins/platforms/wasm/qwasmcursor.h
index 1fad7475e0..17ddd344b1 100644
--- a/src/plugins/platforms/wasm/qwasmcursor.h
+++ b/src/plugins/platforms/wasm/qwasmcursor.h
@@ -5,6 +5,7 @@
 #define QWASMCURSOR_H
 
 #include <qpa/qplatformcursor.h>
+QT_BEGIN_NAMESPACE
 
 class QWasmCursor : public QPlatformCursor
 {
@@ -19,4 +20,6 @@ private:
     void setWasmCursor(QScreen *screen, const QByteArray &name);
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/platforms/wasm/qwasmeventdispatcher.cpp b/src/plugins/platforms/wasm/qwasmeventdispatcher.cpp
index 9d65bd58f8..2fd1a30401 100644
--- a/src/plugins/platforms/wasm/qwasmeventdispatcher.cpp
+++ b/src/plugins/platforms/wasm/qwasmeventdispatcher.cpp
@@ -5,9 +5,13 @@
 
 #include <QtGui/qpa/qwindowsysteminterface.h>
 
+QT_BEGIN_NAMESPACE
+
 // Note: All event dispatcher functionality is implemented in QEventDispatcherWasm
 // in QtCore, except for processWindowSystemEvents() below which uses API from QtGui.
 void QWasmEventDispatcher::processWindowSystemEvents(QEventLoop::ProcessEventsFlags flags)
 {
     QWindowSystemInterface::sendWindowSystemEvents(flags);
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/wasm/qwasmeventtranslator.cpp b/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
index 778e85d675..8f9050ba5d 100644
--- a/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
+++ b/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
@@ -24,10 +24,10 @@
 
 #include <iostream>
 
-using namespace emscripten;
-
 QT_BEGIN_NAMESPACE
 
+using namespace emscripten;
+
 typedef struct emkb2qt {
     const char *em;
     unsigned int qt;
diff --git a/src/plugins/platforms/wasm/qwasminputcontext.cpp b/src/plugins/platforms/wasm/qwasminputcontext.cpp
index 96d0c272c0..f27ea013c6 100644
--- a/src/plugins/platforms/wasm/qwasminputcontext.cpp
+++ b/src/plugins/platforms/wasm/qwasminputcontext.cpp
@@ -13,6 +13,8 @@
 #include <qwindow.h>
 #include <QKeySequence>
 #include <qpa/qwindowsysteminterface.h>
+
+QT_BEGIN_NAMESPACE
 using namespace qstdweb;
 
 static void inputCallback(emscripten::val event)
@@ -162,3 +164,5 @@ int QWasmInputContext::androidKeyboardCallback(int eventType,
 
     return true;
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/wasm/qwasminputcontext.h b/src/plugins/platforms/wasm/qwasminputcontext.h
index 34492377b7..58f3920c30 100644
--- a/src/plugins/platforms/wasm/qwasminputcontext.h
+++ b/src/plugins/platforms/wasm/qwasminputcontext.h
@@ -12,6 +12,8 @@
 #include <emscripten/html5.h>
 #include <emscripten/emscripten.h>
 
+QT_BEGIN_NAMESPACE
+
 class QWasmInputContext : public QPlatformInputContext
 {
     Q_DISABLE_COPY(QWasmInputContext)
@@ -42,4 +44,6 @@ private:
     bool inputPanelIsOpen = false;
 };
 
+QT_END_NAMESPACE
+
 #endif // QWASMINPUTCONTEXT_H
diff --git a/src/plugins/platforms/wasm/qwasmintegration.cpp b/src/plugins/platforms/wasm/qwasmintegration.cpp
index 76c751064d..2e231cc5ce 100644
--- a/src/plugins/platforms/wasm/qwasmintegration.cpp
+++ b/src/plugins/platforms/wasm/qwasmintegration.cpp
@@ -32,9 +32,11 @@
 // this is where EGL headers are pulled in, make sure it is last
 #include "qwasmscreen.h"
 #include <private/qsimpledrag_p.h>
-using namespace emscripten;
+
 QT_BEGIN_NAMESPACE
 
+using namespace emscripten;
+
 using namespace Qt::StringLiterals;
 
 static void addContainerElement(emscripten::val element)
diff --git a/src/plugins/platforms/wasm/qwasmoffscreensurface.cpp b/src/plugins/platforms/wasm/qwasmoffscreensurface.cpp
index bb04a66fcb..79ec9af62b 100644
--- a/src/plugins/platforms/wasm/qwasmoffscreensurface.cpp
+++ b/src/plugins/platforms/wasm/qwasmoffscreensurface.cpp
@@ -3,6 +3,8 @@
 
 #include "qwasmoffscreensurface.h"
 
+QT_BEGIN_NAMESPACE
+
 QWasmOffscrenSurface::QWasmOffscrenSurface(QOffscreenSurface *offscreenSurface)
     :QPlatformOffscreenSurface(offscreenSurface)
 {
@@ -13,3 +15,5 @@ QWasmOffscrenSurface::~QWasmOffscrenSurface()
 {
 
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/wasm/qwasmscreen.cpp b/src/plugins/platforms/wasm/qwasmscreen.cpp
index 15f2fa69cc..ad9e5b1f5a 100644
--- a/src/plugins/platforms/wasm/qwasmscreen.cpp
+++ b/src/plugins/platforms/wasm/qwasmscreen.cpp
@@ -20,10 +20,10 @@
 #include <QtGui/qguiapplication.h>
 #include <private/qhighdpiscaling_p.h>
 
-using namespace emscripten;
-
 QT_BEGIN_NAMESPACE
 
+using namespace emscripten;
+
 const char * QWasmScreen::m_canvasResizeObserverCallbackContextPropertyName = "data-qtCanvasResizeObserverCallbackContext";
 
 QWasmScreen::QWasmScreen(const emscripten::val &containerOrCanvas)
diff --git a/src/plugins/platforms/wasm/qwasmstylepixmaps_p.h b/src/plugins/platforms/wasm/qwasmstylepixmaps_p.h
index 1b443259e3..0f061a38b3 100644
--- a/src/plugins/platforms/wasm/qwasmstylepixmaps_p.h
+++ b/src/plugins/platforms/wasm/qwasmstylepixmaps_p.h
@@ -15,6 +15,8 @@
 // We mean it.
 //
 
+QT_BEGIN_NAMESPACE
+
 /* XPM */
 static const char * const qt_menu_xpm[] = {
 "16 16 72 1",
@@ -153,5 +155,5 @@ static const char * const qt_normalizeup_xpm[] = {
 ".######...",
 ".........."};
 
-
+QT_END_NAMESPACE
 #endif // QWASMSTYLEPIXMAPS_P_H
diff --git a/src/plugins/platforms/wasm/qwasmwindow.cpp b/src/plugins/platforms/wasm/qwasmwindow.cpp
index c40543cd4c..4206ede1bb 100644
--- a/src/plugins/platforms/wasm/qwasmwindow.cpp
+++ b/src/plugins/platforms/wasm/qwasmwindow.cpp
@@ -14,10 +14,11 @@
 
 #include <iostream>
 
-Q_GUI_EXPORT int qt_defaultDpiX();
 
 QT_BEGIN_NAMESPACE
 
+Q_GUI_EXPORT int qt_defaultDpiX();
+
 QWasmWindow::QWasmWindow(QWindow *w, QWasmCompositor *compositor, QWasmBackingStore *backingStore)
     : QPlatformWindow(w),
       m_window(w),