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.

1 files changed, 40 insertions, 36 deletions

diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index 315e9155d3..5e7fab515c 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -30,7 +30,6 @@ public:
   bool Run(const std::string& targetDirectory, const std::string& config);
 
 private:
-
   bool ReadAutogenInfoFile(cmMakefile* makefile,
                            const std::string& targetDirectory,
                            const std::string& config);
@@ -42,59 +41,64 @@ private:
 
   bool RunAutogen(cmMakefile* makefile);
   bool GenerateMocFiles(
-              const std::map<std::string, std::string>& includedMocs,
-              const std::map<std::string, std::string>& notIncludedMocs);
+    const std::map<std::string, std::string>& includedMocs,
+    const std::map<std::string, std::string>& notIncludedMocs);
   bool GenerateMoc(const std::string& sourceFile,
                    const std::string& mocFileName);
   bool GenerateUiFiles(
-        const std::map<std::string, std::vector<std::string> >& includedUis );
-  bool GenerateUi(const std::string& realName,
-                  const std::string& uiInputFile,
-                  const std::string& uiOutputFile );
+    const std::map<std::string, std::vector<std::string> >& includedUis);
+  bool GenerateUi(const std::string& realName, const std::string& uiInputFile,
+                  const std::string& uiOutputFile);
   bool GenerateQrcFiles();
   bool GenerateQrc(const std::string& qrcInputFile,
                    const std::string& qrcOutputFile);
-  void ParseCppFile(const std::string& absFilename,
-              const std::vector<std::string>& headerExtensions,
-              std::map<std::string, std::string>& includedMocs,
-              std::map<std::string, std::vector<std::string> >& includedUis);
-  void StrictParseCppFile(const std::string& absFilename,
-              const std::vector<std::string>& headerExtensions,
-              std::map<std::string, std::string>& includedMocs,
-              std::map<std::string, std::vector<std::string> >& includedUis);
-  void SearchHeadersForCppFile(const std::string& absFilename,
-                              const std::vector<std::string>& headerExtensions,
-                              std::set<std::string>& absHeaders);
-
-  void ParseHeaders(const std::set<std::string>& absHeaders,
-              const std::map<std::string, std::string>& includedMocs,
-              std::map<std::string, std::string>& notIncludedMocs,
-              std::map<std::string, std::vector<std::string> >& includedUis);
-
-  void ParseForUic(const std::string& fileName,
-              const std::string& contentsString,
-              std::map<std::string, std::vector<std::string> >& includedUis);
-
-  void ParseForUic(const std::string& fileName,
-              std::map<std::string, std::vector<std::string> >& includedUis);
+  void ParseCppFile(
+    const std::string& absFilename,
+    const std::vector<std::string>& headerExtensions,
+    std::map<std::string, std::string>& includedMocs,
+    std::map<std::string, std::vector<std::string> >& includedUis);
+  void StrictParseCppFile(
+    const std::string& absFilename,
+    const std::vector<std::string>& headerExtensions,
+    std::map<std::string, std::string>& includedMocs,
+    std::map<std::string, std::vector<std::string> >& includedUis);
+  void SearchHeadersForCppFile(
+    const std::string& absFilename,
+    const std::vector<std::string>& headerExtensions,
+    std::set<std::string>& absHeaders);
+
+  void ParseHeaders(
+    const std::set<std::string>& absHeaders,
+    const std::map<std::string, std::string>& includedMocs,
+    std::map<std::string, std::string>& notIncludedMocs,
+    std::map<std::string, std::vector<std::string> >& includedUis);
+
+  void ParseForUic(
+    const std::string& fileName, const std::string& contentsString,
+    std::map<std::string, std::vector<std::string> >& includedUis);
+
+  void ParseForUic(
+    const std::string& fileName,
+    std::map<std::string, std::vector<std::string> >& includedUis);
 
   void Init();
 
   std::string SourceRelativePath(const std::string& filename);
 
-  bool NameCollisionTest(const std::map<std::string, std::string >& genFiles,
-    std::multimap<std::string, std::string>& collisions );
+  bool NameCollisionTest(const std::map<std::string, std::string>& genFiles,
+                         std::multimap<std::string, std::string>& collisions);
   void NameCollisionLog(
-                 const std::string& message,
-                 const std::multimap<std::string, std::string>& collisions );
+    const std::string& message,
+    const std::multimap<std::string, std::string>& collisions);
 
   void LogInfo(const std::string& message);
   void LogError(const std::string& message);
   void LogCommand(const std::vector<std::string>& command);
   std::string JoinExts(const std::vector<std::string>& lst);
 
-  static void MergeUicOptions(std::vector<std::string> &opts,
-                       const std::vector<std::string> &fileOpts, bool isQt5);
+  static void MergeUicOptions(std::vector<std::string>& opts,
+                              const std::vector<std::string>& fileOpts,
+                              bool isQt5);
 
   bool InputFilesNewerThanQrc(const std::string& qrcFile,
                               const std::string& rccOutput);