Revise C++ coding style using clang-format-6.0

Run the `clang-format.bash` script to update all our C and C++ code to a
new style defined by `.clang-format`.  Use `clang-format` version 6.0.

* 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.

13 files changed, 30 insertions, 30 deletions

diff --git a/Utilities/cm_bzlib.h b/Utilities/cm_bzlib.h
index e7f6d8990b..8669e9e6ea 100644
--- a/Utilities/cm_bzlib.h
+++ b/Utilities/cm_bzlib.h
@@ -6,9 +6,9 @@
 /* Use the bzip2 library configured for CMake.  */
 #include "cmThirdParty.h"
 #ifdef CMAKE_USE_SYSTEM_BZIP2
-#include <bzlib.h>
+#  include <bzlib.h>
 #else
-#include <cmbzip2/bzlib.h>
+#  include <cmbzip2/bzlib.h>
 #endif
 
 #endif
diff --git a/Utilities/cm_curl.h b/Utilities/cm_curl.h
index fc2b8ab8a1..673f8ad957 100644
--- a/Utilities/cm_curl.h
+++ b/Utilities/cm_curl.h
@@ -6,9 +6,9 @@
 /* Use the curl library configured for CMake.  */
 #include "cmThirdParty.h"
 #ifdef CMAKE_USE_SYSTEM_CURL
-#include <curl/curl.h>
+#  include <curl/curl.h>
 #else
-#include <cmcurl/include/curl/curl.h>
+#  include <cmcurl/include/curl/curl.h>
 #endif
 
 #endif
diff --git a/Utilities/cm_expat.h b/Utilities/cm_expat.h
index d879337151..fc5b39aba9 100644
--- a/Utilities/cm_expat.h
+++ b/Utilities/cm_expat.h
@@ -6,9 +6,9 @@
 /* Use the expat library configured for CMake.  */
 #include "cmThirdParty.h"
 #ifdef CMAKE_USE_SYSTEM_EXPAT
-#include <expat.h>
+#  include <expat.h>
 #else
-#include <cmexpat/lib/expat.h>
+#  include <cmexpat/lib/expat.h>
 #endif
 
 #endif
diff --git a/Utilities/cm_jsoncpp_reader.h b/Utilities/cm_jsoncpp_reader.h
index e78ec1e0c7..23af65c619 100644
--- a/Utilities/cm_jsoncpp_reader.h
+++ b/Utilities/cm_jsoncpp_reader.h
@@ -6,9 +6,9 @@
 /* Use the jsoncpp library configured for CMake.  */
 #include "cmThirdParty.h"
 #ifdef CMAKE_USE_SYSTEM_JSONCPP
-#include <json/reader.h>
+#  include <json/reader.h>
 #else
-#include <cmjsoncpp/include/json/reader.h>
+#  include <cmjsoncpp/include/json/reader.h>
 #endif
 
 #endif
diff --git a/Utilities/cm_jsoncpp_value.h b/Utilities/cm_jsoncpp_value.h
index cf3775859a..742d99a014 100644
--- a/Utilities/cm_jsoncpp_value.h
+++ b/Utilities/cm_jsoncpp_value.h
@@ -6,9 +6,9 @@
 /* Use the jsoncpp library configured for CMake.  */
 #include "cmThirdParty.h"
 #ifdef CMAKE_USE_SYSTEM_JSONCPP
-#include <json/value.h>
+#  include <json/value.h>
 #else
-#include <cmjsoncpp/include/json/value.h>
+#  include <cmjsoncpp/include/json/value.h>
 #endif
 
 #endif
diff --git a/Utilities/cm_jsoncpp_writer.h b/Utilities/cm_jsoncpp_writer.h
index 33b246847c..d9e5d82170 100644
--- a/Utilities/cm_jsoncpp_writer.h
+++ b/Utilities/cm_jsoncpp_writer.h
@@ -6,9 +6,9 @@
 /* Use the jsoncpp library configured for CMake.  */
 #include "cmThirdParty.h"
 #ifdef CMAKE_USE_SYSTEM_JSONCPP
-#include <json/writer.h>
+#  include <json/writer.h>
 #else
-#include <cmjsoncpp/include/json/writer.h>
+#  include <cmjsoncpp/include/json/writer.h>
 #endif
 
 #endif
diff --git a/Utilities/cm_kwiml.h b/Utilities/cm_kwiml.h
index 65cb35f968..566f67e43d 100644
--- a/Utilities/cm_kwiml.h
+++ b/Utilities/cm_kwiml.h
@@ -6,11 +6,11 @@
 /* Use the KWIML library configured for CMake.  */
 #include "cmThirdParty.h"
 #ifdef CMAKE_USE_SYSTEM_KWIML
-#include <kwiml/abi.h>
-#include <kwiml/int.h>
+#  include <kwiml/abi.h>
+#  include <kwiml/int.h>
 #else
-#include "KWIML/include/kwiml/abi.h"
-#include "KWIML/include/kwiml/int.h"
+#  include "KWIML/include/kwiml/abi.h"
+#  include "KWIML/include/kwiml/int.h"
 #endif
 
 #endif
diff --git a/Utilities/cm_libarchive.h b/Utilities/cm_libarchive.h
index 2269526015..ea8e9db628 100644
--- a/Utilities/cm_libarchive.h
+++ b/Utilities/cm_libarchive.h
@@ -6,11 +6,11 @@
 /* Use the libarchive configured for CMake.  */
 #include "cmThirdParty.h"
 #ifdef CMAKE_USE_SYSTEM_LIBARCHIVE
-#include <archive.h>
-#include <archive_entry.h>
+#  include <archive.h>
+#  include <archive_entry.h>
 #else
-#include <cmlibarchive/libarchive/archive.h>
-#include <cmlibarchive/libarchive/archive_entry.h>
+#  include <cmlibarchive/libarchive/archive.h>
+#  include <cmlibarchive/libarchive/archive_entry.h>
 #endif
 
 #endif
diff --git a/Utilities/cm_lzma.h b/Utilities/cm_lzma.h
index 013c724b91..0526036c6f 100644
--- a/Utilities/cm_lzma.h
+++ b/Utilities/cm_lzma.h
@@ -6,9 +6,9 @@
 /* Use the liblzma configured for CMake.  */
 #include "cmThirdParty.h"
 #ifdef CMAKE_USE_SYSTEM_LIBLZMA
-#include <lzma.h>
+#  include <lzma.h>
 #else
-#include <cmliblzma/liblzma/api/lzma.h>
+#  include <cmliblzma/liblzma/api/lzma.h>
 #endif
 
 #endif
diff --git a/Utilities/cm_rhash.h b/Utilities/cm_rhash.h
index c793627756..03d9871f77 100644
--- a/Utilities/cm_rhash.h
+++ b/Utilities/cm_rhash.h
@@ -6,9 +6,9 @@
 /* Use the LibRHash library configured for CMake.  */
 #include "cmThirdParty.h"
 #ifdef CMAKE_USE_SYSTEM_LIBRHASH
-#include <rhash.h>
+#  include <rhash.h>
 #else
-#include <cmlibrhash/librhash/rhash.h>
+#  include <cmlibrhash/librhash/rhash.h>
 #endif
 
 #endif
diff --git a/Utilities/cm_uv.h b/Utilities/cm_uv.h
index 6d4813de1b..448f30d8df 100644
--- a/Utilities/cm_uv.h
+++ b/Utilities/cm_uv.h
@@ -6,9 +6,9 @@
 /* Use the libuv library configured for CMake.  */
 #include "cmThirdParty.h"
 #ifdef CMAKE_USE_SYSTEM_LIBUV
-#include <uv.h>
+#  include <uv.h>
 #else
-#include <cmlibuv/include/uv.h>
+#  include <cmlibuv/include/uv.h>
 #endif
 
 #endif
diff --git a/Utilities/cm_xmlrpc.h b/Utilities/cm_xmlrpc.h
index 08db89f606..932066aaa9 100644
--- a/Utilities/cm_xmlrpc.h
+++ b/Utilities/cm_xmlrpc.h
@@ -6,8 +6,8 @@
 /* Use the xmlrpc library configured for CMake.  */
 #include "cmThirdParty.h"
 #ifdef CTEST_USE_XMLRPC
-#include <xmlrpc.h>
-#include <xmlrpc_client.h>
+#  include <xmlrpc.h>
+#  include <xmlrpc_client.h>
 #endif
 
 #endif
diff --git a/Utilities/cm_zlib.h b/Utilities/cm_zlib.h
index 2aee9f1945..2314183b1e 100644
--- a/Utilities/cm_zlib.h
+++ b/Utilities/cm_zlib.h
@@ -6,9 +6,9 @@
 /* Use the zlib library configured for CMake.  */
 #include "cmThirdParty.h"
 #ifdef CMAKE_USE_SYSTEM_ZLIB
-#include <zlib.h>
+#  include <zlib.h>
 #else
-#include <cmzlib/zlib.h>
+#  include <cmzlib/zlib.h>
 #endif
 
 #endif