diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 14:34:04 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 20:05:19 (GMT) |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Source/cmXCodeObject.cxx | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | CMake-d9fd2f5402eeaa345691313658e02b51038f570b.zip CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.bz2 |
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update
all our C++ code to a new style defined by `.clang-format`.
Use `clang-format` version 3.8.
* 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.
Diffstat (limited to 'Source/cmXCodeObject.cxx')
-rw-r--r-- | Source/cmXCodeObject.cxx | 209 |
1 files changed, 93 insertions, 116 deletions
diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx index 6a6c253..3d31343 100644 --- a/Source/cmXCodeObject.cxx +++ b/Source/cmXCodeObject.cxx @@ -17,17 +17,30 @@ const char* cmXCodeObject::PBXTypeNames[] = { /* clang-format needs this comment to break after the opening brace */ - "PBXGroup", "PBXBuildStyle", "PBXProject", "PBXHeadersBuildPhase", - "PBXSourcesBuildPhase", "PBXFrameworksBuildPhase", "PBXNativeTarget", - "PBXFileReference", "PBXBuildFile", "PBXContainerItemProxy", - "PBXTargetDependency", "PBXShellScriptBuildPhase", - "PBXResourcesBuildPhase", "PBXApplicationReference", - "PBXExecutableFileReference", "PBXLibraryReference", "PBXToolTarget", - "PBXLibraryTarget", "PBXAggregateTarget", "XCBuildConfiguration", - "XCConfigurationList", - "PBXCopyFilesBuildPhase", - "None" - }; + "PBXGroup", + "PBXBuildStyle", + "PBXProject", + "PBXHeadersBuildPhase", + "PBXSourcesBuildPhase", + "PBXFrameworksBuildPhase", + "PBXNativeTarget", + "PBXFileReference", + "PBXBuildFile", + "PBXContainerItemProxy", + "PBXTargetDependency", + "PBXShellScriptBuildPhase", + "PBXResourcesBuildPhase", + "PBXApplicationReference", + "PBXExecutableFileReference", + "PBXLibraryReference", + "PBXToolTarget", + "PBXLibraryTarget", + "PBXAggregateTarget", + "XCBuildConfiguration", + "XCConfigurationList", + "PBXCopyFilesBuildPhase", + "None" +}; cmXCodeObject::~cmXCodeObject() { @@ -38,82 +51,73 @@ cmXCodeObject::cmXCodeObject(PBXType ptype, Type type) { this->Version = 15; this->Target = 0; - this->Object =0; + this->Object = 0; this->IsA = ptype; - if(type == OBJECT) - { + if (type == OBJECT) { // Set the Id of an Xcode object to a unique string for each instance. // However the Xcode user file references certain Ids: for those cases, // override the generated Id using SetId(). // - char cUuid[40] = {0}; + char cUuid[40] = { 0 }; CFUUIDRef uuid = CFUUIDCreate(kCFAllocatorDefault); CFStringRef s = CFUUIDCreateString(kCFAllocatorDefault, uuid); CFStringGetCString(s, cUuid, sizeof(cUuid), kCFStringEncodingUTF8); this->Id = cUuid; CFRelease(s); CFRelease(uuid); - } - else - { + } else { this->Id = "Temporary cmake object, should not be referred to in Xcode file"; - } + } cmSystemTools::ReplaceString(this->Id, "-", ""); - if(this->Id.size() > 24) - { + if (this->Id.size() > 24) { this->Id = this->Id.substr(0, 24); - } + } this->TypeValue = type; - if(this->TypeValue == OBJECT) - { + if (this->TypeValue == OBJECT) { this->AddAttribute("isa", 0); - } + } } void cmXCodeObject::Indent(int level, std::ostream& out) { - while(level) - { + while (level) { out << "\t"; level--; - } + } } void cmXCodeObject::Print(std::ostream& out) { std::string separator = "\n"; int indentFactor = 1; - cmXCodeObject::Indent(2*indentFactor, out); - if(this->Version > 15 - && (this->IsA == PBXFileReference || this->IsA == PBXBuildFile)) - { + cmXCodeObject::Indent(2 * indentFactor, out); + if (this->Version > 15 && + (this->IsA == PBXFileReference || this->IsA == PBXBuildFile)) { separator = " "; indentFactor = 0; - } + } out << this->Id; this->PrintComment(out); out << " = {"; - if(separator == "\n") - { + if (separator == "\n") { out << separator; - } + } std::map<std::string, cmXCodeObject*>::iterator i; - cmXCodeObject::Indent(3*indentFactor, out); - out << "isa = " << PBXTypeNames[this->IsA] << ";" << separator; - for(i = this->ObjectAttributes.begin(); - i != this->ObjectAttributes.end(); ++i) - { - if(i->first == "isa") + cmXCodeObject::Indent(3 * indentFactor, out); + out << "isa = " << PBXTypeNames[this->IsA] << ";" << separator; + for (i = this->ObjectAttributes.begin(); i != this->ObjectAttributes.end(); + ++i) { + if (i->first == "isa") continue; PrintAttribute(out, 3, separator, indentFactor, i->first, i->second, this); - } - cmXCodeObject::Indent(2*indentFactor, out); + } + cmXCodeObject::Indent(2 * indentFactor, out); out << "};\n"; } @@ -124,86 +128,66 @@ void cmXCodeObject::PrintAttribute(std::ostream& out, const int level, const cmXCodeObject* parent) { cmXCodeObject::Indent(level * factor, out); - switch(object->TypeValue) - { - case OBJECT_LIST: - { + switch (object->TypeValue) { + case OBJECT_LIST: { out << name << " = ("; - if(parent->TypeValue != ATTRIBUTE_GROUP) - { + if (parent->TypeValue != ATTRIBUTE_GROUP) { out << separator; - } - for(unsigned int i = 0; i < object->List.size(); ++i) - { - if(object->List[i]->TypeValue == STRING) - { + } + for (unsigned int i = 0; i < object->List.size(); ++i) { + if (object->List[i]->TypeValue == STRING) { object->List[i]->PrintString(out); - if(i+1 < object->List.size()) - { + if (i + 1 < object->List.size()) { out << ","; - } } - else - { + } else { cmXCodeObject::Indent((level + 1) * factor, out); out << object->List[i]->Id; object->List[i]->PrintComment(out); out << "," << separator; - } } - if(parent->TypeValue != ATTRIBUTE_GROUP) - { + } + if (parent->TypeValue != ATTRIBUTE_GROUP) { cmXCodeObject::Indent(level * factor, out); - } - out << ");" << separator; } - break; + out << ");" << separator; + } break; - case ATTRIBUTE_GROUP: - { + case ATTRIBUTE_GROUP: { out << name << " = {"; - if(separator == "\n") - { + if (separator == "\n") { out << separator; - } + } std::map<std::string, cmXCodeObject*>::const_iterator i; - for(i = object->ObjectAttributes.begin(); - i != object->ObjectAttributes.end(); ++i) - { - PrintAttribute(out, (level + 1) * factor, separator, factor, - i->first, i->second, object); - } + for (i = object->ObjectAttributes.begin(); + i != object->ObjectAttributes.end(); ++i) { + PrintAttribute(out, (level + 1) * factor, separator, factor, i->first, + i->second, object); + } cmXCodeObject::Indent(level * factor, out); out << "};" << separator; - } - break; + } break; - case OBJECT_REF: - { + case OBJECT_REF: { cmXCodeObject::PrintString(out, name); out << " = " << object->Object->Id; - if(object->Object->HasComment() && name != "remoteGlobalIDString") - { + if (object->Object->HasComment() && name != "remoteGlobalIDString") { object->Object->PrintComment(out); - } - out << ";" << separator; } - break; + out << ";" << separator; + } break; - case STRING: - { + case STRING: { cmXCodeObject::PrintString(out, name); out << " = "; object->PrintString(out); out << ";" << separator; - } - break; + } break; - default: - { + default: { break; - } } + } } void cmXCodeObject::PrintList(std::vector<cmXCodeObject*> const& objs, @@ -211,13 +195,11 @@ void cmXCodeObject::PrintList(std::vector<cmXCodeObject*> const& objs, { cmXCodeObject::Indent(1, out); out << "objects = {\n"; - for(unsigned int i = 0; i < objs.size(); ++i) - { - if(objs[i]->TypeValue == OBJECT) - { + for (unsigned int i = 0; i < objs.size(); ++i) { + if (objs[i]->TypeValue == OBJECT) { objs[i]->Print(out); - } } + } cmXCodeObject::Indent(1, out); out << "};\n"; } @@ -230,38 +212,33 @@ void cmXCodeObject::CopyAttributes(cmXCodeObject* copy) this->Object = copy->Object; } -void cmXCodeObject::PrintString(std::ostream& os,std::string String) +void cmXCodeObject::PrintString(std::ostream& os, std::string String) { // The string needs to be quoted if it contains any characters // considered special by the Xcode project file parser. - bool needQuote = - (String.empty() || - String.find("//") != String.npos || - String.find_first_not_of( - "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "abcdefghijklmnopqrstuvwxyz" - "0123456789" - "$_./") != String.npos); - const char* quote = needQuote? "\"" : ""; + bool needQuote = (String.empty() || String.find("//") != String.npos || + String.find_first_not_of("ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz" + "0123456789" + "$_./") != String.npos); + const char* quote = needQuote ? "\"" : ""; // Print the string, quoted and escaped as necessary. os << quote; - for(std::string::const_iterator i = String.begin(); - i != String.end(); ++i) - { - if(*i == '"' || *i == '\\') - { + for (std::string::const_iterator i = String.begin(); i != String.end(); + ++i) { + if (*i == '"' || *i == '\\') { // Escape double-quotes and backslashes. os << '\\'; - } - os << *i; } + os << *i; + } os << quote; } void cmXCodeObject::PrintString(std::ostream& os) const { - cmXCodeObject::PrintString(os,this->String); + cmXCodeObject::PrintString(os, this->String); } void cmXCodeObject::SetString(const std::string& s) |