diff options
| author | Mikolaj Boc <mikolaj.boc@qt.io> | 2022-12-30 13:41:40 +0100 |
|---|---|---|
| committer | Mikolaj Boc <mikolaj.boc@qt.io> | 2023-01-13 21:07:14 +0100 |
| commit | 2e97ccc8d0e3c1fa0fe34e01d1d3e6f8cd7465ba (patch) | |
| tree | 4a5094bb2cc1b700c2884e2b1a32226110b7ba45 /src/plugins/platforms/wasm/qwasmclipboard.cpp | |
| parent | 4dbb07f614c914e78437aacf7a1716f632da5e8a (diff) | |
Add QString<->emscripten::val conversion functions
Following the QRect, add functions converting the QString to native
emscripten::val and back: fromJsString, toJsString
Change-Id: I2d0625ede3bbf7249e2e91b8de298b5b91df8ba2
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/plugins/platforms/wasm/qwasmclipboard.cpp')
| -rw-r--r-- | src/plugins/platforms/wasm/qwasmclipboard.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/plugins/platforms/wasm/qwasmclipboard.cpp b/src/plugins/platforms/wasm/qwasmclipboard.cpp index d6343e9f6bc..24523aacbf6 100644 --- a/src/plugins/platforms/wasm/qwasmclipboard.cpp +++ b/src/plugins/platforms/wasm/qwasmclipboard.cpp @@ -3,7 +3,7 @@ #include "qwasmclipboard.h" #include "qwasmwindow.h" -#include "qwasmstring.h" + #include <private/qstdweb_p.h> #include <emscripten.h> @@ -27,12 +27,11 @@ static void commonCopyEvent(val event) // doing it this way seems to sanitize the text better that calling data() like down below if (_mimes->hasText()) { - event["clipboardData"].call<void>("setData", val("text/plain") - , QWasmString::fromQString(_mimes->text())); + event["clipboardData"].call<void>("setData", val("text/plain"), + _mimes->text().toJsString()); } if (_mimes->hasHtml()) { - event["clipboardData"].call<void>("setData", val("text/html") - , QWasmString::fromQString(_mimes->html())); + event["clipboardData"].call<void>("setData", val("text/html"), _mimes->html().toJsString()); } for (auto mimetype : _mimes->formats()) { @@ -40,8 +39,8 @@ static void commonCopyEvent(val event) continue; QByteArray ba = _mimes->data(mimetype); if (!ba.isEmpty()) - event["clipboardData"].call<void>("setData", QWasmString::fromQString(mimetype) - , val(ba.constData())); + event["clipboardData"].call<void>("setData", mimetype.toJsString(), + val(ba.constData())); } event.call<void>("preventDefault"); @@ -140,7 +139,7 @@ static void qClipboardPasteTo(val dataTransfer) || itemMimeType.contains("TEXT", Qt::CaseSensitive)) { break; } - const QString data = QWasmString::toQString( + const QString data = QString::fromJsString( clipboardData.call<val>("getData", val(itemMimeType.toStdString()))); if (!data.isEmpty()) { @@ -329,12 +328,12 @@ void QWasmClipboard::writeToClipboardApi() // we have a blob, now create a ClipboardItem emscripten::val type = emscripten::val::array(); - type.set("type", val(QWasmString::fromQString(mimetype))); + type.set("type", mimetype.toJsString()); emscripten::val contentBlob = emscripten::val::global("Blob").new_(contentArray, type); emscripten::val clipboardItemObject = emscripten::val::object(); - clipboardItemObject.set(val(QWasmString::fromQString(mimetype)), contentBlob); + clipboardItemObject.set(mimetype.toJsString(), contentBlob); val clipboardItemData = val::global("ClipboardItem").new_(clipboardItemObject); |