diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-09-09 12:42:40 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-09-09 20:41:28 +0000 |
commit | 945c59f42fd1ab171df90b137ca40286120364f7 (patch) | |
tree | b2685d4821e900088f72fe71a48f6a57cb6f34b0 /src/controls | |
parent | 399a4403b45026df1994f26324f6360b14977956 (diff) |
QQuickContainer: update variable names
This piece of code was promoted from QQuickTabBar to QQuickContainer
at some point -> "bar" looks confusing.
Change-Id: I8e1c1c2233bf34ed3cfacbc539aeb98c2a945012
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/controls')
-rw-r--r-- | src/controls/qquickcontainer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/controls/qquickcontainer.cpp b/src/controls/qquickcontainer.cpp index c185feb4..5138dc95 100644 --- a/src/controls/qquickcontainer.cpp +++ b/src/controls/qquickcontainer.cpp @@ -134,14 +134,14 @@ void QQuickContainerPrivate::itemDestroyed(QQuickItem *item) void QQuickContainerPrivate::contentData_append(QQmlListProperty<QObject> *prop, QObject *obj) { QQuickContainerPrivate *p = static_cast<QQuickContainerPrivate *>(prop->data); - QQuickContainer *bar = static_cast<QQuickContainer *>(prop->object); + QQuickContainer *q = static_cast<QQuickContainer *>(prop->object); QQuickItem *item = qobject_cast<QQuickItem *>(obj); if (item) { if (QQuickItemPrivate::get(item)->isTransparentForPositioner()) { QQuickItemPrivate::get(item)->addItemChangeListener(p, QQuickItemPrivate::SiblingOrder); item->setParentItem(p->contentItem); } else if (p->contentModel->indexOf(item, Q_NULLPTR) == -1) { - bar->addItem(item); + q->addItem(item); } } else { p->contentData.append(obj); @@ -168,8 +168,8 @@ void QQuickContainerPrivate::contentData_clear(QQmlListProperty<QObject> *prop) void QQuickContainerPrivate::contentChildren_append(QQmlListProperty<QQuickItem> *prop, QQuickItem *item) { - QQuickContainer *bar = static_cast<QQuickContainer *>(prop->object); - bar->addItem(item); + QQuickContainer *q = static_cast<QQuickContainer *>(prop->object); + q->addItem(item); } int QQuickContainerPrivate::contentChildren_count(QQmlListProperty<QQuickItem> *prop) @@ -180,8 +180,8 @@ int QQuickContainerPrivate::contentChildren_count(QQmlListProperty<QQuickItem> * QQuickItem *QQuickContainerPrivate::contentChildren_at(QQmlListProperty<QQuickItem> *prop, int index) { - QQuickContainer *bar = static_cast<QQuickContainer *>(prop->object); - return bar->itemAt(index); + QQuickContainer *q = static_cast<QQuickContainer *>(prop->object); + return q->itemAt(index); } void QQuickContainerPrivate::contentChildren_clear(QQmlListProperty<QQuickItem> *prop) |