diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp index 2415f567893..f7e27b8b60d 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp @@ -116,13 +116,13 @@ void AutotoolsBuildSystem::makefileParsingFinished() const QFileInfo fileInfo = projectFilePath().toFileInfo(); const QDir dir = fileInfo.absoluteDir(); const QStringList files = m_makefileParserThread->sources(); - foreach (const QString& file, files) + for (const QString& file : files) m_files.append(dir.absoluteFilePath(file)); // Watch for changes of Makefile.am files. If a Makefile.am file // has been changed, the project tree must be reparsed. const QStringList makefiles = m_makefileParserThread->makefiles(); - foreach (const QString &makefile, makefiles) { + for (const QString &makefile : makefiles) { const QString absMakefile = dir.absoluteFilePath(makefile); m_files.append(absMakefile); @@ -161,7 +161,7 @@ static QStringList filterIncludes(const QString &absSrc, const QString &absBuild const QStringList &in) { QStringList result; - foreach (const QString i, in) { + for (const QString &i : in) { QString out = i; out.replace(QLatin1String("$(top_srcdir)"), absSrc); out.replace(QLatin1String("$(abs_top_srcdir)"), absSrc); diff --git a/src/plugins/bineditor/bineditorwidget.cpp b/src/plugins/bineditor/bineditorwidget.cpp index d2ea7b28c49..2ae54122494 100644 --- a/src/plugins/bineditor/bineditorwidget.cpp +++ b/src/plugins/bineditor/bineditorwidget.cpp @@ -905,7 +905,7 @@ void BinEditorWidget::paintEvent(QPaintEvent *e) int item_x = -xoffset + m_margin + c * m_columnWidth + m_labelWidth; QColor color; - foreach (const Markup &m, m_markup) { + for (const Markup &m : qAsConst(m_markup)) { if (m.covers(lineAddress + c)) { color = m.color; break; @@ -1236,7 +1236,7 @@ QString BinEditorWidget::toolTip(const QHelpEvent *helpEvent) const str << "

" << tr("Memory at 0x%1").arg(address, 0, 16) << "

"; - foreach (const Markup &m, m_markup) { + for (const Markup &m : qAsConst(m_markup)) { if (m.covers(address) && !m.toolTip.isEmpty()) { str << "

" << m.toolTip << "


"; break; diff --git a/src/plugins/classview/classviewutils.cpp b/src/plugins/classview/classviewutils.cpp index cebea9a6f28..d33cb2090a0 100644 --- a/src/plugins/classview/classviewutils.cpp +++ b/src/plugins/classview/classviewutils.cpp @@ -43,7 +43,7 @@ namespace Internal { QSet roleToLocations(const QList &locationsVar) { QSet locations; - foreach (const QVariant &loc, locationsVar) { + for (const QVariant &loc : locationsVar) { if (loc.canConvert()) locations.insert(loc.value()); } diff --git a/src/plugins/clearcase/activityselector.cpp b/src/plugins/clearcase/activityselector.cpp index ad7644d3946..952b9278d44 100644 --- a/src/plugins/clearcase/activityselector.cpp +++ b/src/plugins/clearcase/activityselector.cpp @@ -77,9 +77,9 @@ void ActivitySelector::userChanged() bool ActivitySelector::refresh() { int current; - QList activities = ClearCasePlugin::activities(¤t); + const QList activities = ClearCasePlugin::activities(¤t); m_cmbActivity->clear(); - foreach (const QStringPair &activity, activities) + for (const QStringPair &activity : activities) m_cmbActivity->addItem(activity.second, activity.first); m_cmbActivity->setCurrentIndex(current); m_cmbActivity->updateGeometry(); diff --git a/src/plugins/clearcase/clearcasesettings.cpp b/src/plugins/clearcase/clearcasesettings.cpp index be57ebcd4a7..e32593e62b7 100644 --- a/src/plugins/clearcase/clearcasesettings.cpp +++ b/src/plugins/clearcase/clearcasesettings.cpp @@ -88,7 +88,8 @@ void ClearCaseSettings::fromSettings(QSettings *settings) indexOnlyVOBs = settings->value(QLatin1String(indexOnlyVOBsC), QString()).toString(); extDiffAvailable = !Utils::Environment::systemEnvironment().searchInPath(QLatin1String("diff")).isEmpty(); settings->beginGroup(QLatin1String(totalFilesKeyC)); - foreach (const QString &view, settings->childKeys()) + const QStringList views = settings->childKeys(); + for (const QString &view : views) totalFiles[view] = settings->value(view).toInt(); settings->endGroup(); settings->endGroup(); diff --git a/src/plugins/macros/actionmacrohandler.cpp b/src/plugins/macros/actionmacrohandler.cpp index 6238875b0d8..074f5458398 100644 --- a/src/plugins/macros/actionmacrohandler.cpp +++ b/src/plugins/macros/actionmacrohandler.cpp @@ -53,8 +53,8 @@ ActionMacroHandler::ActionMacroHandler() this, &ActionMacroHandler::addCommand); // Register all existing scriptable actions - QList commands = ActionManager::commands(); - foreach (Command *command, commands) { + const QList commands = ActionManager::commands(); + for (Command *command : commands) { if (command->isScriptable()) registerCommand(command->id()); } diff --git a/src/plugins/macros/macro.cpp b/src/plugins/macros/macro.cpp index a102d10040d..eda04527ed9 100644 --- a/src/plugins/macros/macro.cpp +++ b/src/plugins/macros/macro.cpp @@ -143,7 +143,7 @@ bool Macro::save(const QString &fileName, QWidget *parent) QDataStream stream(saver.file()); stream << d->version; stream << d->description; - foreach (const MacroEvent &event, d->events) { + for (const MacroEvent &event : qAsConst(d->events)) { event.save(stream); } saver.setResult(&stream); diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp index 0b757c41546..e7669f8cc3c 100644 --- a/src/plugins/macros/macromanager.cpp +++ b/src/plugins/macros/macromanager.cpp @@ -131,9 +131,9 @@ void MacroManagerPrivate::initialize() const QDir dir(MacroManager::macrosDirectory()); QStringList filter; filter << QLatin1String("*.") + QLatin1String(Constants::M_EXTENSION); - QStringList files = dir.entryList(filter, QDir::Files); + const QStringList files = dir.entryList(filter, QDir::Files); - foreach (const QString &name, files) { + for (const QString &name : files) { QString fileName = dir.absolutePath() + QLatin1Char('/') + name; auto macro = new Macro; if (macro->loadHeader(fileName)) @@ -196,10 +196,11 @@ void MacroManagerPrivate::changeMacroDescription(Macro *macro, const QString &de bool MacroManagerPrivate::executeMacro(Macro *macro) { bool error = !macro->load(); - foreach (const MacroEvent ¯oEvent, macro->events()) { + const QList macroEvents = macro->events(); + for (const MacroEvent ¯oEvent : macroEvents) { if (error) break; - foreach (IMacroHandler *handler, handlers) { + for (IMacroHandler *handler : qAsConst(handlers)) { if (handler->canExecuteEvent(macroEvent)) { if (!handler->executeEvent(macroEvent)) error = true; @@ -255,8 +256,8 @@ MacroManager::MacroManager() : MacroManager::~MacroManager() { // Cleanup macro - QStringList macroList = d->macros.keys(); - foreach (const QString &name, macroList) + const QStringList macroList = d->macros.keys(); + for (const QString &name : macroList) d->removeMacro(name); // Cleanup handlers @@ -277,7 +278,7 @@ void MacroManager::startMacro() Core::ActionManager::command(Constants::END_MACRO)->action()->setEnabled(true); Core::ActionManager::command(Constants::EXECUTE_LAST_MACRO)->action()->setEnabled(false); Core::ActionManager::command(Constants::SAVE_LAST_MACRO)->action()->setEnabled(false); - foreach (IMacroHandler *handler, d->handlers) + for (IMacroHandler *handler : qAsConst(d->handlers)) handler->startRecording(d->currentMacro); const QString endShortcut = Core::ActionManager::command(Constants::END_MACRO) @@ -302,7 +303,7 @@ void MacroManager::endMacro() Core::ActionManager::command(Constants::END_MACRO)->action()->setEnabled(false); Core::ActionManager::command(Constants::EXECUTE_LAST_MACRO)->action()->setEnabled(true); Core::ActionManager::command(Constants::SAVE_LAST_MACRO)->action()->setEnabled(true); - foreach (IMacroHandler *handler, d->handlers) + for (IMacroHandler *handler : qAsConst(d->handlers)) handler->endRecordingMacro(d->currentMacro); d->isRecording = false; diff --git a/src/plugins/macros/macrooptionswidget.cpp b/src/plugins/macros/macrooptionswidget.cpp index 0408dd9377b..d3815cff078 100644 --- a/src/plugins/macros/macrooptionswidget.cpp +++ b/src/plugins/macros/macrooptionswidget.cpp @@ -130,7 +130,7 @@ void MacroOptionsWidget::remove() void MacroOptionsWidget::apply() { // Remove macro - foreach (const QString &name, m_macroToRemove) { + for (const QString &name : qAsConst(m_macroToRemove)) { MacroManager::instance()->deleteMacro(name); m_macroToChange.remove(name); } diff --git a/src/plugins/mercurial/commiteditor.cpp b/src/plugins/mercurial/commiteditor.cpp index 84abca39824..39a88cd294a 100644 --- a/src/plugins/mercurial/commiteditor.cpp +++ b/src/plugins/mercurial/commiteditor.cpp @@ -62,7 +62,7 @@ void CommitEditor::setFields(const QFileInfo &repositoryRoot, const QString &bra QStringList shouldTrack; - foreach (const VcsBaseClient::StatusItem &item, repoStatus) { + for (const VcsBaseClient::StatusItem &item : repoStatus) { if (item.flags == QLatin1String("Untracked")) shouldTrack.append(item.file); else @@ -71,8 +71,8 @@ void CommitEditor::setFields(const QFileInfo &repositoryRoot, const QString &bra VcsBaseSubmitEditor::filterUntrackedFilesOfProject(fileModel->repositoryRoot(), &shouldTrack); - foreach (const QString &track, shouldTrack) { - foreach (const VcsBaseClient::StatusItem &item, repoStatus) { + for (const QString &track : qAsConst(shouldTrack)) { + for (const VcsBaseClient::StatusItem &item : repoStatus) { if (item.file == track) fileModel->addFile(item.file, item.flags, Unchecked); } diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp index 21a50b6f1be..c4d7f89abb3 100644 --- a/src/plugins/mercurial/mercurialclient.cpp +++ b/src/plugins/mercurial/mercurialclient.cpp @@ -104,7 +104,7 @@ bool MercurialClient::manifestSync(const FilePath &repository, const QString &re const QFileInfo needle = QFileInfo(repositoryDir, relativeFilename); const QStringList files = proc.stdOut().split(QLatin1Char('\n')); - foreach (const QString &fileName, files) { + for (const QString &fileName : files) { const QFileInfo managedFile(repositoryDir, fileName); if (needle == managedFile) return true; diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp index a177d410284..6cd0c778ec4 100644 --- a/src/plugins/mercurial/mercurialplugin.cpp +++ b/src/plugins/mercurial/mercurialplugin.cpp @@ -732,7 +732,7 @@ void MercurialPluginPrivate::updateActions(VcsBasePluginPrivate::ActionState as) revertFile->setParameter(filename); statusFile->setParameter(filename); - foreach (QAction *repoAction, m_repositoryActionList) + for (QAction *repoAction : qAsConst(m_repositoryActionList)) repoAction->setEnabled(repoEnabled); } diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index 1b5d2a03f29..b415b219674 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -724,7 +724,8 @@ void PerforcePluginPrivate::printOpenedFileList() QString errorMessage; QString mapped; const QChar delimiter = QLatin1Char('#'); - foreach (const QString &line, perforceResponse.stdOut.split(QLatin1Char('\n'))) { + const QStringList lines = perforceResponse.stdOut.split(QLatin1Char('\n')); + for (const QString &line : lines) { mapped.clear(); const int delimiterPos = line.indexOf(delimiter); if (delimiterPos > 0) @@ -787,9 +788,9 @@ void PerforcePluginPrivate::startSubmitProject() return; } - QStringList filesLines = filesResult.stdOut.split(QLatin1Char('\n')); + const QStringList filesLines = filesResult.stdOut.split(QLatin1Char('\n')); QStringList depotFileNames; - foreach (const QString &line, filesLines) { + for (const QString &line : filesLines) { depotFileNames.append(line.left(line.lastIndexOf(QRegularExpression("#[0-9]+\\s-\\s")))); } if (depotFileNames.isEmpty()) { diff --git a/src/plugins/perforce/perforcesubmiteditor.cpp b/src/plugins/perforce/perforcesubmiteditor.cpp index 115be50ad6f..a26d71ee8b9 100644 --- a/src/plugins/perforce/perforcesubmiteditor.cpp +++ b/src/plugins/perforce/perforcesubmiteditor.cpp @@ -125,7 +125,7 @@ void PerforceSubmitEditor::updateFields() lines = m_entries.value(QLatin1String("Files")).split(newLine); // split up "file#add" and store complete spec line as user data - foreach (const QString &specLine, lines) { + for (const QString &specLine : qAsConst(lines)) { const QStringList list = specLine.split(QLatin1Char('#')); if (list.size() == 2) { const QString file = list.at(0).trimmed();