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 +++--- src/quick/items/qquickitem.h | 4 ++-- src/quick/items/qquickitem_p.h | 2 +- 3 files changed, 6 insertions(+), 6 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(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(); } diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h index 85dddd30e3..cfdb2ad5b7 100644 --- a/src/quick/items/qquickitem.h +++ b/src/quick/items/qquickitem.h @@ -144,7 +144,7 @@ class Q_QUICK_EXPORT QQuickItem : public QObject, public QQmlParserStatus Q_PROPERTY(bool antialiasing READ antialiasing WRITE setAntialiasing NOTIFY antialiasingChanged RESET resetAntialiasing) Q_PROPERTY(qreal implicitWidth READ implicitWidth WRITE setImplicitWidth NOTIFY implicitWidthChanged) Q_PROPERTY(qreal implicitHeight READ implicitHeight WRITE setImplicitHeight NOTIFY implicitHeightChanged) - Q_PROPERTY(QObject *containmentMask READ containmentMask WRITE setContainsMask NOTIFY containmentMaskChanged REVISION 11) + Q_PROPERTY(QObject *containmentMask READ containmentMask WRITE setContainmentMask NOTIFY containmentMaskChanged REVISION 11) Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQuickItemLayer *layer READ layer DESIGNABLE false CONSTANT FINAL) @@ -322,7 +322,7 @@ public: Q_INVOKABLE virtual bool contains(const QPointF &point) const; QObject *containmentMask() const; - void setContainsMask(QObject *mask); + void setContainmentMask(QObject *mask); QTransform itemTransform(QQuickItem *, bool *) const; QPointF mapToItem(const QQuickItem *item, const QPointF &point) const; diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index fd0d08b49c..93287cf0aa 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -390,7 +390,7 @@ public: // Contains mask QPointer mask; // If the mask is an Item, inform it that it's being used as a mask (true) or is no longer being used (false) - virtual void registerAsContainsMask(QQuickItem * /* maskedItem */, bool /* set */) { } + virtual void registerAsContainmentMask(QQuickItem * /* maskedItem */, bool /* set */) { } QQuickAnchors *anchors() const; mutable QQuickAnchors *_anchors; -- cgit v1.2.3