Merge topic 'clang-format-source'

d9fd2f54 Revise C++ coding style using clang-format
82df6dea Empty commit at end of history preceding clang-format style transition
6a13f43f CONTRIBUTING: Add a section on coding style
bf451d9f Add a script to run clang-format on the entire source tree
1e90d78f Configure clang-format for CMake source tree
da60adc3 Tell Git to use a distinct conflict marker size in `.rst` files

1 files changed, 21 insertions, 31 deletions

diff --git a/Source/cmXCode21Object.cxx b/Source/cmXCode21Object.cxx
index b47e302..1abdf66 100644
--- a/Source/cmXCode21Object.cxx
+++ b/Source/cmXCode21Object.cxx
@@ -14,26 +14,23 @@
 #include "cmSystemTools.h"
 
 cmXCode21Object::cmXCode21Object(PBXType ptype, Type type)
-  :cmXCodeObject(ptype, type)
+  : cmXCodeObject(ptype, type)
 {
   this->Version = 21;
 }
 
 void cmXCode21Object::PrintComment(std::ostream& out)
 {
-  if(this->Comment.empty())
-    {
+  if (this->Comment.empty()) {
     cmXCodeObject* n = this->GetObject("name");
-    if(n)
-      {
+    if (n) {
       this->Comment = n->GetString();
       cmSystemTools::ReplaceString(this->Comment, "\"", "");
-      }
     }
-  if(this->Comment.empty())
-    {
+  }
+  if (this->Comment.empty()) {
     return;
-    }
+  }
   out << " /* ";
   out << this->Comment;
   out << " */";
@@ -43,31 +40,26 @@ void cmXCode21Object::PrintList(std::vector<cmXCodeObject*> const& v,
                                 std::ostream& out, PBXType t)
 {
   bool hasOne = false;
-  for(std::vector<cmXCodeObject*>::const_iterator i = v.begin();
-      i != v.end(); ++i)
-    {
+  for (std::vector<cmXCodeObject*>::const_iterator i = v.begin(); i != v.end();
+       ++i) {
     cmXCodeObject* obj = *i;
-    if(obj->GetType() == OBJECT && obj->GetIsA() == t)
-      {
+    if (obj->GetType() == OBJECT && obj->GetIsA() == t) {
       hasOne = true;
       break;
-      }
     }
-  if(!hasOne)
-    {
+  }
+  if (!hasOne) {
     return;
-    }
-  out << "\n/* Begin " <<  PBXTypeNames[t] << " section */\n";
-  for(std::vector<cmXCodeObject*>::const_iterator i = v.begin();
-      i != v.end(); ++i)
-    {
+  }
+  out << "\n/* Begin " << PBXTypeNames[t] << " section */\n";
+  for (std::vector<cmXCodeObject*>::const_iterator i = v.begin(); i != v.end();
+       ++i) {
     cmXCodeObject* obj = *i;
-    if(obj->GetType() == OBJECT && obj->GetIsA() == t)
-      {
-        obj->Print(out);
-      }
+    if (obj->GetType() == OBJECT && obj->GetIsA() == t) {
+      obj->Print(out);
     }
-  out << "/* End " <<  PBXTypeNames[t] << " section */\n";
+  }
+  out << "/* End " << PBXTypeNames[t] << " section */\n";
 }
 
 void cmXCode21Object::PrintList(std::vector<cmXCodeObject*> const& v,
@@ -80,8 +72,7 @@ void cmXCode21Object::PrintList(std::vector<cmXCodeObject*> const& v,
   cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXBuildStyle);
   cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXContainerItemProxy);
   cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXFileReference);
-  cmXCode21Object::PrintList(v, out,
-                             cmXCode21Object::PBXFrameworksBuildPhase);
+  cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXFrameworksBuildPhase);
   cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXGroup);
   cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXHeadersBuildPhase);
   cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXNativeTarget);
@@ -91,8 +82,7 @@ void cmXCode21Object::PrintList(std::vector<cmXCodeObject*> const& v,
   cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXResourcesBuildPhase);
   cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXSourcesBuildPhase);
   cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXCopyFilesBuildPhase);
-  cmXCode21Object::PrintList(v, out,
-                             cmXCode21Object::PBXApplicationReference);
+  cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXApplicationReference);
   cmXCode21Object::PrintList(v, out,
                              cmXCode21Object::PBXExecutableFileReference);
   cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXLibraryReference);