mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-28 01:49:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revise C++ coding style using clang-format with "east const"

Browse Source 
Run the `clang-format.bash` script to update all our C and C++ code to a
new style defined by `.clang-format`, now with "east const" enforcement.
Use `clang-format` version 18.

* If you reached this commit for a line in `git blame`, re-run the blame
  operation starting at the parent of this commit to see older history
  for the content.

* See the parent commit for instructions to rebase a change across this
  style transition commit.

Issue: #26123
This commit is contained in:
Kitware Robot
2025-01-23 11:54:40 -05:00
committed by Brad King
parent 6ef947ea97
commit 0b96ae1f6a
887 changed files with 9690 additions and 9692 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmExtraCodeBlocksGenerator.cxx
+31 -31
View File
@@ -74,7 +74,7 @@ void cmExtraCodeBlocksGenerator::Generate()
/* create the project file */
void cmExtraCodeBlocksGenerator::CreateProjectFile(
const std::vector<cmLocalGenerator*>& lgs)
std::vector<cmLocalGenerator*> const& lgs)
{
std::string outputDir = lgs[0]->GetCurrentBinaryDirectory();
std::string projectName = lgs[0]->GetProjectName();
@@ -97,20 +97,20 @@ struct Tree
std::string path; // only one component of the path
std::vector<Tree> folders;
std::set<std::string> files;
void InsertPath(const std::vector<std::string>& split,
void InsertPath(std::vector<std::string> const& split,
std::vector<std::string>::size_type start,
const std::string& fileName);
std::string const& fileName);
void BuildVirtualFolder(cmXMLWriter& xml) const;
void BuildVirtualFolderImpl(std::string& virtualFolders,
const std::string& prefix) const;
void BuildUnit(cmXMLWriter& xml, const std::string& fsPath) const;
void BuildUnitImpl(cmXMLWriter& xml, const std::string& virtualFolderPath,
const std::string& fsPath) const;
std::string const& prefix) const;
void BuildUnit(cmXMLWriter& xml, std::string const& fsPath) const;
void BuildUnitImpl(cmXMLWriter& xml, std::string const& virtualFolderPath,
std::string const& fsPath) const;
};
void Tree::InsertPath(const std::vector<std::string>& split,
void Tree::InsertPath(std::vector<std::string> const& split,
std::vector<std::string>::size_type start,
const std::string& fileName)
std::string const& fileName)
{
if (start == split.size()) {
this->files.insert(fileName);
@@ -152,7 +152,7 @@ void Tree::BuildVirtualFolder(cmXMLWriter& xml) const
}
void Tree::BuildVirtualFolderImpl(std::string& virtualFolders,
const std::string& prefix) const
std::string const& prefix) const
{
virtualFolders += "CMake Files\\" + prefix + this->path + "\\;";
for (Tree const& folder : this->folders) {
@@ -160,7 +160,7 @@ void Tree::BuildVirtualFolderImpl(std::string& virtualFolders,
}
}
void Tree::BuildUnit(cmXMLWriter& xml, const std::string& fsPath) const
void Tree::BuildUnit(cmXMLWriter& xml, std::string const& fsPath) const
{
for (std::string const& f : this->files) {
xml.StartElement("Unit");
@@ -178,8 +178,8 @@ void Tree::BuildUnit(cmXMLWriter& xml, const std::string& fsPath) const
}
void Tree::BuildUnitImpl(cmXMLWriter& xml,
const std::string& virtualFolderPath,
const std::string& fsPath) const
std::string const& virtualFolderPath,
std::string const& fsPath) const
{
for (std::string const& f : this->files) {
xml.StartElement("Unit");
@@ -200,9 +200,9 @@ void Tree::BuildUnitImpl(cmXMLWriter& xml,
}
void cmExtraCodeBlocksGenerator::CreateNewProjectFile(
const std::vector<cmLocalGenerator*>& lgs, const std::string& filename)
std::vector<cmLocalGenerator*> const& lgs, std::string const& filename)
{
const cmMakefile* mf = lgs[0]->GetMakefile();
cmMakefile const* mf = lgs[0]->GetMakefile();
cmGeneratedFileStream fout(filename);
if (!fout) {
return;
@@ -225,7 +225,7 @@ void cmExtraCodeBlocksGenerator::CreateNewProjectFile(
continue;
}
const std::string& relative = cmSystemTools::RelativePath(
std::string const& relative = cmSystemTools::RelativePath(
it.second[0]->GetSourceDirectory(), listFile);
std::vector<std::string> split;
cmSystemTools::SplitPath(relative, split, false);
@@ -239,7 +239,7 @@ void cmExtraCodeBlocksGenerator::CreateNewProjectFile(
//
// Also we can disable external (outside the project) files by setting ON
// CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES variable.
const bool excludeExternal = it.second[0]->GetMakefile()->IsOn(
bool const excludeExternal = it.second[0]->GetMakefile()->IsOn(
"CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES");
if (!split.empty() &&
(!excludeExternal || (relative.find("..") == std::string::npos)) &&
@@ -251,8 +251,8 @@ void cmExtraCodeBlocksGenerator::CreateNewProjectFile(
// figure out the compiler
std::string compiler = this->GetCBCompilerId(mf);
const std::string& make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
const std::string& makeArgs =
std::string const& make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
std::string const& makeArgs =
mf->GetSafeDefinition("CMAKE_CODEBLOCKS_MAKE_ARGUMENTS");
cmXMLWriter xml(fout);
@@ -288,8 +288,8 @@ void cmExtraCodeBlocksGenerator::CreateNewProjectFile(
// add all executable and library targets and some of the GLOBAL
// and UTILITY targets
for (cmLocalGenerator* lg : lgs) {
const auto& targets = lg->GetGeneratorTargets();
for (const auto& target : targets) {
auto const& targets = lg->GetGeneratorTargets();
for (auto const& target : targets) {
std::string targetName = target->GetName();
switch (target->GetType()) {
case cmStateEnums::GLOBAL_TARGET: {
@@ -346,8 +346,8 @@ void cmExtraCodeBlocksGenerator::CreateNewProjectFile(
for (cmLocalGenerator* lg : lgs) {
cmMakefile* makefile = lg->GetMakefile();
const auto& targets = lg->GetGeneratorTargets();
for (const auto& target : targets) {
auto const& targets = lg->GetGeneratorTargets();
for (auto const& target : targets) {
switch (target->GetType()) {
case cmStateEnums::EXECUTABLE:
case cmStateEnums::STATIC_LIBRARY:
@@ -379,11 +379,11 @@ void cmExtraCodeBlocksGenerator::CreateNewProjectFile(
std::string const& fullPath = s->ResolveFullPath();
// Check file position relative to project root dir.
const std::string relative =
std::string const relative =
cmSystemTools::RelativePath(lg->GetSourceDirectory(), fullPath);
// Do not add this file if it has ".." in relative path and
// if CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES variable is on.
const bool excludeExternal = lg->GetMakefile()->IsOn(
bool const excludeExternal = lg->GetMakefile()->IsOn(
"CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES");
if (excludeExternal &&
(relative.find("..") != std::string::npos)) {
@@ -483,9 +483,9 @@ std::string cmExtraCodeBlocksGenerator::CreateDummyTargetFile(
// Generate the xml code for one target.
void cmExtraCodeBlocksGenerator::AppendTarget(
cmXMLWriter& xml, const std::string& targetName, cmGeneratorTarget* target,
const std::string& make, const cmLocalGenerator* lg,
const std::string& compiler, const std::string& makeFlags)
cmXMLWriter& xml, std::string const& targetName, cmGeneratorTarget* target,
std::string const& make, cmLocalGenerator const* lg,
std::string const& compiler, std::string const& makeFlags)
{
cmMakefile const* makefile = lg->GetMakefile();
std::string makefileName =
@@ -626,7 +626,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget(
}
// Translate the cmake compiler id into the CodeBlocks compiler id
std::string cmExtraCodeBlocksGenerator::GetCBCompilerId(const cmMakefile* mf)
std::string cmExtraCodeBlocksGenerator::GetCBCompilerId(cmMakefile const* mf)
{
// allow the user to overwrite the detected compiler
std::string userCompiler =
@@ -719,8 +719,8 @@ int cmExtraCodeBlocksGenerator::GetCBTargetType(cmGeneratorTarget* target)
// Create the command line for building the given target using the selected
// make
std::string cmExtraCodeBlocksGenerator::BuildMakeCommand(
const std::string& make, const std::string& makefile,
const std::string& target, const std::string& makeFlags)
std::string const& make, std::string const& makefile,
std::string const& target, std::string const& makeFlags)
{
std::string command = make;
if (!makeFlags.empty()) {