aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/layouts/qquicklayout.cpp
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2020-03-23 16:07:09 +0100
committerMitch Curtis <mitch.curtis@qt.io>2020-04-23 12:13:20 +0200
commit9fd4160307ab54b89d0145ebde0a91d293fa95a5 (patch)
tree4931fac50b7237d23a8d2064c665c9da841ef96a /src/imports/layouts/qquicklayout.cpp
parent05293cde367678cca78a46f7a050a1fd41686e87 (diff)
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 <laszlo.agocs@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/imports/layouts/qquicklayout.cpp')
-rw-r--r--src/imports/layouts/qquicklayout.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/layouts/qquicklayout.cpp b/src/imports/layouts/qquicklayout.cpp
index 43c39290c3..a2a3ce2cc4 100644
--- a/src/imports/layouts/qquicklayout.cpp
+++ b/src/imports/layouts/qquicklayout.cpp
@@ -743,7 +743,7 @@ void QQuickLayout::componentComplete()
{
Q_D(QQuickLayout);
d->m_disableRearrange = true;
- QQuickItem::componentComplete(); // will call our geometryChanged(), (where isComponentComplete() == true)
+ QQuickItem::componentComplete(); // will call our geometryChange(), (where isComponentComplete() == true)
d->m_disableRearrange = false;
d->m_isReady = true;
}
@@ -828,14 +828,14 @@ void QQuickLayout::itemChange(ItemChange change, const ItemChangeData &value)
QQuickItem::itemChange(change, value);
}
-void QQuickLayout::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickLayout::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
{
Q_D(QQuickLayout);
- QQuickItem::geometryChanged(newGeometry, oldGeometry);
+ QQuickItem::geometryChange(newGeometry, oldGeometry);
if (d->m_disableRearrange || !isReady() || !newGeometry.isValid())
return;
- qCDebug(lcQuickLayouts) << "QQuickLayout::geometryChanged" << newGeometry << oldGeometry;
+ qCDebug(lcQuickLayouts) << "QQuickLayout::geometryChange" << newGeometry << oldGeometry;
rearrange(newGeometry.size());
}