diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2016-09-04 20:06:12 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2016-09-05 08:04:27 +0000 |
commit | 13604e3fcc12a536d228f415ce65ca1c86b7015b (patch) | |
tree | 43d8b9cbb87c1ee7be0e3a8d56cd29c7a21fb1f6 /src/imports | |
parent | 3393a78af194e3fe2db61f8b3d018a599270b796 (diff) |
Eradicate Q_FOREACH loops and mark the libraries as Q_FOREACH-freev5.8.0-beta1
Change-Id: I4dbad7ab4c9f467b2e2fd90eff44e1c4a58d43e2
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/winextras/qquickjumplist.cpp | 5 | ||||
-rw-r--r-- | src/imports/winextras/qquickjumplistcategory.cpp | 2 | ||||
-rw-r--r-- | src/imports/winextras/qquickthumbnailtoolbar.cpp | 2 | ||||
-rw-r--r-- | src/imports/winextras/winextras.pro | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/src/imports/winextras/qquickjumplist.cpp b/src/imports/winextras/qquickjumplist.cpp index a60de40..0f210c7 100644 --- a/src/imports/winextras/qquickjumplist.cpp +++ b/src/imports/winextras/qquickjumplist.cpp @@ -170,10 +170,11 @@ void QQuickJumpList::rebuild() jumpList.frequent()->setVisible(m_frequent && m_frequent->isVisible()); if (m_tasks && m_tasks->isVisible()) { jumpList.tasks()->setVisible(true); - foreach (QWinJumpListItem *item, m_tasks->toItemList()) + const auto items = m_tasks->toItemList(); + for (QWinJumpListItem *item : items) jumpList.tasks()->addItem(item); } - foreach (QQuickJumpListCategory *category, m_categories) { + for (QQuickJumpListCategory *category : qAsConst(m_categories)) { if (category->isVisible()) jumpList.addCategory(category->title(), category->toItemList())->setVisible(true); } diff --git a/src/imports/winextras/qquickjumplistcategory.cpp b/src/imports/winextras/qquickjumplistcategory.cpp index a69534f..052a4e6 100644 --- a/src/imports/winextras/qquickjumplistcategory.cpp +++ b/src/imports/winextras/qquickjumplistcategory.cpp @@ -127,7 +127,7 @@ void QQuickJumpListCategory::setVisible(bool visible) QList<QWinJumpListItem *> QQuickJumpListCategory::toItemList() const { QList<QWinJumpListItem *> items; - foreach (QQuickJumpListItem *item, m_items) + for (QQuickJumpListItem *item : m_items) items.append(item->toJumpListItem()); return items; } diff --git a/src/imports/winextras/qquickthumbnailtoolbar.cpp b/src/imports/winextras/qquickthumbnailtoolbar.cpp index ef7e079..00eb1b5 100644 --- a/src/imports/winextras/qquickthumbnailtoolbar.cpp +++ b/src/imports/winextras/qquickthumbnailtoolbar.cpp @@ -115,7 +115,7 @@ void QQuickThumbnailToolBar::removeButton(QQuickThumbnailToolButton *button) void QQuickThumbnailToolBar::clear() { m_toolbar.clear(); - foreach (QQuickThumbnailToolButton *button, m_buttons) + for (QQuickThumbnailToolButton *button : qAsConst(m_buttons)) button->deleteLater(); m_buttons.clear(); emit countChanged(); diff --git a/src/imports/winextras/winextras.pro b/src/imports/winextras/winextras.pro index 019c7de..0d6ec55 100644 --- a/src/imports/winextras/winextras.pro +++ b/src/imports/winextras/winextras.pro @@ -5,6 +5,8 @@ IMPORT_VERSION = 1.0 QT += qml quick winextras winextras-private +DEFINES += QT_NO_FOREACH + QML_FILES += \ JumpListLink.qml \ JumpListDestination.qml \ |