From 52d9a725098735e6350fe63cf471a27d4106ad18 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Wed, 28 Feb 2018 11:48:08 +0100 Subject: finish renaming of containsMask -> containmentMask Followup to 6fa746fa6 to rename setContainsMask and registerAsContainsMask Change-Id: Ifdfaf58dccb5fd3665615418e7f1ea09cb914c55 Reviewed-by: Paolo Angelelli --- src/quick/items/qquickitem.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/quick/items/qquickitem.cpp') diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 2576886abf..2226adeeff 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -7642,7 +7642,7 @@ QObject *QQuickItem::containmentMask() const return d->mask.data(); } -void QQuickItem::setContainsMask(QObject *mask) +void QQuickItem::setContainmentMask(QObject *mask) { Q_D(QQuickItem); // an Item can't mask itself (to prevent infinite loop in contains()) @@ -7652,7 +7652,7 @@ void QQuickItem::setContainsMask(QObject *mask) QQuickItem *quickMask = qobject_cast(d->mask); if (quickMask) { QQuickItemPrivate *maskPrivate = QQuickItemPrivate::get(quickMask); - maskPrivate->registerAsContainsMask(this, false); // removed from use as my mask + maskPrivate->registerAsContainmentMask(this, false); // removed from use as my mask } if (mask) { @@ -7667,7 +7667,7 @@ void QQuickItem::setContainsMask(QObject *mask) quickMask = qobject_cast(mask); if (quickMask) { QQuickItemPrivate *maskPrivate = QQuickItemPrivate::get(quickMask); - maskPrivate->registerAsContainsMask(this, true); // telling maskPrivate that "this" is using it as mask + maskPrivate->registerAsContainmentMask(this, true); // telling maskPrivate that "this" is using it as mask } emit containmentMaskChanged(); } -- cgit v1.2.3