diff options
author | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:53:11 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:53:11 +0100 |
commit | c5159ecfc36bc0f9bff45de78accd104b9637066 (patch) | |
tree | f63ce3effc703e23fb3f5e9ae3880e5759dfe8b0 /src/winextras/qwinjumplist.cpp | |
parent | 210b31fa48134ace767be47508b9918bcee9a22d (diff) | |
parent | 1b8836e00da53872bd3c285e5ab5ac8344ccd46c (diff) |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
src/imports/winextras/qquickjumplist.cpp
Change-Id: I2272b873c872bbabf7e274a478e3d16b92cdb434
Diffstat (limited to 'src/winextras/qwinjumplist.cpp')
-rw-r--r-- | src/winextras/qwinjumplist.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/winextras/qwinjumplist.cpp b/src/winextras/qwinjumplist.cpp index 9134e73..a277a74 100644 --- a/src/winextras/qwinjumplist.cpp +++ b/src/winextras/qwinjumplist.cpp @@ -143,7 +143,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); } @@ -267,7 +267,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); @@ -557,7 +557,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; @@ -575,7 +575,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(); } |