aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickitem.cpp
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2018-02-28 11:48:08 +0100
committerShawn Rutledge <shawn.rutledge@qt.io>2018-02-28 11:15:48 +0000
commit52d9a725098735e6350fe63cf471a27d4106ad18 (patch)
tree55c61ad0e73a63cc4f79eecc99860b228a93d014 /src/quick/items/qquickitem.cpp
parentc8702adf3140db887ea00f1520ae750fc4492b4c (diff)
finish renaming of containsMask -> containmentMask
Followup to 6fa746fa6 to rename setContainsMask and registerAsContainsMask Change-Id: Ifdfaf58dccb5fd3665615418e7f1ea09cb914c55 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
-rw-r--r--src/quick/items/qquickitem.cpp6
1 files changed, 3 insertions, 3 deletions
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<QQuickItem *>(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<QQuickItem *>(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();
}