From d46a99871601ed4af1260234126c7a7e9d8f2f41 Mon Sep 17 00:00:00 2001 From: Lauri Laanmets Date: Thu, 30 Sep 2021 15:10:00 +0300 Subject: Change 'geometryChanged' to 'geometryChange' As stated by the documentation: https://doc.qt.io/qt-6/quick-changes-qt6.html#changes-to-qquickitem This is part of a bigger work to port QtLocation maps to Qt6. Task-number: QTBUG-96795 Change-Id: I9dcf2e454d949dfbf3a9861b98eb949be6e6df56 Reviewed-by: Ivan Solovev Reviewed-by: Alex Blasche Reviewed-by: Andreas Buhr --- src/location/declarativemaps/qdeclarativecirclemapitem.cpp | 6 +++--- src/location/declarativemaps/qdeclarativecirclemapitem_p.h | 2 +- src/location/declarativemaps/qdeclarativegeomap.cpp | 4 ++-- src/location/declarativemaps/qdeclarativegeomap_p.h | 2 +- src/location/declarativemaps/qdeclarativegeomapquickitem.cpp | 6 +++--- src/location/declarativemaps/qdeclarativegeomapquickitem_p.h | 2 +- src/location/declarativemaps/qdeclarativepolygonmapitem.cpp | 10 +++++----- src/location/declarativemaps/qdeclarativepolygonmapitem_p.h | 2 +- src/location/declarativemaps/qdeclarativepolylinemapitem.cpp | 6 +++--- src/location/declarativemaps/qdeclarativepolylinemapitem_p.h | 2 +- src/location/declarativemaps/qdeclarativerectanglemapitem.cpp | 6 +++--- src/location/declarativemaps/qdeclarativerectanglemapitem_p.h | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp index 156fd376..1bbe2ed4 100644 --- a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp +++ b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp @@ -554,10 +554,10 @@ void QDeclarativeCircleMapItem::setBackend(QDeclarativeCircleMapItem::Backend b) /*! \internal */ -void QDeclarativeCircleMapItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) +void QDeclarativeCircleMapItem::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) { if (!map() || !m_circle.isValid() || m_updatingGeometry || newGeometry == oldGeometry) { - QDeclarativeGeoMapItemBase::geometryChanged(newGeometry, oldGeometry); + QDeclarativeGeoMapItemBase::geometryChange(newGeometry, oldGeometry); return; } @@ -566,7 +566,7 @@ void QDeclarativeCircleMapItem::geometryChanged(const QRectF &newGeometry, const if (newCoordinate.isValid()) setCenter(newCoordinate); // ToDo: this is incorrect. setting such center might yield to another geometry changed. - // Not calling QDeclarativeGeoMapItemBase::geometryChanged() as it will be called from a nested + // Not calling QDeclarativeGeoMapItemBase::geometryChange() as it will be called from a nested // call to this function. } diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem_p.h b/src/location/declarativemaps/qdeclarativecirclemapitem_p.h index a6715e30..0387001f 100644 --- a/src/location/declarativemaps/qdeclarativecirclemapitem_p.h +++ b/src/location/declarativemaps/qdeclarativecirclemapitem_p.h @@ -106,7 +106,7 @@ Q_SIGNALS: void backendChanged(); protected: - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override; void updatePolish() override; void possiblySwitchBackend(const QGeoCoordinate &oldCenter, qreal oldRadius, const QGeoCoordinate &newCenter, qreal newRadius); diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp index ba6d7835..19e7aeab 100644 --- a/src/location/declarativemaps/qdeclarativegeomap.cpp +++ b/src/location/declarativemaps/qdeclarativegeomap.cpp @@ -2275,10 +2275,10 @@ QDeclarativeGeoMapType * QDeclarativeGeoMap::activeMapType() const /*! \internal */ -void QDeclarativeGeoMap::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) +void QDeclarativeGeoMap::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) { m_gestureArea->setSize(newGeometry.size()); - QQuickItem::geometryChanged(newGeometry, oldGeometry); + QQuickItem::geometryChange(newGeometry, oldGeometry); if (!m_map || newGeometry.size().isEmpty()) return; diff --git a/src/location/declarativemaps/qdeclarativegeomap_p.h b/src/location/declarativemaps/qdeclarativegeomap_p.h index fe4440c6..2dba5a9c 100644 --- a/src/location/declarativemaps/qdeclarativegeomap_p.h +++ b/src/location/declarativemaps/qdeclarativegeomap_p.h @@ -254,7 +254,7 @@ protected: void componentComplete() override; QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override; - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override; void setError(QGeoServiceProvider::Error error, const QString &errorString); void initialize(); diff --git a/src/location/declarativemaps/qdeclarativegeomapquickitem.cpp b/src/location/declarativemaps/qdeclarativegeomapquickitem.cpp index ccca309b..5940bba1 100644 --- a/src/location/declarativemaps/qdeclarativegeomapquickitem.cpp +++ b/src/location/declarativemaps/qdeclarativegeomapquickitem.cpp @@ -212,11 +212,11 @@ bool QDeclarativeGeoMapQuickItem::childMouseEventFilter(QQuickItem *receiver, QE /*! \internal */ -void QDeclarativeGeoMapQuickItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) +void QDeclarativeGeoMapQuickItem::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) { if (!mapAndSourceItemSet_ || updatingGeometry_ || newGeometry.topLeft() == oldGeometry.topLeft()) { - QDeclarativeGeoMapItemBase::geometryChanged(newGeometry, oldGeometry); + QDeclarativeGeoMapItemBase::geometryChange(newGeometry, oldGeometry); return; } @@ -242,7 +242,7 @@ void QDeclarativeGeoMapQuickItem::geometryChanged(const QRectF &newGeometry, con if (newCoordinate.isValid()) setCoordinate(newCoordinate); - // Not calling QDeclarativeGeoMapItemBase::geometryChanged() as it will be called from a nested + // Not calling QDeclarativeGeoMapItemBase::geometryChange() as it will be called from a nested // call to this function. } diff --git a/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h b/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h index 2663fdc6..b19b7371 100644 --- a/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h +++ b/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h @@ -106,7 +106,7 @@ Q_SIGNALS: void zoomLevelChanged(); protected: - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override; void updatePolish() override; bool childMouseEventFilter(QQuickItem *item, QEvent *event) override; diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp index 507c5d66..ac5e3a05 100644 --- a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp +++ b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp @@ -484,7 +484,7 @@ void QGeoMapPolygonGeometryOpenGL::updateSourcePoints(const QGeoMap &map, // 2) Store the triangulated polygon, and the wrapped bbox paths. // the triangulations can be used as they are, as they "bypass" the QtQuick display chain // the bbox wraps have to be however clipped, and then projected, in order to figure out the geometry. - // Note that this might still cause the geometryChanged method to fail under some extreme conditions. + // Note that this might still cause the geometryChange method to fail under some extreme conditions. cutPathEars(wrappedPath, m_screenVertices, m_screenIndices); m_wrappedPolygons.resize(3); @@ -519,7 +519,7 @@ void QGeoMapPolygonGeometryOpenGL::updateSourcePoints(const QGeoMap &map, const // 2) Store the triangulated polygon, and the wrapped bbox paths. // the triangulations can be used as they are, as they "bypass" the QtQuick display chain // the bbox wraps have to be however clipped, and then projected, in order to figure out the geometry. - // Note that this might still cause the geometryChanged method to fail under some extreme conditions. + // Note that this might still cause the geometryChange method to fail under some extreme conditions. cutPathEars(wrappedPath, m_screenVertices, m_screenIndices); m_wrappedPolygons.resize(3); m_wrappedPolygons[0].wrappedBboxes = wrappedBboxMinus1; @@ -883,10 +883,10 @@ void QDeclarativePolygonMapItem::setGeoShape(const QGeoShape &shape) /*! \internal */ -void QDeclarativePolygonMapItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) +void QDeclarativePolygonMapItem::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) { if (newGeometry.topLeft() == oldGeometry.topLeft() || !map() || !m_geopoly.isValid() || m_updatingGeometry) { - QDeclarativeGeoMapItemBase::geometryChanged(newGeometry, oldGeometry); + QDeclarativeGeoMapItemBase::geometryChange(newGeometry, oldGeometry); return; } // TODO: change the algorithm to preserve the distances and size! @@ -903,7 +903,7 @@ void QDeclarativePolygonMapItem::geometryChanged(const QRectF &newGeometry, cons m_d->onGeoGeometryChanged(); emit pathChanged(); - // Not calling QDeclarativeGeoMapItemBase::geometryChanged() as it will be called from a nested + // Not calling QDeclarativeGeoMapItemBase::geometryChange() as it will be called from a nested // call to this function. } diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h b/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h index efc1a137..efa2e84c 100644 --- a/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h +++ b/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h @@ -108,7 +108,7 @@ protected Q_SLOTS: virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) override; protected: - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override; void updatePolish() override; void setMaterialDirty() override; diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp index ee05503e..5a1419fc 100644 --- a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp +++ b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp @@ -1242,10 +1242,10 @@ void QDeclarativePolylineMapItem::setBackend(QDeclarativePolylineMapItem::Backen /*! \internal */ -void QDeclarativePolylineMapItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) +void QDeclarativePolylineMapItem::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) { if (newGeometry.topLeft() == oldGeometry.topLeft() || !map() || !m_geopath.isValid() || m_updatingGeometry) { - QDeclarativeGeoMapItemBase::geometryChanged(newGeometry, oldGeometry); + QDeclarativeGeoMapItemBase::geometryChange(newGeometry, oldGeometry); return; } // TODO: change the algorithm to preserve the distances and size! @@ -1262,7 +1262,7 @@ void QDeclarativePolylineMapItem::geometryChanged(const QRectF &newGeometry, con m_d->onGeoGeometryChanged(); emit pathChanged(); - // Not calling QDeclarativeGeoMapItemBase::geometryChanged() as it will be called from a nested + // Not calling QDeclarativeGeoMapItemBase::geometryChange() as it will be called from a nested // call to this function. } diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h index d3d0ebd6..c0736cc1 100644 --- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h +++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h @@ -142,7 +142,7 @@ protected Q_SLOTS: virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) override; protected: - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override; void setPathFromGeoList(const QList &path); void updatePolish() override; void componentComplete() override; diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp index 3028d4cc..cd825cc8 100644 --- a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp +++ b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp @@ -377,10 +377,10 @@ void QDeclarativeRectangleMapItem::setGeoShape(const QGeoShape &shape) /*! \internal */ -void QDeclarativeRectangleMapItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) +void QDeclarativeRectangleMapItem::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) { if (!map() || !m_rectangle.isValid() || m_updatingGeometry || newGeometry.topLeft() == oldGeometry.topLeft()) { - QDeclarativeGeoMapItemBase::geometryChanged(newGeometry, oldGeometry); + QDeclarativeGeoMapItemBase::geometryChange(newGeometry, oldGeometry); return; } // TODO: change the algorithm to preserve the distances and size @@ -398,7 +398,7 @@ void QDeclarativeRectangleMapItem::geometryChanged(const QRectF &newGeometry, co emit topLeftChanged(m_rectangle.topLeft()); emit bottomRightChanged(m_rectangle.bottomRight()); - // Not calling QDeclarativeGeoMapItemBase::geometryChanged() as it will be called from a nested + // Not calling QDeclarativeGeoMapItemBase::geometryChange() as it will be called from a nested // call to this function. } diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem_p.h b/src/location/declarativemaps/qdeclarativerectanglemapitem_p.h index a9ce2f4c..a8aefbf5 100644 --- a/src/location/declarativemaps/qdeclarativerectanglemapitem_p.h +++ b/src/location/declarativemaps/qdeclarativerectanglemapitem_p.h @@ -110,7 +110,7 @@ Q_SIGNALS: void backendChanged(); protected: - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override; void updatePolish() override; protected Q_SLOTS: -- cgit v1.2.1