diff options
author | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-01-15 13:21:16 +0300 |
---|---|---|
committer | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-01-15 13:03:33 +0000 |
commit | f9a14321a42485f36c1445d81033995b5d820ce0 (patch) | |
tree | d37f7d803bab51567762865380bc9c2c61f0f5b0 /src | |
parent | 6cbd098190ce4fc624f8f6427d9caa460109f324 (diff) |
Templates: replace foreach with range-based for
Change-Id: Iadb9971e01bbf561e37938e5a2b36fbce0af68a5
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/templates/qquickabstractbutton.cpp | 7 | ||||
-rw-r--r-- | src/templates/qquickbuttongroup.cpp | 2 | ||||
-rw-r--r-- | src/templates/qquickcontrol.cpp | 6 | ||||
-rw-r--r-- | src/templates/qquickpageindicator.cpp | 3 | ||||
-rw-r--r-- | src/templates/qquickstackview.cpp | 2 | ||||
-rw-r--r-- | src/templates/qquickstackview_p.cpp | 4 | ||||
-rw-r--r-- | src/templates/qquicktumbler.cpp | 6 |
7 files changed, 18 insertions, 12 deletions
diff --git a/src/templates/qquickabstractbutton.cpp b/src/templates/qquickabstractbutton.cpp index d2f1c7ec..9839cc4c 100644 --- a/src/templates/qquickabstractbutton.cpp +++ b/src/templates/qquickabstractbutton.cpp @@ -147,7 +147,7 @@ QQuickAbstractButton *QQuickAbstractButtonPrivate::findCheckedButton() const if (group) return qobject_cast<QQuickAbstractButton *>(group->checkedButton()); - QList<QQuickAbstractButton *> buttons = findExclusiveButtons(); + const QList<QQuickAbstractButton *> buttons = findExclusiveButtons(); // TODO: A singular QRadioButton can be unchecked, which seems logical, // because there's nothing to be exclusive with. However, a RadioButton // from QtQuick.Controls 1.x can never be unchecked, which is the behavior @@ -157,7 +157,7 @@ QQuickAbstractButton *QQuickAbstractButtonPrivate::findCheckedButton() const if (!autoExclusive /*|| buttons.count() == 1*/) return Q_NULLPTR; - foreach (QQuickAbstractButton *button, buttons) { + for (QQuickAbstractButton *button : buttons) { if (button->isChecked() && button != q) return button; } @@ -176,7 +176,8 @@ QList<QQuickAbstractButton *> QQuickAbstractButtonPrivate::findExclusiveButtons( buttons += button; } } else if (parentItem) { - foreach (QQuickItem *child, parentItem->childItems()) { + const auto childItems = parentItem->childItems(); + for (QQuickItem *child : childItems) { QQuickAbstractButton *button = qobject_cast<QQuickAbstractButton *>(child); if (button && button->autoExclusive() && !QQuickAbstractButtonPrivate::get(button)->group) buttons += button; diff --git a/src/templates/qquickbuttongroup.cpp b/src/templates/qquickbuttongroup.cpp index 6fddcbc4..042b4c38 100644 --- a/src/templates/qquickbuttongroup.cpp +++ b/src/templates/qquickbuttongroup.cpp @@ -143,7 +143,7 @@ public: void QQuickButtonGroupPrivate::clear() { - foreach (QQuickAbstractButton *button, buttons) { + for (QQuickAbstractButton *button : qAsConst(buttons)) { QQuickAbstractButtonPrivate::get(button)->group = Q_NULLPTR; QObjectPrivate::disconnect(button, &QQuickAbstractButton::checkedChanged, this, &QQuickButtonGroupPrivate::updateCurrent); } diff --git a/src/templates/qquickcontrol.cpp b/src/templates/qquickcontrol.cpp index d1abafe2..b8433853 100644 --- a/src/templates/qquickcontrol.cpp +++ b/src/templates/qquickcontrol.cpp @@ -282,7 +282,8 @@ void QQuickControlPrivate::updateFont(const QFont &f) void QQuickControlPrivate::updateFontRecur(QQuickItem *item, const QFont &f) { - foreach (QQuickItem *child, item->childItems()) { + const auto childItems = item->childItems(); + for (QQuickItem *child : childItems) { if (QQuickControl *control = qobject_cast<QQuickControl *>(child)) QQuickControlPrivate::get(control)->resolveFont(); else if (QQuickLabel *label = qobject_cast<QQuickLabel *>(child)) @@ -686,7 +687,8 @@ void QQuickControlPrivate::updateLocale(const QLocale &l, bool e) void QQuickControlPrivate::updateLocaleRecur(QQuickItem *item, const QLocale &l) { - foreach (QQuickItem *child, item->childItems()) { + const auto childItems = item->childItems(); + for (QQuickItem *child : childItems) { if (QQuickControl *control = qobject_cast<QQuickControl *>(child)) QQuickControlPrivate::get(control)->updateLocale(l, false); else diff --git a/src/templates/qquickpageindicator.cpp b/src/templates/qquickpageindicator.cpp index 331a1d85..31e31aa2 100644 --- a/src/templates/qquickpageindicator.cpp +++ b/src/templates/qquickpageindicator.cpp @@ -101,7 +101,8 @@ QQuickItem *QQuickPageIndicatorPrivate::itemAt(const QPoint &pos) const // find the nearest qreal distance = qInf(); QQuickItem *nearest = Q_NULLPTR; - foreach (QQuickItem *child, contentItem->childItems()) { + const auto childItems = contentItem->childItems(); + for (QQuickItem *child : childItems) { if (QQuickItemPrivate::get(child)->isTransparentForPositioner()) continue; diff --git a/src/templates/qquickstackview.cpp b/src/templates/qquickstackview.cpp index 90ca799f..3d39c80c 100644 --- a/src/templates/qquickstackview.cpp +++ b/src/templates/qquickstackview.cpp @@ -867,7 +867,7 @@ void QQuickStackView::geometryChanged(const QRectF &newGeometry, const QRectF &o QQuickControl::geometryChanged(newGeometry, oldGeometry); Q_D(QQuickStackView); - foreach (QQuickStackElement *element, d->elements) { + for (QQuickStackElement *element : qAsConst(d->elements)) { if (element->item) { if (!element->widthValid) element->item->setWidth(newGeometry.width()); diff --git a/src/templates/qquickstackview_p.cpp b/src/templates/qquickstackview_p.cpp index 06c605d2..1240d162 100644 --- a/src/templates/qquickstackview_p.cpp +++ b/src/templates/qquickstackview_p.cpp @@ -312,7 +312,7 @@ QList<QQuickStackElement *> QQuickStackViewPrivate::parseElements(QQmlV4Function QQuickStackElement *QQuickStackViewPrivate::findElement(QQuickItem *item) const { if (item) { - foreach (QQuickStackElement *e, elements) { + for (QQuickStackElement *e : qAsConst(elements)) { if (e->item == item) return e; } @@ -341,7 +341,7 @@ bool QQuickStackViewPrivate::pushElements(const QList<QQuickStackElement *> &ele { Q_Q(QQuickStackView); if (!elems.isEmpty()) { - foreach (QQuickStackElement *e, elems) { + for (QQuickStackElement *e : elems) { e->setIndex(elements.count()); elements += e; } diff --git a/src/templates/qquicktumbler.cpp b/src/templates/qquicktumbler.cpp index df1120ad..adfb1189 100644 --- a/src/templates/qquicktumbler.cpp +++ b/src/templates/qquicktumbler.cpp @@ -156,7 +156,8 @@ void QQuickTumblerPrivate::_q_updateItemHeights() // which doesn't affect them, only their getters. Q_Q(const QQuickTumbler); const qreal itemHeight = delegateHeight(q); - foreach (QQuickItem *childItem, contentItemChildItems(contentItem)) + const auto items = contentItemChildItems(contentItem); + for (QQuickItem *childItem : items) childItem->setHeight(itemHeight); } @@ -164,7 +165,8 @@ void QQuickTumblerPrivate::_q_updateItemWidths() { Q_Q(const QQuickTumbler); const qreal availableWidth = q->availableWidth(); - foreach (QQuickItem *childItem, contentItemChildItems(contentItem)) + const auto items = contentItemChildItems(contentItem); + for (QQuickItem *childItem : items) childItem->setWidth(availableWidth); } |