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, 16 insertions, 14 deletions

diff --git a/Source/cmTargetPropCommandBase.h b/Source/cmTargetPropCommandBase.h
index 4f1f108..88591dc 100644
--- a/Source/cmTargetPropCommandBase.h
+++ b/Source/cmTargetPropCommandBase.h
@@ -20,8 +20,8 @@ class cmTarget;
 class cmTargetPropCommandBase : public cmCommand
 {
 public:
-
-  enum ArgumentFlags {
+  enum ArgumentFlags
+  {
     NO_FLAGS = 0,
     PROCESS_BEFORE = 1,
     PROCESS_SYSTEM = 2
@@ -32,27 +32,29 @@ public:
                        ArgumentFlags flags = NO_FLAGS);
 
   cmTypeMacro(cmTargetPropCommandBase, cmCommand);
+
 protected:
   std::string Property;
-  cmTarget *Target;
+  cmTarget* Target;
+
+  virtual void HandleInterfaceContent(cmTarget* tgt,
+                                      const std::vector<std::string>& content,
+                                      bool prepend, bool system);
 
-  virtual void HandleInterfaceContent(cmTarget *tgt,
-                                   const std::vector<std::string> &content,
-                                   bool prepend, bool system);
 private:
-  virtual void HandleImportedTarget(const std::string &tgt) = 0;
-  virtual void HandleMissingTarget(const std::string &name) = 0;
+  virtual void HandleImportedTarget(const std::string& tgt) = 0;
+  virtual void HandleMissingTarget(const std::string& name) = 0;
 
-  virtual bool HandleDirectContent(cmTarget *tgt,
-                                   const std::vector<std::string> &content,
+  virtual bool HandleDirectContent(cmTarget* tgt,
+                                   const std::vector<std::string>& content,
                                    bool prepend, bool system) = 0;
 
-  virtual std::string Join(const std::vector<std::string> &content) = 0;
+  virtual std::string Join(const std::vector<std::string>& content) = 0;
 
   bool ProcessContentArgs(std::vector<std::string> const& args,
-                          unsigned int &argIndex, bool prepend, bool system);
-  bool PopulateTargetProperies(const std::string &scope,
-                               const std::vector<std::string> &content,
+                          unsigned int& argIndex, bool prepend, bool system);
+  bool PopulateTargetProperies(const std::string& scope,
+                               const std::vector<std::string>& content,
                                bool prepend, bool system);
 };