wasm: remove QWasmWindow::window() and m_window

This shadows QPlatformWindow::window(), and we don't
need it anyway.

(also frees up the variable name for later use)

Task-number: QTBUG-128732
Change-Id: Ie6e355b3136b106aed4b34cbe7f883008e1b3870
Reviewed-by: Piotr Wierciński <[email protected]>
Reviewed-by: Tor Arne Vestbø <[email protected]>

2 files changed, 1 insertions, 4 deletions

diff --git a/src/plugins/platforms/wasm/qwasmwindow.cpp b/src/plugins/platforms/wasm/qwasmwindow.cpp
index 84a5abfcfc4..fee1b21c623 100644
--- a/src/plugins/platforms/wasm/qwasmwindow.cpp
+++ b/src/plugins/platforms/wasm/qwasmwindow.cpp
@@ -50,7 +50,6 @@ Q_GUI_EXPORT int qt_defaultDpiX();
 QWasmWindow::QWasmWindow(QWindow *w, QWasmDeadKeySupport *deadKeySupport,
                          QWasmCompositor *compositor, QWasmBackingStore *backingStore)
     : QPlatformWindow(w),
-      m_window(w),
       m_compositor(compositor),
       m_backingStore(backingStore),
       m_deadKeySupport(deadKeySupport),
@@ -606,7 +605,7 @@ bool QWasmWindow::processPointer(const PointerEvent &event)
         const auto pointInScreen = platformScreen()->mapFromLocal(
             dom::mapPoint(event.target(), platformScreen()->element(), event.localPoint));
         QWindowSystemInterface::handleEnterEvent(
-                window(), m_window->mapFromGlobal(pointInScreen), pointInScreen);
+                window(), mapFromGlobal(pointInScreen.toPoint()), pointInScreen);
         break;
     }
     case EventType::PointerLeave:
diff --git a/src/plugins/platforms/wasm/qwasmwindow.h b/src/plugins/platforms/wasm/qwasmwindow.h
index 6c6b5b7cbdb..88f6ac97576 100644
--- a/src/plugins/platforms/wasm/qwasmwindow.h
+++ b/src/plugins/platforms/wasm/qwasmwindow.h
@@ -89,7 +89,6 @@ public:
     QWasmScreen *platformScreen() const;
     void setBackingStore(QWasmBackingStore *store) { m_backingStore = store; }
     QWasmBackingStore *backingStore() const { return m_backingStore; }
-    QWindow *window() const { return m_window; }
 
     std::string canvasSelector() const;
 
@@ -132,7 +131,6 @@ private:
     void handleWheelEvent(const emscripten::val &event);
     bool processWheel(const WheelEvent &event);
 
-    QWindow *m_window = nullptr;
     QWasmCompositor *m_compositor = nullptr;
     QWasmBackingStore *m_backingStore = nullptr;
     QWasmDeadKeySupport *m_deadKeySupport;