From 81ce878f555d738c4a7ae3383942746dfb9bea54 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 7 Feb 2023 14:26:29 +0100 Subject: [PATCH] =?UTF-8?q?Rename=20{from,to}DOMRect()=20=E2=86=92=20{from?= =?UTF-8?q?,to}DomRect()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Because it's QDomNode, not QDOMNode, either (abbreviations aren't supposed to be all-caps in Qt). Found in API review. Pick-to: 6.5 Change-Id: I37bcd8c38d396709d11c4eab035cdfd2145eb245 Reviewed-by: Volker Hilsheimer Reviewed-by: Qt CI Bot --- src/corelib/kernel/qcore_wasm.cpp | 8 ++++---- src/corelib/tools/qrect.h | 4 ++-- src/plugins/platforms/wasm/qwasmdom.cpp | 4 ++-- src/plugins/platforms/wasm/qwasmwindow.cpp | 4 ++-- 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 79b5b01cc1..79b04c3fcb 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() == "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 e69a217f48..04364a6c5e 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 9aca102b2e..92ee2896d0 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("getBoundingClientRect")); + QRectF::fromDomRect(source.call("getBoundingClientRect")); const auto targetBoundingRect = - QRectF::fromDOMRect(target.call("getBoundingClientRect")); + QRectF::fromDomRect(target.call("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 1bc09ee270..96d6340dbc 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("getBoundingClientRect")); + QRectF::fromDomRect(m_qtWindow.call("getBoundingClientRect")); const auto canvasRect = - QRectF::fromDOMRect(m_windowContents.call("getBoundingClientRect")); + QRectF::fromDomRect(m_windowContents.call("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 68f1442510..2866a2b412 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("getBoundingClientRect")); - const auto screenRect = QRectF::fromDOMRect( + QRectF::fromDomRect(m_windowElement.call("getBoundingClientRect")); + const auto screenRect = QRectF::fromDomRect( m_window->platformScreen()->element().call("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("getBoundingClientRect")); + return QRectF::fromDomRect(m_element.call("getBoundingClientRect")); } bool TitleBar::onPointerDown(const PointerEvent &event)