1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wasm: rename JsString -> EcmaString

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

For API naming compatibility with QByteArray::fromEcmaUin8Array()

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>
(cherry picked from commit c802a9e987c9e38c01580f467eab92a651b3e033)
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
Morten Sørvig 2023-08-31 14:16:25 +02:00
parent 928885a5c0
commit fa4231bd11
8 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/kernel/qcore_wasm.cpp
View File

@ -49,9 +49,9 @@ emscripten::val QRectF::toDOMRect() const
\since 6.6 \since 6.6
\ingroup platform-type-conversions \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"); 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 \since 6.6
\ingroup platform-type-conversions \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")); static const emscripten::val UTF16ToString(emscripten::val::module_property("UTF16ToString"));
return UTF16ToString(emscripten::val(quintptr(utf16()))); return UTF16ToString(emscripten::val(quintptr(utf16())));

2
src/corelib/platform/wasm/qstdweb.cpp
View File

@ -437,7 +437,7 @@ private:
break; break;
} }
QString a; 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()))); "getData", emscripten::val(itemMimeType.toStdString())));
if (!data.isEmpty()) { if (!data.isEmpty()) {

4
src/corelib/text/qstring.h
View File

@ -891,8 +891,8 @@ public:
#endif #endif
#if defined(Q_OS_WASM) || defined(Q_QDOC) #if defined(Q_OS_WASM) || defined(Q_QDOC)
static QString fromJsString(emscripten::val jsString); static QString fromEcmaString(emscripten::val jsString);
emscripten::val toJsString() const; emscripten::val toEcmaString() const;
#endif #endif
inline bool isNull() const { return d->isNull(); } inline bool isNull() const { return d->isNull(); }

10
src/plugins/platforms/wasm/qwasmclipboard.cpp
View File

@ -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 // doing it this way seems to sanitize the text better that calling data() like down below
if (_mimes->hasText()) { if (_mimes->hasText()) {
event["clipboardData"].call<void>("setData", val("text/plain"), event["clipboardData"].call<void>("setData", val("text/plain"),
_mimes->text().toJsString()); _mimes->text().toEcmaString());
} }
if (_mimes->hasHtml()) { 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()) { for (auto mimetype : _mimes->formats()) {
@ -38,7 +38,7 @@ static void commonCopyEvent(val event)
continue; continue;
QByteArray ba = _mimes->data(mimetype); QByteArray ba = _mimes->data(mimetype);
if (!ba.isEmpty()) if (!ba.isEmpty())
event["clipboardData"].call<void>("setData", mimetype.toJsString(), event["clipboardData"].call<void>("setData", mimetype.toEcmaString(),
val(ba.constData())); val(ba.constData()));
} }
@ -261,12 +261,12 @@ void QWasmClipboard::writeToClipboardApi()
// we have a blob, now create a ClipboardItem // we have a blob, now create a ClipboardItem
emscripten::val type = emscripten::val::array(); 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 contentBlob = emscripten::val::global("Blob").new_(contentArray, type);
emscripten::val clipboardItemObject = emscripten::val::object(); emscripten::val clipboardItemObject = emscripten::val::object();
clipboardItemObject.set(mimetype.toJsString(), contentBlob); clipboardItemObject.set(mimetype.toEcmaString(), contentBlob);
val clipboardItemData = val::global("ClipboardItem").new_(clipboardItemObject); val clipboardItemData = val::global("ClipboardItem").new_(clipboardItemObject);

2
src/plugins/platforms/wasm/qwasmintegration.cpp
View File

@ -376,7 +376,7 @@ void QWasmIntegration::resizeScreen(const emscripten::val &element)
[&] (const ScreenMapping &candidate) { return candidate.emscriptenVal.equals(element); }); [&] (const ScreenMapping &candidate) { return candidate.emscriptenVal.equals(element); });
if (it == m_screens.end()) { if (it == m_screens.end()) {
qWarning() << "Attempting to resize non-existing screen for element" qWarning() << "Attempting to resize non-existing screen for element"
<< QString::fromJsString(element["id"]); << QString::fromEcmaString(element["id"]);
return; return;
} }
it->wasmScreen->updateQScreenAndCanvasRenderSize(); it->wasmScreen->updateQScreenAndCanvasRenderSize();

2
src/plugins/platforms/wasm/qwasmscreen.cpp
View File

@ -182,7 +182,7 @@ qreal QWasmScreen::devicePixelRatio() const
QString QWasmScreen::name() const QString QWasmScreen::name() const
{ {
return QString::fromJsString(m_shadowContainer["id"]); return QString::fromEcmaString(m_shadowContainer["id"]);
} }
QPlatformCursor *QWasmScreen::cursor() const QPlatformCursor *QWasmScreen::cursor() const

2
src/plugins/platforms/wasm/qwasmservices.cpp
View File

@ -12,7 +12,7 @@ QT_BEGIN_NAMESPACE
bool QWasmServices::openUrl(const QUrl &url) 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")); emscripten::val("_blank"));
return true; return true;
} }

8
tests/auto/corelib/text/qstring/tst_qstring_wasm.cpp
View File

@ -11,18 +11,18 @@ void tst_QString_wasmTypes()
// QString <-> emscripten::val // QString <-> emscripten::val
{ {
QString qtString("test string"); QString qtString("test string");
const emscripten::val jsString = qtString.toJsString(); const emscripten::val jsString = qtString.toEcmaString();
QString qtStringCopy(qtString); QString qtStringCopy(qtString);
qtString = qtString.toUpper(); // modify qtString = qtString.toUpper(); // modify
QCOMPARE(QString::fromJsString(jsString), qtStringCopy); QCOMPARE(QString::fromEcmaString(jsString), qtStringCopy);
} }
{ {
QString longString; QString longString;
for (uint64_t i = 0; i < 1000; ++i) for (uint64_t i = 0; i < 1000; ++i)
longString += "Lorem ipsum FTW"; longString += "Lorem ipsum FTW";
const emscripten::val jsString = longString.toJsString(); const emscripten::val jsString = longString.toEcmaString();
QString qtStringCopy(longString); QString qtStringCopy(longString);
longString = longString.toUpper(); // modify longString = longString.toUpper(); // modify
QCOMPARE(QString::fromJsString(jsString), qtStringCopy); QCOMPARE(QString::fromEcmaString(jsString), qtStringCopy);
} }
} }