diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2023-02-22 08:30:58 +0000 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2023-02-22 14:27:35 +0000 |
commit | b4b4c8140112e3e327ca7bfc1263b948001b93f8 (patch) | |
tree | c33b9ef713708db51fc085577fdb7fd301b77686 | |
parent | a85b658469186075b6a883504877673dcc651f45 (diff) |
Revert "Rename {from,to}DOMRect() → {from,to}DomRect()"
This reverts commit 81ce878f555d738c4a7ae3383942746dfb9bea54.
Reason for revert: The native type is DOMRect, and in Qt, converters
to/from native types stick to the native capitalisation (e.g. fromCGRect
or fromNSString).
Change-Id: Ic44ec79849fc6accdce1153471dd1ad9117e57ce
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
-rw-r--r-- | src/corelib/kernel/qcore_wasm.cpp | 8 | ||||
-rw-r--r-- | src/corelib/tools/qrect.h | 4 | ||||
-rw-r--r-- | src/plugins/platforms/wasm/qwasmdom.cpp | 4 | ||||
-rw-r--r-- | src/plugins/platforms/wasm/qwasmwindow.cpp | 4 | ||||
-rw-r--r-- | src/plugins/platforms/wasm/qwasmwindownonclientarea.cpp | 6 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/corelib/kernel/qcore_wasm.cpp b/src/corelib/kernel/qcore_wasm.cpp index 79b04c3fcb..79b5b01cc1 100644 --- a/src/corelib/kernel/qcore_wasm.cpp +++ b/src/corelib/kernel/qcore_wasm.cpp @@ -18,9 +18,9 @@ QT_BEGIN_NAMESPACE \since 6.5 \ingroup platform-type-conversions - \sa toDomRect() + \sa toDOMRect() */ -QRectF QRectF::fromDomRect(emscripten::val domRect) +QRectF QRectF::fromDOMRect(emscripten::val domRect) { Q_ASSERT_X(domRect["constructor"]["name"].as<std::string>() == "DOMRect", Q_FUNC_INFO, "Passed object is not a DOMRect"); @@ -35,9 +35,9 @@ QRectF QRectF::fromDomRect(emscripten::val domRect) \since 6.5 \ingroup platform-type-conversions - \sa fromDomRect() + \sa fromDOMRect() */ -emscripten::val QRectF::toDomRect() const +emscripten::val QRectF::toDOMRect() const { return emscripten::val::global("DOMRect").new_(left(), top(), width(), height()); } diff --git a/src/corelib/tools/qrect.h b/src/corelib/tools/qrect.h index 04364a6c5e..e69a217f48 100644 --- a/src/corelib/tools/qrect.h +++ b/src/corelib/tools/qrect.h @@ -592,8 +592,8 @@ public: #endif #if defined(Q_OS_WASM) || defined(Q_QDOC) - [[nodiscard]] static QRectF fromDomRect(emscripten::val domRect); - [[nodiscard]] emscripten::val toDomRect() const; + [[nodiscard]] static QRectF fromDOMRect(emscripten::val domRect); + [[nodiscard]] emscripten::val toDOMRect() const; #endif private: diff --git a/src/plugins/platforms/wasm/qwasmdom.cpp b/src/plugins/platforms/wasm/qwasmdom.cpp index 92ee2896d0..9aca102b2e 100644 --- a/src/plugins/platforms/wasm/qwasmdom.cpp +++ b/src/plugins/platforms/wasm/qwasmdom.cpp @@ -28,9 +28,9 @@ void syncCSSClassWith(emscripten::val element, std::string cssClassName, bool fl QPointF mapPoint(emscripten::val source, emscripten::val target, const QPointF &point) { const auto sourceBoundingRect = - QRectF::fromDomRect(source.call<emscripten::val>("getBoundingClientRect")); + QRectF::fromDOMRect(source.call<emscripten::val>("getBoundingClientRect")); const auto targetBoundingRect = - QRectF::fromDomRect(target.call<emscripten::val>("getBoundingClientRect")); + QRectF::fromDOMRect(target.call<emscripten::val>("getBoundingClientRect")); const auto offset = sourceBoundingRect.topLeft() - targetBoundingRect.topLeft(); return point + offset; diff --git a/src/plugins/platforms/wasm/qwasmwindow.cpp b/src/plugins/platforms/wasm/qwasmwindow.cpp index 96d6340dbc..1bc09ee270 100644 --- a/src/plugins/platforms/wasm/qwasmwindow.cpp +++ b/src/plugins/platforms/wasm/qwasmwindow.cpp @@ -312,9 +312,9 @@ bool QWasmWindow::isVisible() const QMargins QWasmWindow::frameMargins() const { const auto frameRect = - QRectF::fromDomRect(m_qtWindow.call<emscripten::val>("getBoundingClientRect")); + QRectF::fromDOMRect(m_qtWindow.call<emscripten::val>("getBoundingClientRect")); const auto canvasRect = - QRectF::fromDomRect(m_windowContents.call<emscripten::val>("getBoundingClientRect")); + QRectF::fromDOMRect(m_windowContents.call<emscripten::val>("getBoundingClientRect")); return QMarginsF(canvasRect.left() - frameRect.left(), canvasRect.top() - frameRect.top(), frameRect.right() - canvasRect.right(), frameRect.bottom() - canvasRect.bottom()) diff --git a/src/plugins/platforms/wasm/qwasmwindownonclientarea.cpp b/src/plugins/platforms/wasm/qwasmwindownonclientarea.cpp index 2866a2b412..68f1442510 100644 --- a/src/plugins/platforms/wasm/qwasmwindownonclientarea.cpp +++ b/src/plugins/platforms/wasm/qwasmwindownonclientarea.cpp @@ -198,8 +198,8 @@ void Resizer::startResize(Qt::Edges resizeEdges, const PointerEvent &event) window->minimumHeight() - window->geometry().height()); const auto frameRect = - QRectF::fromDomRect(m_windowElement.call<emscripten::val>("getBoundingClientRect")); - const auto screenRect = QRectF::fromDomRect( + QRectF::fromDOMRect(m_windowElement.call<emscripten::val>("getBoundingClientRect")); + const auto screenRect = QRectF::fromDOMRect( m_window->platformScreen()->element().call<emscripten::val>("getBoundingClientRect")); const int maxGrowTop = frameRect.top() - screenRect.top(); @@ -363,7 +363,7 @@ void TitleBar::setWidth(int width) QRectF TitleBar::geometry() const { - return QRectF::fromDomRect(m_element.call<emscripten::val>("getBoundingClientRect")); + return QRectF::fromDOMRect(m_element.call<emscripten::val>("getBoundingClientRect")); } bool TitleBar::onPointerDown(const PointerEvent &event) |