wasm: rename JsString -> EcmaString

QString::fromJsString -> QString::fromEcmaString()
QString::toJsString() -> QString::toEcmaString()

For API naming compatibility with QByteArray::fromEcmaUin8Array()

Pick-to: 6.6
Change-Id: If6e2121e31e630d6728ed24e41d14b763f395aaa
Reviewed-by: Piotr Wierciński <piotr.wiercinski@qt.io>
Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io>
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>

8 files changed, 19 insertions, 19 deletions

diff --git a/src/corelib/kernel/qcore_wasm.cpp b/src/corelib/kernel/qcore_wasm.cpp
index 79b5b01cc1..fb12ae50c3 100644
--- a/src/corelib/kernel/qcore_wasm.cpp
+++ b/src/corelib/kernel/qcore_wasm.cpp
@@ -49,9 +49,9 @@ emscripten::val QRectF::toDOMRect() const
     \since 6.6
     \ingroup platform-type-conversions
 
-    \sa toJsString()
+    \sa toEcmaString()
 */
-QString QString::fromJsString(emscripten::val jsString)
+QString QString::fromEcmaString(emscripten::val jsString)
 {
     Q_ASSERT_X(jsString.isString(), Q_FUNC_INFO, "Passed object is not a string");
 
@@ -86,9 +86,9 @@ QString QString::fromJsString(emscripten::val jsString)
     \since 6.6
     \ingroup platform-type-conversions
 
-    \sa fromJsString()
+    \sa fromEcmaString()
 */
-emscripten::val QString::toJsString() const
+emscripten::val QString::toEcmaString() const
 {
     static const emscripten::val UTF16ToString(emscripten::val::module_property("UTF16ToString"));
     return UTF16ToString(emscripten::val(quintptr(utf16())));
diff --git a/src/corelib/platform/wasm/qstdweb.cpp b/src/corelib/platform/wasm/qstdweb.cpp
index dfe249dc42..84a7f0d405 100644
--- a/src/corelib/platform/wasm/qstdweb.cpp
+++ b/src/corelib/platform/wasm/qstdweb.cpp
@@ -440,7 +440,7 @@ private:
                     break;
                 }
                 QString a;
-                const QString data = QString::fromJsString(webDataTransfer.call<emscripten::val>(
+                const QString data = QString::fromEcmaString(webDataTransfer.call<emscripten::val>(
                         "getData", emscripten::val(itemMimeType.toStdString())));
 
                 if (!data.isEmpty()) {
diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h
index d5e1d962a5..1f83a50f55 100644
--- a/src/corelib/text/qstring.h
+++ b/src/corelib/text/qstring.h
@@ -893,8 +893,8 @@ public:
 #endif
 
 #if defined(Q_OS_WASM) || defined(Q_QDOC)
-    static QString fromJsString(emscripten::val jsString);
-    emscripten::val toJsString() const;
+    static QString fromEcmaString(emscripten::val jsString);
+    emscripten::val toEcmaString() const;
 #endif
 
     inline bool isNull() const { return d->isNull(); }
diff --git a/src/plugins/platforms/wasm/qwasmclipboard.cpp b/src/plugins/platforms/wasm/qwasmclipboard.cpp
index c33f39d470..8916a946d4 100644
--- a/src/plugins/platforms/wasm/qwasmclipboard.cpp
+++ b/src/plugins/platforms/wasm/qwasmclipboard.cpp
@@ -27,10 +27,10 @@ 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"),
-                                          _mimes->text().toJsString());
+                                          _mimes->text().toEcmaString());
     }
     if (_mimes->hasHtml()) {
-        event["clipboardData"].call<void>("setData", val("text/html"), _mimes->html().toJsString());
+        event["clipboardData"].call<void>("setData", val("text/html"), _mimes->html().toEcmaString());
     }
 
     for (auto mimetype : _mimes->formats()) {
@@ -38,7 +38,7 @@ static void commonCopyEvent(val event)
             continue;
         QByteArray ba = _mimes->data(mimetype);
         if (!ba.isEmpty())
-            event["clipboardData"].call<void>("setData", mimetype.toJsString(),
+            event["clipboardData"].call<void>("setData", mimetype.toEcmaString(),
                                               val(ba.constData()));
     }
 
@@ -261,12 +261,12 @@ void QWasmClipboard::writeToClipboardApi()
 
         // we have a blob, now create a ClipboardItem
         emscripten::val type = emscripten::val::array();
-        type.set("type", mimetype.toJsString());
+        type.set("type", mimetype.toEcmaString());
 
         emscripten::val contentBlob = emscripten::val::global("Blob").new_(contentArray, type);
 
         emscripten::val clipboardItemObject = emscripten::val::object();
-        clipboardItemObject.set(mimetype.toJsString(), contentBlob);
+        clipboardItemObject.set(mimetype.toEcmaString(), contentBlob);
 
         val clipboardItemData = val::global("ClipboardItem").new_(clipboardItemObject);
 
diff --git a/src/plugins/platforms/wasm/qwasmintegration.cpp b/src/plugins/platforms/wasm/qwasmintegration.cpp
index 473df5f66d..778c769ae1 100644
--- a/src/plugins/platforms/wasm/qwasmintegration.cpp
+++ b/src/plugins/platforms/wasm/qwasmintegration.cpp
@@ -373,7 +373,7 @@ void QWasmIntegration::resizeScreen(const emscripten::val &element)
         [&] (const ScreenMapping &candidate) { return candidate.emscriptenVal.equals(element); });
     if (it == m_screens.end()) {
         qWarning() << "Attempting to resize non-existing screen for element"
-                   << QString::fromJsString(element["id"]);
+                   << QString::fromEcmaString(element["id"]);
         return;
     }
     it->wasmScreen->updateQScreenAndCanvasRenderSize();
diff --git a/src/plugins/platforms/wasm/qwasmscreen.cpp b/src/plugins/platforms/wasm/qwasmscreen.cpp
index f338a7541e..f8e2919d17 100644
--- a/src/plugins/platforms/wasm/qwasmscreen.cpp
+++ b/src/plugins/platforms/wasm/qwasmscreen.cpp
@@ -182,7 +182,7 @@ qreal QWasmScreen::devicePixelRatio() const
 
 QString QWasmScreen::name() const
 {
-    return QString::fromJsString(m_shadowContainer["id"]);
+    return QString::fromEcmaString(m_shadowContainer["id"]);
 }
 
 QPlatformCursor *QWasmScreen::cursor() const
diff --git a/src/plugins/platforms/wasm/qwasmservices.cpp b/src/plugins/platforms/wasm/qwasmservices.cpp
index f5fd4e4790..e767295e41 100644
--- a/src/plugins/platforms/wasm/qwasmservices.cpp
+++ b/src/plugins/platforms/wasm/qwasmservices.cpp
@@ -12,7 +12,7 @@ QT_BEGIN_NAMESPACE
 
 bool QWasmServices::openUrl(const QUrl &url)
 {
-    emscripten::val::global("window").call<void>("open", url.toString().toJsString(),
+    emscripten::val::global("window").call<void>("open", url.toString().toEcmaString(),
                                                  emscripten::val("_blank"));
     return true;
 }
diff --git a/tests/auto/corelib/text/qstring/tst_qstring_wasm.cpp b/tests/auto/corelib/text/qstring/tst_qstring_wasm.cpp
index c0eda42020..00eaed90e2 100644
--- a/tests/auto/corelib/text/qstring/tst_qstring_wasm.cpp
+++ b/tests/auto/corelib/text/qstring/tst_qstring_wasm.cpp
@@ -12,18 +12,18 @@ void tst_QString_wasmTypes()
     // QString <-> emscripten::val
     {
         QString qtString = testString;
-        const emscripten::val jsString = qtString.toJsString();
+        const emscripten::val jsString = qtString.toEcmaString();
         QString qtStringCopy(qtString);
         qtString = qtString.toUpper(); // modify
-        QCOMPARE(QString::fromJsString(jsString), qtStringCopy);
+        QCOMPARE(QString::fromEcmaString(jsString), qtStringCopy);
     }
     {
         QString longString;
         for (uint64_t i = 0; i < 1000; ++i)
             longString += testString;
-        const emscripten::val jsString = longString.toJsString();
+        const emscripten::val jsString = longString.toEcmaString();
         QString qtStringCopy(longString);
         longString = longString.toUpper(); // modify
-        QCOMPARE(QString::fromJsString(jsString), qtStringCopy);
+        QCOMPARE(QString::fromEcmaString(jsString), qtStringCopy);
     }
 }