feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CorePlugin: Remove foreach / Q_FOREACH usage part 2

Browse Source 
Task-number: QTCREATORBUG-27464
Change-Id: I4767c333c2724c954e63a7297c5013d11ae71777
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Artem Sokolovskii
2022-05-03 12:56:44 +02:00
parent 089e1edcbf
commit 85d2159e41
20 changed files with 109 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/coreplugin/sidebar.cpp
View File

@@ -85,13 +85,13 @@ SideBar::SideBar(QList<SideBarItem*> itemList,
d(new SideBarPrivate)
{
setOrientation(Qt::Vertical);
foreach (SideBarItem *item, itemList) {
for (SideBarItem *item : qAsConst(itemList)) {
d->m_itemMap.insert(item->id(), item);
d->m_availableItemIds.append(item->id());
d->m_availableItemTitles.append(item->title());
}
foreach (SideBarItem *item, defaultVisible) {
for (SideBarItem *item : qAsConst(defaultVisible)) {
if (!itemList.contains(item))
continue;
d->m_defaultVisible.append(item->id());
@@ -100,7 +100,7 @@ SideBar::SideBar(QList<SideBarItem*> itemList,
SideBar::~SideBar()
{
foreach (const QPointer<SideBarItem> &i, d->m_itemMap)
for (const QPointer<SideBarItem> &i : qAsConst(d->m_itemMap))
if (!i.isNull())
delete i.data();
delete d;
@@ -160,14 +160,14 @@ void SideBar::makeItemAvailable(SideBarItem *item)
void SideBar::setUnavailableItemIds(const QStringList &itemIds)
{
// re-enable previous items
foreach (const QString &id, d->m_unavailableItemIds) {
for (const QString &id : qAsConst(d->m_unavailableItemIds)) {
d->m_availableItemIds.append(id);
d->m_availableItemTitles.append(d->m_itemMap.value(id).data()->title());
}
d->m_unavailableItemIds.clear();
foreach (const QString &id, itemIds) {
for (const QString &id : itemIds) {
if (!d->m_unavailableItemIds.contains(id))
d->m_unavailableItemIds.append(id);
d->m_availableItemIds.removeAll(id);
@@ -250,7 +250,7 @@ void SideBar::closeSubWidget()
void SideBar::updateWidgets()
{
foreach (Internal::SideBarWidget *i, d->m_widgets)
for (Internal::SideBarWidget *i : qAsConst(d->m_widgets))
i->updateAvailableItems();
}
@@ -276,7 +276,7 @@ void SideBar::saveSettings(QSettings *settings, const QString &name)
void SideBar::closeAllWidgets()
{
foreach (Internal::SideBarWidget *widget, d->m_widgets)
for (Internal::SideBarWidget *widget : qAsConst(d->m_widgets))
removeSideBarWidget(widget);
}
@@ -288,9 +288,9 @@ void SideBar::readSettings(QSettings *settings, const QString &name)
const QString viewsKey = prefix + QLatin1String("Views");
if (settings->contains(viewsKey)) {
QStringList views = settings->value(viewsKey).toStringList();
const QStringList views = settings->value(viewsKey).toStringList();
if (!views.isEmpty()) {
foreach (const QString &id, views)
for (const QString &id : views)
if (availableItemIds().contains(id))
insertSideBarWidget(d->m_widgets.count(), id);
@@ -299,7 +299,7 @@ void SideBar::readSettings(QSettings *settings, const QString &name)
}
}
if (d->m_widgets.size() == 0) {
foreach (const QString &id, d->m_defaultVisible)
for (const QString &id : qAsConst(d->m_defaultVisible))
insertSideBarWidget(d->m_widgets.count(), id);
}