From 4df800d9381e15ff4edcbd3617e3de3e7e7801ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20S=C3=B8rvig?= <morten.sorvig@qt.io>
Date: Tue, 20 Sep 2022 09:17:50 +0200
Subject: [PATCH] wasm: remove QWasmClipboard::m_isListener
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Similar to isPaste (removed in previous commit), m_isListener
is set when handling external clipboard events, and is no
longer needed now that QWasmClipboard::setMimieData() is no
longer called for that case.

Change-Id: Ib44612e3bd1d59bac95b041ccffdd2ae97f5f879
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
---
 src/plugins/platforms/wasm/qwasmclipboard.cpp | 14 +++-----------
 src/plugins/platforms/wasm/qwasmclipboard.h   |  1 -
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/plugins/platforms/wasm/qwasmclipboard.cpp b/src/plugins/platforms/wasm/qwasmclipboard.cpp
index fe14ddccd1..74833f0735 100644
--- a/src/plugins/platforms/wasm/qwasmclipboard.cpp
+++ b/src/plugins/platforms/wasm/qwasmclipboard.cpp
@@ -45,12 +45,10 @@ static void commonCopyEvent(val event)
     }
 
     event.call<void>("preventDefault");
-    QWasmIntegration::get()->getWasmClipboard()->m_isListener = false;
 }
 
 static void qClipboardCutTo(val event)
 {
-    QWasmIntegration::get()->getWasmClipboard()->m_isListener = true;
     if (!QWasmIntegration::get()->getWasmClipboard()->hasClipboardApi) {
         // Send synthetic Ctrl+X to make the app cut data to Qt's clipboard
          QWindowSystemInterface::handleKeyEvent<QWindowSystemInterface::SynchronousDelivery>(
@@ -62,8 +60,6 @@ static void qClipboardCutTo(val event)
 
 static void qClipboardCopyTo(val event)
 {
-    QWasmIntegration::get()->getWasmClipboard()->m_isListener = true;
-
     if (!QWasmIntegration::get()->getWasmClipboard()->hasClipboardApi) {
         // Send synthetic Ctrl+C to make the app copy data to Qt's clipboard
             QWindowSystemInterface::handleKeyEvent<QWindowSystemInterface::SynchronousDelivery>(
@@ -74,7 +70,6 @@ static void qClipboardCopyTo(val event)
 
 static void qClipboardPasteTo(val dataTransfer)
 {
-    QWasmIntegration::get()->getWasmClipboard()->m_isListener = true;
     val clipboardData = dataTransfer["clipboardData"];
     val types = clipboardData["types"];
     int typesCount = types["length"].as<int>();
@@ -135,7 +130,6 @@ static void qClipboardPasteTo(val dataTransfer)
         }
     }
     QWasmClipboard::qWasmClipboardPaste(mMimeData);
-    QWasmIntegration::get()->getWasmClipboard()->m_isListener = false;
 }
 
 EMSCRIPTEN_BINDINGS(qtClipboardModule) {
@@ -144,8 +138,7 @@ EMSCRIPTEN_BINDINGS(qtClipboardModule) {
     function("qtClipboardPasteTo", &qClipboardPasteTo);
 }
 
-QWasmClipboard::QWasmClipboard() :
-    m_isListener(false)
+QWasmClipboard::QWasmClipboard()
 {
     val clipboard = val::global("navigator")["clipboard"];
 
@@ -172,11 +165,10 @@ void QWasmClipboard::setMimeData(QMimeData *mimeData, QClipboard::Mode mode)
 {
     // handle setText/ setData programmatically
     QPlatformClipboard::setMimeData(mimeData, mode);
-    if (hasClipboardApi) {
+    if (hasClipboardApi)
         writeToClipboardApi();
-    } else if (!m_isListener) {
+    else
         writeToClipboard(mimeData);
-    }
 }
 
 QWasmClipboard::ProcessKeyboardResult
diff --git a/src/plugins/platforms/wasm/qwasmclipboard.h b/src/plugins/platforms/wasm/qwasmclipboard.h
index e15dce8c57..3338efd9b1 100644
--- a/src/plugins/platforms/wasm/qwasmclipboard.h
+++ b/src/plugins/platforms/wasm/qwasmclipboard.h
@@ -42,7 +42,6 @@ public:
     bool hasClipboardApi;
     void writeToClipboardApi();
     void writeToClipboard(const QMimeData *data);
-    bool m_isListener;
 };
 
 QT_END_NAMESPACE