diff options
author | hjk <hjk@qt.io> | 2024-01-22 17:46:28 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2024-01-23 11:09:32 +0000 |
commit | d0d0d3b83a8b117ac2f91884d7fcfdccbcc31552 (patch) | |
tree | a2cf614ef42b5f90f677ceb3ea299d484473cf2b /src/plugins/mesonprojectmanager | |
parent | d7c1fe129f155c7465bce17dc71fa65c5f254be7 (diff) |
Rename a few more ToolChain items to Toolchain
Change-Id: I78e12e6923242fcb72cdde6284185574b8792fc6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/mesonprojectmanager')
-rw-r--r-- | src/plugins/mesonprojectmanager/mesonprojectparser.cpp | 16 | ||||
-rw-r--r-- | src/plugins/mesonprojectmanager/mesonprojectparser.h | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/mesonprojectmanager/mesonprojectparser.cpp b/src/plugins/mesonprojectmanager/mesonprojectparser.cpp index 4d1eebc3056..4da4c01945e 100644 --- a/src/plugins/mesonprojectmanager/mesonprojectparser.cpp +++ b/src/plugins/mesonprojectmanager/mesonprojectparser.cpp @@ -254,8 +254,8 @@ void MesonProjectParser::update(const QFuture<MesonProjectParser::ParserData *> RawProjectPart MesonProjectParser::buildRawPart( const Target &target, const Target::SourceGroup &sources, - const Toolchain *cxxToolChain, - const Toolchain *cToolChain) + const Toolchain *cxxToolchain, + const Toolchain *cToolchain) { RawProjectPart part; part.setDisplayName(target.name); @@ -266,24 +266,24 @@ RawProjectPart MesonProjectParser::buildRawPart( part.setIncludePaths(toAbsolutePath(m_buildDir, flags.includePaths)); part.setProjectFileLocation(target.definedIn); if (sources.language == "cpp") - part.setFlagsForCxx({cxxToolChain, flags.args, {}}); + part.setFlagsForCxx({cxxToolchain, flags.args, {}}); else if (sources.language == "c") - part.setFlagsForC({cToolChain, flags.args, {}}); + part.setFlagsForC({cToolchain, flags.args, {}}); part.setQtVersion(m_qtVersion); return part; } RawProjectParts MesonProjectParser::buildProjectParts( - const Toolchain *cxxToolChain, const Toolchain *cToolChain) + const Toolchain *cxxToolchain, const Toolchain *cToolchain) { RawProjectParts parts; for_each_source_group(m_parserResult.targets, [&parts, - &cxxToolChain, - &cToolChain, + &cxxToolchain, + &cToolchain, this](const Target &target, const Target::SourceGroup &sourceList) { parts.push_back( - buildRawPart(target, sourceList, cxxToolChain, cToolChain)); + buildRawPart(target, sourceList, cxxToolchain, cToolchain)); }); return parts; } diff --git a/src/plugins/mesonprojectmanager/mesonprojectparser.h b/src/plugins/mesonprojectmanager/mesonprojectparser.h index 415a9d660b2..126d9b4d0fd 100644 --- a/src/plugins/mesonprojectmanager/mesonprojectparser.h +++ b/src/plugins/mesonprojectmanager/mesonprojectparser.h @@ -57,8 +57,8 @@ public: QList<ProjectExplorer::BuildTargetInfo> appsTargets() const; ProjectExplorer::RawProjectParts buildProjectParts( - const ProjectExplorer::Toolchain *cxxToolChain, - const ProjectExplorer::Toolchain *cToolChain); + const ProjectExplorer::Toolchain *cxxToolchain, + const ProjectExplorer::Toolchain *cToolchain); void setEnvironment(const Utils::Environment &environment) { m_env = environment; } @@ -78,8 +78,8 @@ private: void update(const QFuture<ParserData *> &data); ProjectExplorer::RawProjectPart buildRawPart(const Target &target, const Target::SourceGroup &sources, - const ProjectExplorer::Toolchain *cxxToolChain, - const ProjectExplorer::Toolchain *cToolChain); + const ProjectExplorer::Toolchain *cxxToolchain, + const ProjectExplorer::Toolchain *cToolchain); MesonOutputParser m_outputParser; Utils::Environment m_env; |