From 9fd4160307ab54b89d0145ebde0a91d293fa95a5 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Mon, 23 Mar 2020 16:07:09 +0100 Subject: QQuickItem: rename geometryChanged to geometryChange This brings it in line with the existing convention in this and other modules, where virtual handlers are named "nounChange"; e.g. itemChange. Signals are named "nounChanged". This also allows adding a geometryChanged signal, which would enable users to listen to one signal for all changes to x/y/width/height. [ChangeLog][QQuickItem] Renamed geometryChanged to geometryChange in order to follow existing naming conventions and have consistency with existing API, such as itemChange. Task-number: QTBUG-82994 Change-Id: I0547358c796a0047982ccfbf2c38bab952e7a634 Reviewed-by: Laszlo Agocs Reviewed-by: Shawn Rutledge --- src/quick/items/qquickitem.cpp | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'src/quick/items/qquickitem.cpp') diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index cb1d3e224e..3280ae861f 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -3711,15 +3711,16 @@ void QQuickItem::setClip(bool c) emit clipChanged(c); } - /*! + \since 6.0 + This function is called to handle this item's changes in geometry from \a oldGeometry to \a newGeometry. If the two geometries are the same, it doesn't do anything. Derived classes must call the base class method within their implementation. */ -void QQuickItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) +void QQuickItem::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) { Q_D(QQuickItem); @@ -6618,8 +6619,8 @@ void QQuickItem::setX(qreal v) d->dirty(QQuickItemPrivate::Position); - geometryChanged(QRectF(d->x, d->y, d->width, d->height), - QRectF(oldx, d->y, d->width, d->height)); + geometryChange(QRectF(d->x, d->y, d->width, d->height), + QRectF(oldx, d->y, d->width, d->height)); } void QQuickItem::setY(qreal v) @@ -6635,8 +6636,8 @@ void QQuickItem::setY(qreal v) d->dirty(QQuickItemPrivate::Position); - geometryChanged(QRectF(d->x, d->y, d->width, d->height), - QRectF(d->x, oldy, d->width, d->height)); + geometryChange(QRectF(d->x, d->y, d->width, d->height), + QRectF(d->x, oldy, d->width, d->height)); } /*! @@ -6656,8 +6657,8 @@ void QQuickItem::setPosition(const QPointF &pos) d->dirty(QQuickItemPrivate::Position); - geometryChanged(QRectF(d->x, d->y, d->width, d->height), - QRectF(oldx, oldy, d->width, d->height)); + geometryChange(QRectF(d->x, d->y, d->width, d->height), + QRectF(oldx, oldy, d->width, d->height)); } /*! @@ -6686,8 +6687,8 @@ void QQuickItem::setWidth(qreal w) d->dirty(QQuickItemPrivate::Size); - geometryChanged(QRectF(d->x, d->y, d->width, d->height), - QRectF(d->x, d->y, oldWidth, d->height)); + geometryChange(QRectF(d->x, d->y, d->width, d->height), + QRectF(d->x, d->y, oldWidth, d->height)); } void QQuickItem::resetWidth() @@ -6810,8 +6811,8 @@ void QQuickItem::setImplicitWidth(qreal w) d->dirty(QQuickItemPrivate::Size); - geometryChanged(QRectF(d->x, d->y, d->width, d->height), - QRectF(d->x, d->y, oldWidth, d->height)); + geometryChange(QRectF(d->x, d->y, d->width, d->height), + QRectF(d->x, d->y, oldWidth, d->height)); if (changed) d->implicitWidthChanged(); @@ -6852,8 +6853,8 @@ void QQuickItem::setHeight(qreal h) d->dirty(QQuickItemPrivate::Size); - geometryChanged(QRectF(d->x, d->y, d->width, d->height), - QRectF(d->x, d->y, d->width, oldHeight)); + geometryChange(QRectF(d->x, d->y, d->width, d->height), + QRectF(d->x, d->y, d->width, oldHeight)); } void QQuickItem::resetHeight() @@ -6906,8 +6907,8 @@ void QQuickItem::setImplicitHeight(qreal h) d->dirty(QQuickItemPrivate::Size); - geometryChanged(QRectF(d->x, d->y, d->width, d->height), - QRectF(d->x, d->y, d->width, oldHeight)); + geometryChange(QRectF(d->x, d->y, d->width, d->height), + QRectF(d->x, d->y, d->width, oldHeight)); if (changed) d->implicitHeightChanged(); @@ -6951,8 +6952,8 @@ void QQuickItem::setImplicitSize(qreal w, qreal h) d->dirty(QQuickItemPrivate::Size); - geometryChanged(QRectF(d->x, d->y, d->width, d->height), - QRectF(d->x, d->y, oldWidth, oldHeight)); + geometryChange(QRectF(d->x, d->y, d->width, d->height), + QRectF(d->x, d->y, oldWidth, oldHeight)); if (!wDone && wChanged) d->implicitWidthChanged(); @@ -7007,8 +7008,8 @@ void QQuickItem::setSize(const QSizeF &size) d->dirty(QQuickItemPrivate::Size); - geometryChanged(QRectF(d->x, d->y, d->width, d->height), - QRectF(d->x, d->y, oldWidth, oldHeight)); + geometryChange(QRectF(d->x, d->y, d->width, d->height), + QRectF(d->x, d->y, oldWidth, oldHeight)); } /*! -- cgit v1.2.3