From afc2fda8a9c094d680684c45174b6fe7bbc1f411 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 16 Feb 2021 22:43:21 +0100 Subject: [PATCH] ProjectExplorer: Use qAsConst w/ non-const Qt containers in range-loops Change-Id: I6422b3e40a6925504a231be2d47b3214d86c6e06 Reviewed-by: Christian Kandeler --- src/plugins/projectexplorer/appoutputpane.cpp | 2 +- src/plugins/projectexplorer/buildconfiguration.cpp | 6 +++--- src/plugins/projectexplorer/extracompiler.cpp | 2 +- .../projectexplorer/foldernavigationwidget.cpp | 2 +- src/plugins/projectexplorer/gcctoolchain.cpp | 6 +++--- src/plugins/projectexplorer/msvctoolchain.cpp | 8 ++++---- src/plugins/projectexplorer/projectexplorer.cpp | 2 +- src/plugins/projectexplorer/projectimporter.cpp | 4 ++-- src/plugins/projectexplorer/runconfiguration.cpp | 4 ++-- src/plugins/projectexplorer/runcontrol.cpp | 12 ++++++------ .../projectexplorer/runsettingspropertiespage.cpp | 2 +- src/plugins/projectexplorer/session.cpp | 2 +- src/plugins/projectexplorer/targetsetuppage.cpp | 2 +- src/plugins/projectexplorer/taskwindow.cpp | 4 ++-- src/plugins/projectexplorer/toolchain.cpp | 2 +- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index 8eb808111fa..5bb144d54e1 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -754,7 +754,7 @@ void AppOutputPane::slotRunControlFinished() { auto *rc = qobject_cast(sender()); QTimer::singleShot(0, this, [this, rc]() { slotRunControlFinished2(rc); }); - for (const RunControlTab &t : m_runControlTabs) { + for (const RunControlTab &t : qAsConst(m_runControlTabs)) { if (t.runControl == rc) { t.window->flush(); break; diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp index a309ec2baaa..f665651cb14 100644 --- a/src/plugins/projectexplorer/buildconfiguration.cpp +++ b/src/plugins/projectexplorer/buildconfiguration.cpp @@ -637,7 +637,7 @@ BuildConfigurationFactory *BuildConfigurationFactory::find(const Kit *k, const F { QTC_ASSERT(k, return nullptr); const Utils::Id deviceType = DeviceTypeKitAspect::deviceTypeId(k); - for (BuildConfigurationFactory *factory : g_buildConfigurationFactories) { + for (BuildConfigurationFactory *factory : qAsConst(g_buildConfigurationFactories)) { if (Utils::mimeTypeForFile(projectPath.toString()) .matchesName(factory->m_supportedProjectMimeTypeName) && factory->supportsTargetDeviceType(deviceType)) @@ -649,7 +649,7 @@ BuildConfigurationFactory *BuildConfigurationFactory::find(const Kit *k, const F // create BuildConfigurationFactory * BuildConfigurationFactory::find(Target *parent) { - for (BuildConfigurationFactory *factory : g_buildConfigurationFactories) { + for (BuildConfigurationFactory *factory : qAsConst(g_buildConfigurationFactories)) { if (factory->canHandle(parent)) return factory; } @@ -711,7 +711,7 @@ BuildConfiguration *BuildConfigurationFactory::create(Target *parent, const Buil BuildConfiguration *BuildConfigurationFactory::restore(Target *parent, const QVariantMap &map) { const Utils::Id id = idFromMap(map); - for (BuildConfigurationFactory *factory : g_buildConfigurationFactories) { + for (BuildConfigurationFactory *factory : qAsConst(g_buildConfigurationFactories)) { QTC_ASSERT(factory->m_creator, return nullptr); if (!factory->canHandle(parent)) continue; diff --git a/src/plugins/projectexplorer/extracompiler.cpp b/src/plugins/projectexplorer/extracompiler.cpp index aa24284075b..5a349c1ebd2 100644 --- a/src/plugins/projectexplorer/extracompiler.cpp +++ b/src/plugins/projectexplorer/extracompiler.cpp @@ -326,7 +326,7 @@ void ExtraCompilerFactory::annouceCreation(const Project *project, const Utils::FilePath &source, const Utils::FilePaths &targets) { - for (ExtraCompilerFactoryObserver *observer : *observers) + for (ExtraCompilerFactoryObserver *observer : qAsConst(*observers)) observer->newExtraCompiler(project, source, targets); } diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp index 1dcaa4747fe..7f9245bcef6 100644 --- a/src/plugins/projectexplorer/foldernavigationwidget.cpp +++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp @@ -877,7 +877,7 @@ FolderNavigationWidgetFactory::FolderNavigationWidgetFactory() Core::NavigationView FolderNavigationWidgetFactory::createWidget() { auto fnw = new FolderNavigationWidget; - for (const RootDirectory &root : m_rootDirectories) + for (const RootDirectory &root : qAsConst(m_rootDirectories)) fnw->insertRootDirectory(root); connect(this, &FolderNavigationWidgetFactory::rootDirectoryAdded, diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index 8dfc340cb6b..25dfd23e296 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -591,7 +591,7 @@ HeaderPaths GccToolChain::builtInHeaderPaths(const Utils::Environment &env, headerCache->insert(qMakePair(env, arguments), paths); qCDebug(gccLog) << "Reporting header paths to code model:"; - for (const HeaderPath &hp : paths) { + for (const HeaderPath &hp : qAsConst(paths)) { qCDebug(gccLog) << compilerCommand.toUserOutput() << (languageId == Constants::CXX_LANGUAGE_ID ? ": C++ [" : ": C [") << arguments.join(", ") << "]" << hp.path; @@ -1053,7 +1053,7 @@ QList GccToolChainFactory::autoDetectToolchains( if (ccachePath.exists() && !searchPaths.contains(ccachePath)) searchPaths << ccachePath; } - for (const FilePath &dir : searchPaths) { + for (const FilePath &dir : qAsConst(searchPaths)) { static const QRegularExpression regexp(binaryRegexp); QDir binDir(dir.toString()); QStringList nameFilters(compilerName); @@ -1094,7 +1094,7 @@ QList GccToolChainFactory::autoDetectToolchains( return true; }); QList result; - for (const FilePath &compilerPath : compilerPaths) { + for (const FilePath &compilerPath : qAsConst(compilerPaths)) { bool alreadyExists = false; for (ToolChain * const existingTc : existingCandidates) { // We have a match if the existing toolchain ultimately refers to the same file diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index f8d3abbe813..8e70a2330c4 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -1229,7 +1229,7 @@ MsvcToolChainConfigWidget::MsvcToolChainConfigWidget(ToolChain *tc) m_varsBatPathCombo->setObjectName("varsBatCombo"); m_varsBatPathCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); m_varsBatPathCombo->setEditable(true); - for (const MsvcToolChain *tmpTc : g_availableMsvcToolchains) { + for (const MsvcToolChain *tmpTc : qAsConst(g_availableMsvcToolchains)) { const QString nativeVcVars = QDir::toNativeSeparators(tmpTc->varsBat()); if (!tmpTc->varsBat().isEmpty() && m_varsBatPathCombo->findText(nativeVcVars) == -1) { @@ -1335,7 +1335,7 @@ void MsvcToolChainConfigWidget::updateAbis() // choose one appropriately. Abis supportedAbis; Abi targetAbi; - for (const MsvcToolChain *tc : g_availableMsvcToolchains) { + for (const MsvcToolChain *tc : qAsConst(g_availableMsvcToolchains)) { if (tc->varsBat() == normalizedVcVars && tc->targetAbi().wordWidth() == wordWidth && tc->targetAbi().architecture() == arch && tc->language() == currentTc->language()) { // We need to filter out duplicates as there might be multiple toolchains with @@ -1436,7 +1436,7 @@ void ClangClToolChainConfigWidget::setFromClangClToolChain() m_nameDisplayLabel->setText(currentTC->displayName()); m_varsBatDisplayCombo->clear(); m_varsBatDisplayCombo->addItem(msvcVarsToDisplay(*currentTC)); - for (const MsvcToolChain *tc : g_availableMsvcToolchains) { + for (const MsvcToolChain *tc : qAsConst(g_availableMsvcToolchains)) { const QString varsToDisplay = msvcVarsToDisplay(*tc); if (m_varsBatDisplayCombo->findText(varsToDisplay) == -1) m_varsBatDisplayCombo->addItem(varsToDisplay); @@ -1867,7 +1867,7 @@ QList MsvcToolChainFactory::autoDetect(const QList &al detectCppBuildTools2015(&results); - for (ToolChain *tc : results) + for (ToolChain *tc : qAsConst(results)) tc->setDetection(ToolChain::AutoDetection); return results; diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 5520137cb45..c0ca9796673 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -3545,7 +3545,7 @@ void ProjectExplorerPluginPrivate::addExistingProjects() return; QStringList failedProjects; QStringList addedProjects; - for (const QString &filePath : subProjectFilePaths) { + for (const QString &filePath : qAsConst(subProjectFilePaths)) { if (projectNode->addSubProject(filePath)) addedProjects << filePath; else diff --git a/src/plugins/projectexplorer/projectimporter.cpp b/src/plugins/projectexplorer/projectimporter.cpp index 932d4d6e427..61dc6bafcd1 100644 --- a/src/plugins/projectexplorer/projectimporter.cpp +++ b/src/plugins/projectexplorer/projectimporter.cpp @@ -396,7 +396,7 @@ static ProjectImporter::ToolChainData createToolChains(const ToolChainDescriptio if (data.tcs.isEmpty()) continue; - for (ToolChain *tc : data.tcs) + for (ToolChain *tc : qAsConst(data.tcs)) ToolChainManager::registerToolChain(tc); data.areTemporary = true; @@ -413,7 +413,7 @@ ProjectImporter::findOrCreateToolChains(const ToolChainDescription &tcd) const result.tcs = ToolChainManager::toolChains([&tcd](const ToolChain *tc) { return tc->language() == tcd.language && tc->compilerCommand() == tcd.compilerPath; }); - for (const ToolChain *tc : result.tcs) { + for (const ToolChain *tc : qAsConst(result.tcs)) { const QByteArray tcId = tc->id(); result.areTemporary = result.areTemporary ? true : hasKitWithTemporaryData(ToolChainKitAspect::id(), tcId); } diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index c79707fe682..953fd1b91e4 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -556,7 +556,7 @@ RunConfiguration *RunConfigurationCreationInfo::create(Target *target) const RunConfiguration *RunConfigurationFactory::restore(Target *parent, const QVariantMap &map) { - for (RunConfigurationFactory *factory : g_runConfigurationFactories) { + for (RunConfigurationFactory *factory : qAsConst(g_runConfigurationFactories)) { if (factory->canHandle(parent)) { const Utils::Id id = idFromMap(map); if (id.name().startsWith(factory->m_runConfigurationId.name())) { @@ -581,7 +581,7 @@ RunConfiguration *RunConfigurationFactory::clone(Target *parent, RunConfiguratio const QList RunConfigurationFactory::creatorsForTarget(Target *parent) { QList items; - for (RunConfigurationFactory *factory : g_runConfigurationFactories) { + for (RunConfigurationFactory *factory : qAsConst(g_runConfigurationFactories)) { if (factory->canHandle(parent)) items.append(factory->availableCreators(parent)); } diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp index f31053ca8c4..0ba5ca28e06 100644 --- a/src/plugins/projectexplorer/runcontrol.cpp +++ b/src/plugins/projectexplorer/runcontrol.cpp @@ -516,7 +516,7 @@ void RunControlPrivate::initiateReStart() checkState(RunControlState::Stopped); // Re-set worked on re-runs. - for (RunWorker *worker : m_workers) { + for (RunWorker *worker : qAsConst(m_workers)) { if (worker->d->state == RunWorkerState::Done) worker->d->state = RunWorkerState::Initialized; } @@ -532,7 +532,7 @@ void RunControlPrivate::continueStart() checkState(RunControlState::Starting); bool allDone = true; debugMessage("Looking for next worker"); - for (RunWorker *worker : m_workers) { + for (RunWorker *worker : qAsConst(m_workers)) { if (worker) { const QString &workerId = worker->d->id; debugMessage(" Examining worker " + workerId); @@ -595,7 +595,7 @@ void RunControlPrivate::continueStopOrFinish() } }; - for (RunWorker *worker : m_workers) { + for (RunWorker *worker : qAsConst(m_workers)) { if (worker) { const QString &workerId = worker->d->id; debugMessage(" Examining worker " + workerId); @@ -647,7 +647,7 @@ void RunControlPrivate::forceStop() debugMessage("Was finished, too late to force Stop"); return; } - for (RunWorker *worker : m_workers) { + for (RunWorker *worker : qAsConst(m_workers)) { if (worker) { const QString &workerId = worker->d->id; debugMessage(" Examining worker " + workerId); @@ -763,7 +763,7 @@ void RunControlPrivate::onWorkerStopped(RunWorker *worker) return; } - for (RunWorker *dependent : worker->d->stopDependencies) { + for (RunWorker *dependent : qAsConst(worker->d->stopDependencies)) { switch (dependent->d->state) { case RunWorkerState::Done: break; @@ -780,7 +780,7 @@ void RunControlPrivate::onWorkerStopped(RunWorker *worker) debugMessage("Checking whether all stopped"); bool allDone = true; - for (RunWorker *worker : m_workers) { + for (RunWorker *worker : qAsConst(m_workers)) { if (worker) { const QString &workerId = worker->d->id; debugMessage(" Examining worker " + workerId); diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp index 577d5a5be10..5c1d68d40bf 100644 --- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp @@ -506,7 +506,7 @@ void RunSettingsWidget::addSubWidget(QWidget *widget, QLabel *label) void RunSettingsWidget::removeSubWidgets() { - for (const RunConfigItem &item : m_subWidgets) { + for (const RunConfigItem &item : qAsConst(m_subWidgets)) { delete item.first; delete item.second; } diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp index be1cf2c1e71..1542cbe3cc2 100644 --- a/src/plugins/projectexplorer/session.cpp +++ b/src/plugins/projectexplorer/session.cpp @@ -913,7 +913,7 @@ void SessionManagerPrivate::restoreStartupProject(const PersistentSettingsReader { const QString startupProject = reader.restoreValue(QLatin1String("StartupProject")).toString(); if (!startupProject.isEmpty()) { - for (Project *pro : m_projects) { + for (Project *pro : qAsConst(m_projects)) { if (pro->projectFilePath().toString() == startupProject) { m_instance->setStartupProject(pro); break; diff --git a/src/plugins/projectexplorer/targetsetuppage.cpp b/src/plugins/projectexplorer/targetsetuppage.cpp index 305606f70fd..c09e75595d7 100644 --- a/src/plugins/projectexplorer/targetsetuppage.cpp +++ b/src/plugins/projectexplorer/targetsetuppage.cpp @@ -204,7 +204,7 @@ TargetSetupPage::TargetSetupPage(QWidget *parent) setTitle(tr("Kit Selection")); - for (IPotentialKit *pk : g_potentialKits) + for (IPotentialKit *pk : qAsConst(g_potentialKits)) if (pk->isEnabled()) m_potentialWidgets.append(pk->createWidget(this)); diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp index 0250cf7194d..6701ebbf84d 100644 --- a/src/plugins/projectexplorer/taskwindow.cpp +++ b/src/plugins/projectexplorer/taskwindow.cpp @@ -419,7 +419,7 @@ void TaskWindow::delayedInitialization() alreadyDone = true; - for (ITaskHandler *h : g_taskHandlers) { + for (ITaskHandler *h : qAsConst(g_taskHandlers)) { if (h->isDefaultHandler() && !d->m_defaultHandler) d->m_defaultHandler = h; @@ -843,7 +843,7 @@ void TaskDelegate::currentChanged(const QModelIndex ¤t, const QModelIndex QString TaskDelegate::hrefForPos(const QPointF &pos) { - for (const auto &link : m_hrefs) { + for (const auto &link : qAsConst(m_hrefs)) { if (link.first.contains(pos)) return link.second; } diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp index 237761a7eeb..1739fc5e890 100644 --- a/src/plugins/projectexplorer/toolchain.cpp +++ b/src/plugins/projectexplorer/toolchain.cpp @@ -192,7 +192,7 @@ bool ToolChain::operator == (const ToolChain &tc) const ToolChain *ToolChain::clone() const { - for (ToolChainFactory *f : Internal::g_toolChainFactories) { + for (ToolChainFactory *f : qAsConst(Internal::g_toolChainFactories)) { if (f->supportedToolChainType() == d->m_typeId) { ToolChain *tc = f->create(); QTC_ASSERT(tc, return nullptr);