From 13604e3fcc12a536d228f415ce65ca1c86b7015b Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sun, 4 Sep 2016 20:06:12 +0200 Subject: Eradicate Q_FOREACH loops and mark the libraries as Q_FOREACH-free Change-Id: I4dbad7ab4c9f467b2e2fd90eff44e1c4a58d43e2 Reviewed-by: Jake Petroules --- src/imports/winextras/qquickjumplist.cpp | 5 +++-- src/imports/winextras/qquickjumplistcategory.cpp | 2 +- src/imports/winextras/qquickthumbnailtoolbar.cpp | 2 +- src/imports/winextras/winextras.pro | 2 ++ src/winextras/qwineventfilter.cpp | 3 ++- src/winextras/qwinjumplist.cpp | 8 ++++---- src/winextras/qwinthumbnailtoolbar.cpp | 2 +- src/winextras/winextras.pro | 2 ++ 8 files changed, 16 insertions(+), 10 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 QQuickJumpListCategory::toItemList() const { QList 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 \ diff --git a/src/winextras/qwineventfilter.cpp b/src/winextras/qwineventfilter.cpp index 3f6f013..6b31e71 100644 --- a/src/winextras/qwineventfilter.cpp +++ b/src/winextras/qwineventfilter.cpp @@ -113,7 +113,8 @@ void QWinEventFilter::setup() QWindow *QWinEventFilter::findWindow(HWND handle) { const WId wid = reinterpret_cast(handle); - foreach (QWindow *topLevel, QGuiApplication::topLevelWindows()) { + const auto topLevels = QGuiApplication::topLevelWindows(); + for (QWindow *topLevel : topLevels) { if (topLevel->handle() && topLevel->winId() == wid) return topLevel; } diff --git a/src/winextras/qwinjumplist.cpp b/src/winextras/qwinjumplist.cpp index 2e1b8ce..9274cc5 100644 --- a/src/winextras/qwinjumplist.cpp +++ b/src/winextras/qwinjumplist.cpp @@ -148,7 +148,7 @@ void QWinJumpListPrivate::_q_rebuild() appendKnownCategory(KDC_RECENT); if (frequent && frequent->isVisible()) appendKnownCategory(KDC_FREQUENT); - foreach (QWinJumpListCategory *category, categories) { + for (QWinJumpListCategory *category : qAsConst(categories)) { if (category->isVisible()) appendCustomCategory(category); } @@ -272,7 +272,7 @@ IObjectCollection *QWinJumpListPrivate::toComCollection(const QListAddObject(iitem); @@ -562,7 +562,7 @@ void QWinJumpList::addCategory(QWinJumpListCategory *category) QWinJumpListCategory *QWinJumpList::addCategory(const QString &title, const QList items) { QWinJumpListCategory *category = new QWinJumpListCategory(title); - foreach (QWinJumpListItem *item, items) + for (QWinJumpListItem *item : items) category->addItem(item); addCategory(category); return category; @@ -580,7 +580,7 @@ void QWinJumpList::clear() frequent()->clear(); if (d->tasks) d->tasks->clear(); - foreach (QWinJumpListCategory *category, d->categories) + for (QWinJumpListCategory *category : qAsConst(d->categories)) category->clear(); d->destroy(); } diff --git a/src/winextras/qwinthumbnailtoolbar.cpp b/src/winextras/qwinthumbnailtoolbar.cpp index 58978f9..d7e4ced 100644 --- a/src/winextras/qwinthumbnailtoolbar.cpp +++ b/src/winextras/qwinthumbnailtoolbar.cpp @@ -199,7 +199,7 @@ void QWinThumbnailToolBar::setButtons(const QList &bu { Q_D(QWinThumbnailToolBar); d->buttonList.clear(); - Q_FOREACH (QWinThumbnailToolButton *button, buttons) + for (QWinThumbnailToolButton *button : buttons) addButton(button); d->_q_updateToolbar(); } diff --git a/src/winextras/winextras.pro b/src/winextras/winextras.pro index a899f6c..5d93c6b 100644 --- a/src/winextras/winextras.pro +++ b/src/winextras/winextras.pro @@ -2,6 +2,8 @@ TARGET = QtWinExtras QT += gui-private core-private +DEFINES += QT_NO_FOREACH + SOURCES += \ qwinfunctions.cpp \ qwinfunctions_p.cpp \ -- cgit v1.2.3