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/winextras | |
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/winextras')
-rw-r--r-- | src/winextras/qwineventfilter.cpp | 3 | ||||
-rw-r--r-- | src/winextras/qwinjumplist.cpp | 8 | ||||
-rw-r--r-- | src/winextras/qwinthumbnailtoolbar.cpp | 2 | ||||
-rw-r--r-- | src/winextras/winextras.pro | 2 |
4 files changed, 9 insertions, 6 deletions
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<WId>(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 QList<QWinJumpList QWinJumpListPrivate::warning("QWinJumpList: failed to instantiate IObjectCollection", hresult); return 0; } - Q_FOREACH (QWinJumpListItem *item, list) { + for (QWinJumpListItem *item : list) { IUnknown *iitem = toICustomDestinationListItem(item); if (iitem) { collection->AddObject(iitem); @@ -562,7 +562,7 @@ void QWinJumpList::addCategory(QWinJumpListCategory *category) QWinJumpListCategory *QWinJumpList::addCategory(const QString &title, const QList<QWinJumpListItem *> 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<QWinThumbnailToolButton *> &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 \ |