diff options
author | Alessandro Portale <[email protected]> | 2021-02-15 10:03:57 +0100 |
---|---|---|
committer | Alessandro Portale <[email protected]> | 2021-02-17 14:43:29 +0000 |
commit | 72d91dc94af1861c4374dab5698859149b21dbfd (patch) | |
tree | 3e51016b44c6a4db35fba150579e033bbdf2a274 | |
parent | 1d27f894bb8454693ff5fc5979dda0d9090dc7a8 (diff) |
Use qAsConst with non-const Qt containers in range-loops
... in various places
Change-Id: Ic6c0c1b9437a1ed402105c7a14a1f5f9454a68d4
Reviewed-by: Jarek Kobus <[email protected]>
55 files changed, 81 insertions, 85 deletions
diff --git a/src/plugins/autotest/qtest/qttestparser.cpp b/src/plugins/autotest/qtest/qttestparser.cpp index 8fb1344ba08..29e861a927e 100644 --- a/src/plugins/autotest/qtest/qttestparser.cpp +++ b/src/plugins/autotest/qtest/qttestparser.cpp @@ -148,7 +148,7 @@ static CPlusPlus::Document::Ptr declaringDocument(CPlusPlus::Document::Ptr doc, } } - for (const CPlusPlus::LookupItem &item : lookupItems) { + for (const CPlusPlus::LookupItem &item : qAsConst(lookupItems)) { if (CPlusPlus::Symbol *symbol = item.declaration()) { if (CPlusPlus::Class *toeClass = symbol->asClass()) { const QString declFileName = QLatin1String(toeClass->fileId()->chars(), diff --git a/src/plugins/autotest/quick/quicktestparser.cpp b/src/plugins/autotest/quick/quicktestparser.cpp index aafe7e07f3f..c08d0da3cf3 100644 --- a/src/plugins/autotest/quick/quicktestparser.cpp +++ b/src/plugins/autotest/quick/quicktestparser.cpp @@ -163,7 +163,7 @@ QList<Document::Ptr> QuickTestParser::scanDirectoryForQuickTestQmlFiles(const QS QList<Document::Ptr> foundDocs; - for (const QString &path : dirs) { + for (const QString &path : qAsConst(dirs)) { const QList<Document::Ptr> docs = snapshot.documentsInDirectory(path); for (const Document::Ptr &doc : docs) { const QFileInfo fi(doc->fileName()); diff --git a/src/plugins/autotest/testresultmodel.cpp b/src/plugins/autotest/testresultmodel.cpp index d31ca0c5db9..bc93a3ad653 100644 --- a/src/plugins/autotest/testresultmodel.cpp +++ b/src/plugins/autotest/testresultmodel.cpp @@ -361,7 +361,7 @@ void TestResultModel::recalculateMaxWidthOfFileName(const QFont &font) { const QFontMetrics fm(font); m_maxWidthOfFileName = 0; - for (const QString &fileName : m_fileNames) { + for (const QString &fileName : qAsConst(m_fileNames)) { int pos = fileName.lastIndexOf('/'); m_maxWidthOfFileName = qMax(m_maxWidthOfFileName, fm.horizontalAdvance(fileName.mid(pos + 1))); } diff --git a/src/plugins/autotest/testresultspane.cpp b/src/plugins/autotest/testresultspane.cpp index fc7d63c066a..b4d133d9586 100644 --- a/src/plugins/autotest/testresultspane.cpp +++ b/src/plugins/autotest/testresultspane.cpp @@ -294,7 +294,7 @@ void TestResultsPane::addOutputLine(const QByteArray &outputLine, OutputChannel const Utils::FormattedText formattedText = Utils::FormattedText{QString::fromUtf8(outputLine), m_defaultFormat}; - QList<Utils::FormattedText> formatted = channel == OutputChannel::StdOut + const QList<Utils::FormattedText> formatted = channel == OutputChannel::StdOut ? m_stdOutHandler.parseText(formattedText) : m_stdErrHandler.parseText(formattedText); diff --git a/src/plugins/autotest/testtreemodel.cpp b/src/plugins/autotest/testtreemodel.cpp index 3ee8acc6d75..9d5f3d6af08 100644 --- a/src/plugins/autotest/testtreemodel.cpp +++ b/src/plugins/autotest/testtreemodel.cpp @@ -381,7 +381,7 @@ void TestTreeModel::synchronizeTestTools() for (ITestTreeItem *oldFrameworkRoot : oldFrameworkRoots) takeItem(oldFrameworkRoot); // do NOT delete the ptr is still held by TestFrameworkManager - for (ITestTool *testTool : tools) { + for (ITestTool *testTool : qAsConst(tools)) { ITestTreeItem *testToolRootNode = testTool->rootNode(); if (testTool->active()) { invisibleRoot->appendChild(testToolRootNode); diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp index fbfb61b0a60..1706b95c50b 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp @@ -141,7 +141,7 @@ void AutotoolsBuildSystem::makefileParsingFinished() } auto newRoot = std::make_unique<ProjectNode>(project()->projectDirectory()); - for (const QString &f : m_files) { + for (const QString &f : qAsConst(m_files)) { const Utils::FilePath path = Utils::FilePath::fromString(f); newRoot->addNestedNode(std::make_unique<FileNode>(path, FileNode::fileTypeForFileName(path))); diff --git a/src/plugins/baremetal/debugservers/uvsc/uvproject.cpp b/src/plugins/baremetal/debugservers/uvsc/uvproject.cpp index 1834dbfe50e..fccd07eb1d4 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvproject.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvproject.cpp @@ -93,7 +93,7 @@ static void extractAllFiles(const DebuggerRunTool *runTool, QStringList &include const CppTools::ProjectInfo info = CppModelManager::instance()->projectInfo(project); const QVector<ProjectPart::Ptr> parts = info.projectParts(); for (const ProjectPart::Ptr &part : parts) { - for (const ProjectFile &file : part->files) { + for (const ProjectFile &file : qAsConst(part->files)) { if (!file.active) continue; const auto path = FilePath::fromString(file.path); @@ -104,7 +104,7 @@ static void extractAllFiles(const DebuggerRunTool *runTool, QStringList &include else if (file.path.endsWith(".s") && !assemblers.contains(path)) assemblers.push_back(path); } - for (const HeaderPath &include : part->headerPaths) { + for (const HeaderPath &include : qAsConst(part->headerPaths)) { if (!includes.contains(include.path)) includes.push_back(include.path); } diff --git a/src/plugins/beautifier/abstractsettings.cpp b/src/plugins/beautifier/abstractsettings.cpp index 3d9bc75b1a5..73df51d06c3 100644 --- a/src/plugins/beautifier/abstractsettings.cpp +++ b/src/plugins/beautifier/abstractsettings.cpp @@ -343,7 +343,7 @@ void AbstractSettings::readDocumentation() if (xml.readNext() == QXmlStreamReader::Characters) { m_docu << xml.text().toString(); const int index = m_docu.size() - 1; - for (const QString &key : keys) + for (const QString &key : qAsConst(keys)) m_options.insert(key, index); } } diff --git a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp index 26990ae25c2..d908eba363f 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp @@ -219,7 +219,7 @@ void ArtisticStyleSettings::createDocumentationFile() const // Write entry stream.writeStartElement(Constants::DOCUMENTATION_XMLENTRY); stream.writeStartElement(Constants::DOCUMENTATION_XMLKEYS); - for (const QString &key : keys) + for (const QString &key : qAsConst(keys)) stream.writeTextElement(Constants::DOCUMENTATION_XMLKEY, key); stream.writeEndElement(); const QString text = "<p><span class=\"option\">" diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index 1f181b0972e..71e294c28a9 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp @@ -578,7 +578,7 @@ void CMakeBuildSystem::updateProjectData() { QSet<QString> res; QStringList apps; - for (const auto &target : m_buildTargets) { + for (const auto &target : qAsConst(m_buildTargets)) { if (target.targetType == CMakeProjectManager::DynamicLibraryType) { res.insert(target.executable.parentDir().toString()); apps.push_back(target.executable.toUserOutput()); @@ -633,7 +633,7 @@ void CMakeBuildSystem::updateProjectData() } patchedConfig.append(settingFileItem); - for (const CMakeBuildTarget &bt : m_buildTargets) { + for (const CMakeBuildTarget &bt : qAsConst(m_buildTargets)) { const QString buildKey = bt.title; if (ProjectNode *node = p->findNodeForBuildKey(buildKey)) { if (auto targetNode = dynamic_cast<CMakeTargetNode *>(node)) diff --git a/src/plugins/cmakeprojectmanager/configmodel.cpp b/src/plugins/cmakeprojectmanager/configmodel.cpp index dc036d927d5..8dea7e57efc 100644 --- a/src/plugins/cmakeprojectmanager/configmodel.cpp +++ b/src/plugins/cmakeprojectmanager/configmodel.cpp @@ -303,7 +303,7 @@ void ConfigModel::generateTree() // Generate nodes for *all* prefixes QHash<QString, QList<Utils::TreeItem *>> prefixes; - for (const InternalDataItem &di : m_configuration) { + for (const InternalDataItem &di : qAsConst(m_configuration)) { const QString p = prefix(di.key); if (!prefixes.contains(p)) { prefixes.insert(p, {}); diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp index c9946dddd98..a1f66f9a5b3 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp +++ b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp @@ -481,7 +481,7 @@ bool MenuActionContainer::updateInternal() bool hasitems = false; QList<QAction *> actions = m_menu->actions(); - for (const Group &group : m_groups) { + for (const Group &group : qAsConst(m_groups)) { foreach (QObject *item, group.items) { if (auto container = qobject_cast<ActionContainerPrivate*>(item)) { actions.removeAll(container->menu()->menuAction()); diff --git a/src/plugins/coreplugin/basefilewizard.cpp b/src/plugins/coreplugin/basefilewizard.cpp index 3c608336691..d7b6d9e92ad 100644 --- a/src/plugins/coreplugin/basefilewizard.cpp +++ b/src/plugins/coreplugin/basefilewizard.cpp @@ -53,7 +53,7 @@ BaseFileWizard::BaseFileWizard(const BaseFileWizardFactory *factory, m_extraValues(extraValues), m_factory(factory) { - for (IFileWizardExtension *extension : g_fileWizardExtensions) + for (IFileWizardExtension *extension : qAsConst(g_fileWizardExtensions)) m_extensionPages += extension->extensionPages(factory); if (!m_extensionPages.empty()) @@ -66,7 +66,7 @@ void BaseFileWizard::initializePage(int id) if (page(id) == m_firstExtensionPage) { generateFileList(); - for (IFileWizardExtension *ex : g_fileWizardExtensions) + for (IFileWizardExtension *ex : qAsConst(g_fileWizardExtensions)) ex->firstExtensionPageShown(m_files, m_extraValues); } } @@ -96,7 +96,7 @@ void BaseFileWizard::accept() break; } - for (IFileWizardExtension *ex : g_fileWizardExtensions) { + for (IFileWizardExtension *ex : qAsConst(g_fileWizardExtensions)) { for (int i = 0; i < m_files.count(); i++) { ex->applyCodeStyle(&m_files[i]); } @@ -111,7 +111,7 @@ void BaseFileWizard::accept() bool removeOpenProjectAttribute = false; // Run the extensions - for (IFileWizardExtension *ex : g_fileWizardExtensions) { + for (IFileWizardExtension *ex : qAsConst(g_fileWizardExtensions)) { bool remove; if (!ex->processFiles(m_files, &remove, &errorMessage)) { if (!errorMessage.isEmpty()) diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp index aba417f77c3..3901b995e09 100644 --- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp +++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp @@ -610,7 +610,7 @@ void SettingsDialog::ensureCategoryWidget(Category *category) m_model.ensurePages(category); auto tabWidget = new QTabWidget; tabWidget->tabBar()->setObjectName("qc_settings_main_tabbar"); // easier lookup in Squish - for (IOptionsPage *page : category->pages) { + for (IOptionsPage *page : qAsConst(category->pages)) { QWidget *widget = page->widget(); ICore::setupScreenShooter(page->displayName(), widget); auto ssa = new SmartScrollArea(this); diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index f3fa8429832..d655e0aa285 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -3614,7 +3614,7 @@ bool EditorManager::restoreState(const QByteArray &state) // restore windows QVector<QVariantHash> windowStates; stream >> windowStates; - for (const QVariantHash &windowState : windowStates) { + for (const QVariantHash &windowState : qAsConst(windowStates)) { EditorWindow *window = d->createEditorWindow(); window->restoreState(windowState); window->show(); diff --git a/src/plugins/coreplugin/modemanager.cpp b/src/plugins/coreplugin/modemanager.cpp index 671b4e7c95e..46173ef8e94 100644 --- a/src/plugins/coreplugin/modemanager.cpp +++ b/src/plugins/coreplugin/modemanager.cpp @@ -211,7 +211,7 @@ void ModeManagerPrivate::extensionsInitializedHelper() Utils::sort(m_modes, &IMode::priority); std::reverse(m_modes.begin(), m_modes.end()); - for (IMode *mode : m_modes) + for (IMode *mode : qAsConst(m_modes)) appendMode(mode); if (m_pendingFirstActiveMode.isValid()) diff --git a/src/plugins/coreplugin/outputwindow.cpp b/src/plugins/coreplugin/outputwindow.cpp index e41989143ae..fb3df944361 100644 --- a/src/plugins/coreplugin/outputwindow.cpp +++ b/src/plugins/coreplugin/outputwindow.cpp @@ -520,7 +520,7 @@ void OutputWindow::flush() return; } d->queueTimer.stop(); - for (const auto &chunk : d->queuedOutput) + for (const auto &chunk : qAsConst(d->queuedOutput)) handleOutputChunk(chunk.first, chunk.second); d->queuedOutput.clear(); d->formatter.flush(); diff --git a/src/plugins/coreplugin/statusbarmanager.cpp b/src/plugins/coreplugin/statusbarmanager.cpp index 182375b264b..1366b0c0d02 100644 --- a/src/plugins/coreplugin/statusbarmanager.cpp +++ b/src/plugins/coreplugin/statusbarmanager.cpp @@ -113,7 +113,7 @@ static void createStatusBarManager() delete statusContext; // This is the catch-all on rampdown. Individual items may // have been removed earlier by destroyStatusBarWidget(). - for (const QPointer<IContext> &context : m_contexts) { + for (const QPointer<IContext> &context : qAsConst(m_contexts)) { ICore::removeContextObject(context); delete context; } diff --git a/src/plugins/coreplugin/welcomepagehelper.cpp b/src/plugins/coreplugin/welcomepagehelper.cpp index 8e2b3c61a9f..e7b183a964b 100644 --- a/src/plugins/coreplugin/welcomepagehelper.cpp +++ b/src/plugins/coreplugin/welcomepagehelper.cpp @@ -611,7 +611,7 @@ bool ListItemDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, const QPoint pos = mev->pos(); if (pos.y() > option.rect.y() + GridProxyModel::TagsSeparatorY) { //const QStringList tags = idx.data(Tags).toStringList(); - for (const auto &it : m_currentTagRects) { + for (const auto &it : qAsConst(m_currentTagRects)) { if (it.second.contains(pos)) emit tagClicked(it.first); } diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp index 82698473bff..43a709e0b3a 100644 --- a/src/plugins/cppeditor/cppquickfixes.cpp +++ b/src/plugins/cppeditor/cppquickfixes.cpp @@ -3113,7 +3113,7 @@ public: defaultImplTargetComboBox->insertItems(0, implTargetStrings); connect(defaultImplTargetComboBox, qOverload<int>(&QComboBox::currentIndexChanged), this, [this](int index) { - for (QComboBox * const cb : m_implTargetBoxes) + for (QComboBox * const cb : qAsConst(m_implTargetBoxes)) cb->setCurrentIndex(index); }); const auto defaultImplTargetLayout = new QHBoxLayout; @@ -4621,7 +4621,7 @@ public: } const QStringList memberFunctionsAsStrings = toStringList(memberFunctions); - for (Symbol *const member : dataMembers) { + for (Symbol *const member : qAsConst(dataMembers)) { ExistingGetterSetterData existing; existing.memberVariableName = QString::fromUtf8(member->identifier()->chars(), member->identifier()->size()); @@ -8000,7 +8000,7 @@ private: processIncludes(refactoring, filePath().toString()); } - for (auto &file : m_changes) + for (auto &file : qAsConst(m_changes)) file->apply(); } diff --git a/src/plugins/cppeditor/cppquickfixsettingswidget.cpp b/src/plugins/cppeditor/cppquickfixsettingswidget.cpp index b996bd255fc..c29da9209a5 100644 --- a/src/plugins/cppeditor/cppquickfixsettingswidget.cpp +++ b/src/plugins/cppeditor/cppquickfixsettingswidget.cpp @@ -159,7 +159,7 @@ void CppQuickFixSettingsWidget::loadSettings(CppQuickFixSettings *settings) ui->checkBox_setterSlots->setChecked(settings->setterAsSlot); ui->checkBox_signalWithNewValue->setChecked(settings->signalWithNewValue); ui->valueTypes->clear(); - for (const auto &valueType : settings->valueTypes) { + for (const auto &valueType : qAsConst(settings->valueTypes)) { auto item = new QListWidgetItem(valueType, ui->valueTypes); item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemNeverHasChildren); diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index 37d64208b18..b40d6e1ac85 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -343,9 +343,9 @@ void CompilerOptionsBuilder::addHeaderPathOptions() using ProjectExplorer::HeaderPath; using ProjectExplorer::HeaderPathType; - for (const HeaderPath &headerPath : filter.userHeaderPaths) + for (const HeaderPath &headerPath : qAsConst(filter.userHeaderPaths)) addIncludeDirOptionForPath(headerPath); - for (const HeaderPath &headerPath : filter.systemHeaderPaths) + for (const HeaderPath &headerPath : qAsConst(filter.systemHeaderPaths)) addIncludeDirOptionForPath(headerPath); if (m_useTweakedHeaderPaths != UseTweakedHeaderPaths::No) { @@ -356,7 +356,7 @@ void CompilerOptionsBuilder::addHeaderPathOptions() m_options.prepend("-nostdinc++"); m_options.prepend("-nostdinc"); - for (const HeaderPath &headerPath : filter.builtInHeaderPaths) + for (const HeaderPath &headerPath : qAsConst(filter.builtInHeaderPaths)) addIncludeDirOptionForPath(headerPath); } } diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 5502c9fa58f..5f6f296503f 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -730,7 +730,7 @@ void CppModelManager::ensureUpdated() QStringList CppModelManager::internalProjectFiles() const { QStringList files; - for (const ProjectInfo &pinfo : d->m_projectToProjectsInfo) { + for (const ProjectInfo &pinfo : qAsConst(d->m_projectToProjectsInfo)) { foreach (const ProjectPart::Ptr &part, pinfo.projectParts()) { foreach (const ProjectFile &file, part->files) files += file.path; @@ -743,7 +743,7 @@ QStringList CppModelManager::internalProjectFiles() const ProjectExplorer::HeaderPaths CppModelManager::internalHeaderPaths() const { ProjectExplorer::HeaderPaths headerPaths; - for (const ProjectInfo &pinfo : d->m_projectToProjectsInfo) { + for (const ProjectInfo &pinfo : qAsConst(d->m_projectToProjectsInfo)) { foreach (const ProjectPart::Ptr &part, pinfo.projectParts()) { foreach (const ProjectExplorer::HeaderPath &path, part->headerPaths) { ProjectExplorer::HeaderPath hp(QDir::cleanPath(path.path), path.type); @@ -771,7 +771,7 @@ ProjectExplorer::Macros CppModelManager::internalDefinedMacros() const { ProjectExplorer::Macros macros; QSet<ProjectExplorer::Macro> alreadyIn; - for (const ProjectInfo &pinfo : d->m_projectToProjectsInfo) { + for (const ProjectInfo &pinfo : qAsConst(d->m_projectToProjectsInfo)) { for (const ProjectPart::Ptr &part : pinfo.projectParts()) { addUnique(part->toolChainMacros, macros, alreadyIn); addUnique(part->projectMacros, macros, alreadyIn); diff --git a/src/plugins/ctfvisualizer/ctftracemanager.cpp b/src/plugins/ctfvisualizer/ctftracemanager.cpp index 651e6c6f8e3..054492c3fc4 100644 --- a/src/plugins/ctfvisualizer/ctftracemanager.cpp +++ b/src/plugins/ctfvisualizer/ctftracemanager.cpp @@ -199,7 +199,7 @@ void CtfTraceManager::finalize() ++it; } } - for (CtfTimelineModel *model: m_threadModels) { + for (CtfTimelineModel *model: qAsConst(m_threadModels)) { model->finalize(m_traceBegin, m_traceEnd, m_processNames[model->m_processId], m_threadNames[model->m_threadId]); } @@ -278,7 +278,7 @@ void CtfTraceManager::updateStatistics() }); m_statisticsModel->beginLoading(); - for (auto thread : m_threadModels) { + for (auto thread : qAsConst(m_threadModels)) { if (showAll || m_threadRestrictions[thread->tid()]) { const int eventCount = thread->count(); @@ -295,7 +295,7 @@ void CtfTraceManager::updateStatistics() void CtfTraceManager::clearAll() { m_modelAggregator->clear(); - for (CtfTimelineModel *model: m_threadModels) { + for (CtfTimelineModel *model: qAsConst(m_threadModels)) { model->deleteLater(); } m_threadModels.clear(); diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp index 241af9d6e50..ce8d7c59f4d 100644 --- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp +++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp @@ -923,7 +923,7 @@ void SideBySideDiffEditorWidget::showDiff() int blockNumber = 0; QChar separator = '\n'; QHash<int, int> foldingIndent; - for (const FileData &contextFileData : m_controller.m_contextFileData) { + for (const FileData &contextFileData : qAsConst(m_controller.m_contextFileData)) { QString leftText, rightText; foldingIndent.insert(blockNumber, 1); diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp index adc8c108a48..622e460d119 100644 --- a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp +++ b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp @@ -520,7 +520,7 @@ void UnifiedDiffEditorWidget::showDiff() QMap<int, QList<DiffSelection> > selections; - for (const FileData &fileData : m_controller.m_contextFileData) { + for (const FileData &fileData : qAsConst(m_controller.m_contextFileData)) { const QString leftFileInfo = "--- " + fileData.leftFileInfo.fileName + '\n'; const QString rightFileInfo = "+++ " + fileData.rightFileInfo.fileName + '\n'; setFileInfo(blockNumber, fileData.leftFileInfo, fileData.rightFileInfo); diff --git a/src/plugins/ios/iosprobe.cpp b/src/plugins/ios/iosprobe.cpp index 38d44a5097b..66518ad7788 100644 --- a/src/plugins/ios/iosprobe.cpp +++ b/src/plugins/ios/iosprobe.cpp @@ -126,7 +126,7 @@ void XcodeProbe::setupDefaultToolchains(const QString &devPath) } if (!clangProfile.cCompilerPath.isEmpty() || !clangProfile.cxxCompilerPath.isEmpty()) { - for (const QString &arch : allArchitectures) { + for (const QString &arch : qAsConst(allArchitectures)) { const QString clangFullName = QString(QLatin1String("Apple Clang (%1)")).arg(arch) + ((devPath != defaultDeveloperPath) ? QString(QLatin1String(" in %1")).arg(devPath) diff --git a/src/plugins/languageclient/languageclientutils.cpp b/src/plugins/languageclient/languageclientutils.cpp index a517526f02d..7f1f396d1f0 100644 --- a/src/plugins/languageclient/languageclientutils.cpp +++ b/src/plugins/languageclient/languageclientutils.cpp @@ -171,7 +171,7 @@ void updateCodeActionRefactoringMarker(Client *client, } else if (optional<WorkspaceEdit::Changes> localChanges = edit.changes()) { edits = localChanges.value()[uri]; } - for (const TextEdit &edit : edits) { + for (const TextEdit &edit : qAsConst(edits)) { marker.cursor = endOfLineCursor(edit.range().start().toTextCursor(doc->document())); markers << marker; } diff --git a/src/plugins/mcusupport/mcusupportoptionspage.cpp b/src/plugins/mcusupport/mcusupportoptionspage.cpp index 11cc8330f60..b4e6e2a6b07 100644 --- a/src/plugins/mcusupport/mcusupportoptionspage.cpp +++ b/src/plugins/mcusupport/mcusupportoptionspage.cpp @@ -246,7 +246,7 @@ void McuSupportOptionsWidget::showMcuTargetPackages() row.fieldItem->widget()->hide(); } - for (auto package : m_options.packages) { + for (auto package : qAsConst(m_options.packages)) { QWidget *packageWidget = package->widget(); if (!mcuTarget->packages().contains(package)) continue; @@ -275,7 +275,7 @@ void McuSupportOptionsWidget::apply() { m_options.qtForMCUsSdkPackage->writeGeneralSettings(); m_options.qtForMCUsSdkPackage->writeToSettings(); - for (auto package : m_options.packages) + for (auto package : qAsConst(m_options.packages)) package->writeToSettings(); } diff --git a/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/buildsystemfilesparser.h b/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/buildsystemfilesparser.h index fe95f61f130..2ef013d5e9d 100644 --- a/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/buildsystemfilesparser.h +++ b/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/buildsystemfilesparser.h @@ -67,7 +67,7 @@ public: { auto arr = get<QJsonArray>(js.object(), "projectinfo", "buildsystem_files"); appendFiles(arr, m_files); - auto subprojects = get<QJsonArray>(js.object(), "projectinfo", "subprojects"); + const auto subprojects = get<QJsonArray>(js.object(), "projectinfo", "subprojects"); for (const auto &subproject : *subprojects) { auto arr = get<QJsonArray>(subproject.toObject(), "buildsystem_files"); appendFiles(arr, m_files); diff --git a/src/plugins/nim/project/nimblebuildsystem.cpp b/src/plugins/nim/project/nimblebuildsystem.cpp index 7e0fc582f70..ae678004438 100644 --- a/src/plugins/nim/project/nimblebuildsystem.cpp +++ b/src/plugins/nim/project/nimblebuildsystem.cpp @@ -43,6 +43,14 @@ namespace Nim { const char C_NIMBLEPROJECT_TASKS[] = "Nim.NimbleProject.Tasks"; +static QList<QByteArray> linesFromProcessOutput(QProcess *process) +{ + QList<QByteArray> lines = process->readAllStandardOutput().split('\n'); + lines = Utils::transform(lines, [](const QByteArray &line){ return line.trimmed(); }); + Utils::erase(lines, [](const QByteArray &line) { return line.isEmpty(); }); + return lines; +} + static std::vector<NimbleTask> parseTasks(const QString &nimblePath, const QString &workingDirectory) { QProcess process; @@ -52,9 +60,7 @@ static std::vector<NimbleTask> parseTasks(const QString &nimblePath, const QStri std::vector<NimbleTask> result; - QList<QByteArray> lines = process.readAllStandardOutput().split('\n'); - lines = Utils::transform(lines, [](const QByteArray &line){ return line.trimmed(); }); - Utils::erase(lines, [](const QByteArray &line) { return line.isEmpty(); }); + const QList<QByteArray> &lines = linesFromProcessOutput(&process); for (const QByteArray &line : lines) { QList<QByteArray> tokens = line.trimmed().split(' '); @@ -76,9 +82,7 @@ static NimbleMetadata parseMetadata(const QString &nimblePath, const QString &wo NimbleMetadata result = {}; - QList<QByteArray> lines = process.readAllStandardOutput().split('\n'); - lines = Utils::transform(lines, [](const QByteArray &line){ return line.trimmed(); }); - Utils::erase(lines, [](const QByteArray &line) { return line.isEmpty(); }); + const QList<QByteArray> &lines = linesFromProcessOutput(&process); for (const QByteArray &line : lines) { QList<QByteArray> tokens = line.trimmed().split(':'); diff --git a/src/plugins/nim/project/nimcompilerbuildstep.cpp b/src/plugins/nim/project/nimcompilerbuildstep.cpp index 175fe9b57eb..829254e0e27 100644 --- a/src/plugins/nim/project/nimcompilerbuildstep.cpp +++ b/src/plugins/nim/project/nimcompilerbuildstep.cpp @@ -199,7 +199,7 @@ CommandLine NimCompilerBuildStep::commandLine() cmd.addArg("--out:" + outFilePath().toString()); cmd.addArg("--nimCache:" + bc->cacheDirectory().toString()); - for (const QString &arg : m_userCompilerOptions) { + for (const QString &arg : qAsConst(m_userCompilerOptions)) { if (!arg.isEmpty()) cmd.addArg(arg); } diff --git a/src/plugins/perfprofiler/perftimelinemodelmanager.cpp b/src/plugins/perfprofiler/perftimelinemodelmanager.cpp index 48af0ccf37a..4ac82209b53 100644 --- a/src/plugins/perfprofiler/perftimelinemodelmanager.cpp +++ b/src/plugins/perfprofiler/perftimelinemodelmanager.cpp @@ -106,7 +106,7 @@ void PerfTimelineModelManager::finalize() }); QVariantList modelsToAdd; - for (PerfTimelineModel *model : finished) + for (PerfTimelineModel *model : qAsConst(finished)) modelsToAdd.append(QVariant::fromValue(model)); setModels(modelsToAdd); } diff --git a/src/plugins/python/pythonproject.cpp b/src/plugins/python/pythonproject.cpp index db15e318bdb..5c3f7dcdbac 100644 --- a/src/plugins/python/pythonproject.cpp +++ b/src/plugins/python/pythonproject.cpp @@ -268,7 +268,7 @@ void PythonBuildSystem::triggerParsing() if (modelManager) { auto projectInfo = modelManager->defaultProjectInfoForProject(project()); - for (const QString &importPath : m_qmlImportPaths) { + for (const QString &importPath : qAsConst(m_qmlImportPaths)) { const Utils::FilePath filePath = Utils::FilePath::fromString(importPath); projectInfo.importPaths.maybeInsert(filePath, QmlJS::Dialect::Qml); } diff --git a/src/plugins/python/pythonrunconfiguration.cpp b/src/plugins/python/pythonrunconfiguration.cpp index a1438733a2a..866116ff14c 100644 --- a/src/plugins/python/pythonrunconfiguration.cpp +++ b/src/plugins/python/pythonrunconfiguration.cpp @@ -210,7 +210,7 @@ void InterpreterAspect::updateComboBox() int defaultIndex = -1; const QString currentId = m_currentId; m_comboBox->clear(); - for (const Interpreter &interpreter : m_interpreters) { + for (const Interpreter &interpreter : qAsConst(m_interpreters)) { int index = m_comboBox->count(); m_comboBox->addItem(interpreter.name); m_comboBox->setItemData(index, interpreter.command.toUserOutput(), Qt::ToolTipRole); diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index b40df5f5ed5..7c803993549 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -827,7 +827,7 @@ void QbsBuildStepConfigWidget::applyCachedProperties() Constants::QBS_INSTALL_ROOT_KEY}); if (m_qbsStep->m_selectedAbis->isManagedByTarget()) additionalSpecialKeys << Constants::QBS_ARCHITECTURES; - for (const QString &key : additionalSpecialKeys) { + for (const QString &key : qAsConst(additionalSpecialKeys)) { const auto it = tmp.constFind(key); if (it != tmp.cend()) data.insert(key, it.value()); diff --git a/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp b/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp index 4ea74e0a4e5..e32d3abeda5 100644 --- a/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp +++ b/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp @@ -199,7 +199,7 @@ void QbsProfileManager::addProfileFromKit(const ProjectExplorer::Kit *k) // set up properties: QVariantMap data = m_defaultPropertyProvider->properties(k, QVariantMap()); - for (PropertyProvider *provider : g_propertyProviders) { + for (PropertyProvider *provider : qAsConst(g_propertyProviders)) { if (provider->canHandle(k)) data = provider->properties(k, data); } diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index c38e572edab..02fe1099770 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -141,11 +141,7 @@ ProjectImporter *QbsProject::projectImporter() const void QbsProject::configureAsExampleProject(Kit *kit) { QList<BuildInfo> infoList; - QList<Kit *> kits; - if (kit) - kits.append(kit); - else - kits = KitManager::kits(); + const QList<Kit *> kits(kit != nullptr ? QList<Kit *>({kit}) : KitManager::kits()); for (Kit *k : kits) { if (QtSupport::QtKitAspect::qtVersion(k) != nullptr) { if (auto factory = BuildConfigurationFactory::find(k, projectFilePath())) diff --git a/src/plugins/qmakeprojectmanager/qmakenodetreebuilder.cpp b/src/plugins/qmakeprojectmanager/qmakenodetreebuilder.cpp index f5563678c7f..d454aad6257 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodetreebuilder.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodetreebuilder.cpp @@ -227,7 +227,7 @@ static void createTree(QmakeBuildSystem *buildSystem, genFolder->setDisplayName(QCoreApplication::translate("QmakeProjectManager::QmakePriFile", "Generated Files")); genFolder->setIsGenerated(true); - for (const FilePath &fp : generatedFiles) { + for (const FilePath &fp : qAsConst(generatedFiles)) { auto fileNode = std::make_unique<FileNode>(fp, FileNode::fileTypeForFileName(fp)); fileNode->setIsGenerated(true); genFolder->addNestedNode(std::move(fileNode)); diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp index 08235ea28ed..a61df84fc2c 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp @@ -1214,7 +1214,7 @@ QString QmakeProFile::displayName() const QList<QmakeProFile *> QmakeProFile::allProFiles() { QList<QmakeProFile *> result = { this }; - for (QmakePriFile *c : m_children) { + for (QmakePriFile *c : qAsConst(m_children)) { auto proC = dynamic_cast<QmakeProFile *>(c); if (proC) result.append(proC->allProFiles()); @@ -1591,7 +1591,7 @@ QmakeEvalResult *QmakeProFile::evaluate(const QmakeEvalInput &input) toCompare.pop_front(); // Loop prevention: Make sure that exact same node is not in our parent chain - for (QmakeIncludedPriFile *priFile : tree->children) { + for (QmakeIncludedPriFile *priFile : qAsConst(tree->children)) { bool loop = input.parentFilePaths.contains(priFile->name); for (const QmakePriFile *n = pn; n && !loop; n = n->parent()) { if (n->filePath() == priFile->name) diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 97b519e83cc..f4ea729c899 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -1081,11 +1081,7 @@ void CentralizedFolderWatcher::delayedFolderChanged(const QString &folder) void QmakeProject::configureAsExampleProject(Kit *kit) { QList<BuildInfo> infoList; - QList<Kit *> kits; - if (kit) - kits.append(kit); - else - kits = KitManager::kits(); + const QList<Kit *> kits(kit != nullptr ? QList<Kit *>({kit}) : KitManager::kits()); for (Kit *k : kits) { if (QtSupport::QtKitAspect::qtVersion(k) != nullptr) { if (auto factory = BuildConfigurationFactory::find(k, projectFilePath())) diff --git a/src/plugins/qmlpreview/qmldebugtranslationwidget.cpp b/src/plugins/qmlpreview/qmldebugtranslationwidget.cpp index 218d1366590..f835fa79459 100644 --- a/src/plugins/qmlpreview/qmldebugtranslationwidget.cpp +++ b/src/plugins/qmlpreview/qmldebugtranslationwidget.cpp @@ -368,7 +368,7 @@ void QmlDebugTranslationWidget::runTest() }); } }; - for (auto filePath : m_selectedFilePaths) { + for (auto filePath : qAsConst(m_selectedFilePaths)) { testLanguages(timerCounter++, filePath.toString()); } }); diff --git a/src/plugins/qmlprofiler/flamegraphmodel.cpp b/src/plugins/qmlprofiler/flamegraphmodel.cpp index 590932c1c44..d03fd21451d 100644 --- a/src/plugins/qmlprofiler/flamegraphmodel.cpp +++ b/src/plugins/qmlprofiler/flamegraphmodel.cpp @@ -140,7 +140,7 @@ void FlameGraphModel::loadEvent(const QmlEvent &event, const QmlEventType &type) void FlameGraphModel::finalize() { - for (FlameGraphData *child : m_stackBottom.children) + for (FlameGraphData *child : qAsConst(m_stackBottom.children)) m_stackBottom.duration += child->duration; loadNotes(-1, false); diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp index e59731ffb34..bfb5f1f0cf7 100644 --- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp @@ -405,7 +405,7 @@ QmlProfilerModelManager::rangeFilter(qint64 rangeStart, qint64 rangeEnd) const } } else { if (!crossedRangeStart) { - for (auto stashed : stack) { + for (auto stashed : qAsConst(stack)) { stashed.setTimestamp(rangeStart); loader(stashed, eventType(stashed.typeIndex())); } diff --git a/src/plugins/qnx/qnxqtversion.cpp b/src/plugins/qnx/qnxqtversion.cpp index 05cf2b69df7..2265bd2f1a2 100644 --- a/src/plugins/qnx/qnxqtversion.cpp +++ b/src/plugins/qnx/qnxqtversion.cpp @@ -77,7 +77,7 @@ QString QnxQtVersion::qnxHost() const if (!m_environmentUpToDate) updateEnvironment(); - for (const EnvironmentItem &item : m_qnxEnv) { + for (const EnvironmentItem &item : qAsConst(m_qnxEnv)) { if (item.name == QLatin1String(QNX_HOST_KEY)) return item.value; } diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index e97855b9d29..f090438edba 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -2351,7 +2351,7 @@ BaseQtVersion *QtVersionFactory::create() const BaseQtVersion *BaseQtVersion::clone() const { - for (QtVersionFactory *factory : g_qtVersionFactories) { + for (QtVersionFactory *factory : qAsConst(g_qtVersionFactories)) { if (factory->m_supportedType == d->m_type) { BaseQtVersion *version = factory->create(); QTC_ASSERT(version, return nullptr); diff --git a/src/plugins/remotelinux/genericdirectuploadservice.cpp b/src/plugins/remotelinux/genericdirectuploadservice.cpp index b86385d0581..cc7db8561ac 100644 --- a/src/plugins/remotelinux/genericdirectuploadservice.cpp +++ b/src/plugins/remotelinux/genericdirectuploadservice.cpp @@ -301,7 +301,7 @@ void GenericDirectUploadService::uploadFiles() } emit progressMessage(tr("%n file(s) need to be uploaded.", "", d->filesToUpload.size())); FilesToTransfer filesToTransfer; - for (const DeployableFile &f : d->filesToUpload) { + for (const DeployableFile &f : qAsConst(d->filesToUpload)) { if (!f.localFilePath().exists()) { const QString message = tr("Local file \"%1\" does not exist.") .arg(f.localFilePath().toUserOutput()); @@ -340,7 +340,7 @@ void GenericDirectUploadService::chmod() QTC_ASSERT(d->state == PostProcessing, return); if (!Utils::HostOsInfo::isWindowsHost()) return; - for (const DeployableFile &f : d->filesToUpload) { + for (const DeployableFile &f : qAsConst(d->filesToUpload)) { if (!f.isExecutable()) continue; const QString command = QLatin1String("chmod a+x ") diff --git a/src/plugins/remotelinux/rsyncdeploystep.cpp b/src/plugins/remotelinux/rsyncdeploystep.cpp index 76efc5b03ed..7aafa41b46f 100644 --- a/src/plugins/remotelinux/rsyncdeploystep.cpp +++ b/src/plugins/remotelinux/rsyncdeploystep.cpp @@ -99,7 +99,7 @@ void RsyncDeployService::filterDeployableFiles() const void RsyncDeployService::createRemoteDirectories() { QStringList remoteDirs; - for (const DeployableFile &f : m_deployableFiles) + for (const DeployableFile &f : qAsConst(m_deployableFiles)) remoteDirs << f.remoteDirectory(); remoteDirs.sort(); remoteDirs.removeDuplicates(); diff --git a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp index 85d9741e784..98306e45ec7 100644 --- a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp +++ b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp @@ -450,7 +450,7 @@ QString ResourceFile::absolutePath(const QString &rel_path) const void ResourceFile::orderList() { - for (Prefix *p : m_prefix_list) { + for (Prefix *p : qAsConst(m_prefix_list)) { std::sort(p->file_list.begin(), p->file_list.end(), [&](File *f1, File *f2) { return *f1 < *f2; }); diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp index c317f7627a1..50708c98c14 100644 --- a/src/plugins/resourceeditor/resourceeditorplugin.cpp +++ b/src/plugins/resourceeditor/resourceeditorplugin.cpp @@ -253,7 +253,7 @@ void ResourceEditorPlugin::extensionsInitialized() toReplace.append(fn); }); - for (FileNode *file : toReplace) { + for (FileNode *file : qAsConst(toReplace)) { FolderNode *const pn = file->parentFolderNode(); QTC_ASSERT(pn, continue); const Utils::FilePath path = file->filePath(); diff --git a/src/plugins/scxmleditor/plugin_interface/scxmldocument.cpp b/src/plugins/scxmleditor/plugin_interface/scxmldocument.cpp index 8e85ae8097f..97aee68d45a 100644 --- a/src/plugins/scxmleditor/plugin_interface/scxmldocument.cpp +++ b/src/plugins/scxmleditor/plugin_interface/scxmldocument.cpp @@ -170,7 +170,7 @@ bool ScxmlDocument::generateSCXML(QIODevice *io, ScxmlTag *tag) const ScxmlTag *ScxmlDocument::createScxmlTag() { auto tag = new ScxmlTag(Scxml, this); - for (ScxmlNamespace *ns : m_namespaces) { + for (ScxmlNamespace *ns : qAsConst(m_namespaces)) { QString prefix = ns->prefix(); if (prefix.isEmpty()) prefix = "xmlns"; diff --git a/src/plugins/silversearcher/findinfilessilversearcher.cpp b/src/plugins/silversearcher/findinfilessilversearcher.cpp index d2da3e5c566..91670f28035 100644 --- a/src/plugins/silversearcher/findinfilessilversearcher.cpp +++ b/src/plugins/silversearcher/findinfilessilversearcher.cpp @@ -112,11 +112,11 @@ void runSilverSeacher(FutureInterfaceType &fi, FileFindParameters parameters) if (!(parameters.flags & FindRegularExpression)) arguments << "-Q"; - for (const QString &filter : parameters.exclusionFilters) + for (const QString &filter : qAsConst(parameters.exclusionFilters)) arguments << "--ignore" << filter; QString nameFiltersAsRegex; - for (const QString &filter : parameters.nameFilters) + for (const QString &filter : qAsConst(parameters.nameFilters)) nameFiltersAsRegex += QString("(%1)|").arg(convertWildcardToRegex(filter)); nameFiltersAsRegex.remove(nameFiltersAsRegex.length() - 1, 1); diff --git a/src/plugins/texteditor/snippets/snippetprovider.cpp b/src/plugins/texteditor/snippets/snippetprovider.cpp index be84ef8bdb1..82492d386bb 100644 --- a/src/plugins/texteditor/snippets/snippetprovider.cpp +++ b/src/plugins/texteditor/snippets/snippetprovider.cpp @@ -101,7 +101,7 @@ QString SnippetProvider::displayName() const */ void SnippetProvider::decorateEditor(TextEditorWidget *editor, const QString &groupId) { - for (const SnippetProvider &provider : g_snippetProviders) { + for (const SnippetProvider &provider : qAsConst(g_snippetProviders)) { if (provider.m_groupId == groupId && provider.m_editorDecorator) provider.m_editorDecorator(editor); } diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index a8d9e51d0d7..7e4e7b82fc9 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -1199,7 +1199,7 @@ HeobDialog::HeobDialog(QWidget *parent) : auto profilesLayout = new QHBoxLayout; m_profilesCombo = new QComboBox; - for (const auto &profile : m_profiles) + for (const auto &profile : qAsConst(m_profiles)) m_profilesCombo->addItem(settings->value(profile + "/" + heobProfileNameC).toString()); if (hasSelProfile) { int selIdx = m_profiles.indexOf(selProfile); diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index 1f665427103..3561ea621de 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -438,7 +438,7 @@ void WelcomeMode::addPage(IWelcomePage *page) auto onClicked = [this, pageId, stackPage] { m_activePage = pageId; m_pageStack->setCurrentWidget(stackPage); - for (WelcomePageButton *pageButton : m_pageButtons) + for (WelcomePageButton *pageButton : qAsConst(m_pageButtons)) pageButton->recheckActive(); }; |