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/qquicktext.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/quick/items/qquicktext.cpp') diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 74cae71616..af8a0c476e 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -2363,11 +2363,11 @@ QRectF QQuickText::clipRect() const } /*! \internal */ -void QQuickText::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) +void QQuickText::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) { Q_D(QQuickText); if (d->text.isEmpty()) { - QQuickItem::geometryChanged(newGeometry, oldGeometry); + QQuickItem::geometryChange(newGeometry, oldGeometry); return; } @@ -2436,7 +2436,7 @@ void QQuickText::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeo } geomChangeDone: - QQuickItem::geometryChanged(newGeometry, oldGeometry); + QQuickItem::geometryChange(newGeometry, oldGeometry); } void QQuickText::triggerPreprocess() -- cgit v1.2.3