Commit ed98209d authored by Kitware Robot's avatar Kitware Robot Committed by Brad King

Revise include order using clang-format-6.0

Run the `clang-format.bash` script to update our C and C++ code to a new
include order `.clang-format`.  Use `clang-format` version 6.0.
parent 185fe49f
#include "MathFunctions.h"
#include <cmath>
#ifdef USE_MYMATH
......
#include "MathFunctions.h"
#include <iostream>
#include "MathFunctions.h"
// include the generated table
#include "Table.h"
......
#include "MathFunctions.h"
#include <cmath>
#ifdef USE_MYMATH
......
#include "MathFunctions.h"
#include <iostream>
#include "MathFunctions.h"
// include the generated table
#include "Table.h"
......
#include "MathFunctions.h"
#include <cmath>
#ifdef USE_MYMATH
......
#include "MathFunctions.h"
#include <iostream>
#include "MathFunctions.h"
// include the generated table
#include "Table.h"
......
#include "MathFunctions.h"
#include <cmath>
#ifdef USE_MYMATH
......
#include "MathFunctions.h"
#include <iostream>
#include "MathFunctions.h"
// include the generated table
#include "Table.h"
......
#include "MathFunctions.h"
#include <iostream>
#include "MathFunctions.h"
// a hack square root calculation using simple operations
double mysqrt(double x)
{
......
#include "MathFunctions.h"
#include <iostream>
#include "MathFunctions.h"
// a hack square root calculation using simple operations
double mysqrt(double x)
{
......
#include "MathFunctions.h"
#include <iostream>
#include "MathFunctions.h"
// a hack square root calculation using simple operations
double mysqrt(double x)
{
......
#include "MathFunctions.h"
#include <cmath>
#include <iostream>
#include <cmath>
#include "MathFunctions.h"
// a hack square root calculation using simple operations
double mysqrt(double x)
......
#include "MathFunctions.h"
#include <iostream>
#include "MathFunctions.h"
// include the generated table
#include "Table.h"
......
#include "MathFunctions.h"
#include <iostream>
#include "MathFunctions.h"
// include the generated table
#include "Table.h"
......
#include "MathFunctions.h"
#include <cmath>
#ifdef USE_MYMATH
......
#include "MathFunctions.h"
#include <iostream>
#include "MathFunctions.h"
// include the generated table
#include "Table.h"
......
......@@ -2,6 +2,11 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmCPackIFWCommon.h"
#include <cstddef>
#include <sstream>
#include <utility>
#include <vector>
#include "cmCPackGenerator.h"
#include "cmCPackIFWGenerator.h"
#include "cmCPackLog.h" // IWYU pragma: keep
......@@ -11,11 +16,6 @@
#include "cmVersionConfig.h"
#include "cmXMLWriter.h"
#include <cstddef>
#include <sstream>
#include <utility>
#include <vector>
cmCPackIFWCommon::cmCPackIFWCommon()
: Generator(nullptr)
{
......
......@@ -2,6 +2,9 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmCPackIFWGenerator.h"
#include <sstream>
#include <utility>
#include "cmCPackComponentGroup.h"
#include "cmCPackGenerator.h"
#include "cmCPackIFWCommon.h"
......@@ -14,9 +17,6 @@
#include "cmStringAlgorithms.h"
#include "cmSystemTools.h"
#include <sstream>
#include <utility>
cmCPackIFWGenerator::cmCPackIFWGenerator()
{
this->Generator = this;
......
......@@ -5,6 +5,11 @@
#include "cmConfigure.h" // IWYU pragma: keep
#include <map>
#include <set>
#include <string>
#include <vector>
#include "cmCPackComponentGroup.h"
#include "cmCPackGenerator.h"
#include "cmCPackIFWCommon.h"
......@@ -12,11 +17,6 @@
#include "cmCPackIFWPackage.h"
#include "cmCPackIFWRepository.h"
#include <map>
#include <set>
#include <string>
#include <vector>
/** \class cmCPackIFWGenerator
* \brief A generator for Qt Installer Framework tools
*
......
......@@ -2,6 +2,10 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmCPackIFWInstaller.h"
#include <cstddef>
#include <sstream>
#include <utility>
#include "cmCPackIFWCommon.h"
#include "cmCPackIFWGenerator.h"
#include "cmCPackIFWPackage.h"
......@@ -13,10 +17,6 @@
#include "cmXMLParser.h"
#include "cmXMLWriter.h"
#include <cstddef>
#include <sstream>
#include <utility>
cmCPackIFWInstaller::cmCPackIFWInstaller() = default;
void cmCPackIFWInstaller::printSkippedOptionWarning(
......
......@@ -5,12 +5,12 @@
#include "cmConfigure.h" // IWYU pragma: keep
#include "cmCPackIFWCommon.h"
#include <map>
#include <string>
#include <vector>
#include "cmCPackIFWCommon.h"
class cmCPackIFWPackage;
class cmCPackIFWRepository;
......
......@@ -2,6 +2,11 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmCPackIFWPackage.h"
#include <cstddef>
#include <map>
#include <sstream>
#include <utility>
#include "cmCPackComponentGroup.h"
#include "cmCPackIFWCommon.h"
#include "cmCPackIFWGenerator.h"
......@@ -13,11 +18,6 @@
#include "cmTimestamp.h"
#include "cmXMLWriter.h"
#include <cstddef>
#include <map>
#include <sstream>
#include <utility>
//---------------------------------------------------------- CompareStruct ---
cmCPackIFWPackage::CompareStruct::CompareStruct()
: Type(cmCPackIFWPackage::CompareNone)
......
......@@ -5,13 +5,13 @@
#include "cmConfigure.h" // IWYU pragma: keep
#include "cmCPackIFWCommon.h"
#include <map>
#include <set>
#include <string>
#include <vector>
#include "cmCPackIFWCommon.h"
class cmCPackComponent;
class cmCPackComponentGroup;
class cmCPackIFWInstaller;
......
......@@ -2,14 +2,14 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmCPackIFWRepository.h"
#include <cstddef>
#include "cmCPackIFWGenerator.h"
#include "cmGeneratedFileStream.h"
#include "cmSystemTools.h"
#include "cmXMLParser.h"
#include "cmXMLWriter.h"
#include <cstddef>
cmCPackIFWRepository::cmCPackIFWRepository()
: Update(cmCPackIFWRepository::None)
{
......
......@@ -5,11 +5,11 @@
#include "cmConfigure.h" // IWYU pragma: keep
#include "cmCPackIFWCommon.h"
#include <string>
#include <vector>
#include "cmCPackIFWCommon.h"
class cmXMLWriter;
/** \class cmCPackIFWRepository
......
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmsys/FStream.hxx"
#include "cmsys/Process.h"
#include "cmsys/SystemTools.hxx"
#include <cstddef>
#include <iostream>
#include <string>
......@@ -11,6 +7,10 @@
#include <CoreFoundation/CoreFoundation.h>
#include "cmsys/FStream.hxx"
#include "cmsys/Process.h"
#include "cmsys/SystemTools.hxx"
// For the PATH_MAX constant
#include <sys/syslimits.h>
......
......@@ -2,11 +2,11 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmCMakeToWixPath.h"
#include "cmStringAlgorithms.h"
#include <string>
#include <vector>
#include "cmStringAlgorithms.h"
#ifdef __CYGWIN__
# include <sys/cygwin.h>
std::string CMakeToWixPath(const std::string& cygpath)
......
......@@ -2,6 +2,15 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmCPackWIXGenerator.h"
#include <algorithm>
#include <cm/string_view>
#include "cmsys/Directory.hxx"
#include "cmsys/Encoding.hxx"
#include "cmsys/FStream.hxx"
#include "cmsys/SystemTools.hxx"
#include "cmAlgorithms.h"
#include "cmCPackComponentGroup.h"
#include "cmCPackLog.h"
......@@ -11,21 +20,12 @@
#include "cmStringAlgorithms.h"
#include "cmSystemTools.h"
#include "cmUuid.h"
#include <algorithm>
#include <cm/string_view>
#include "cmWIXDirectoriesSourceWriter.h"
#include "cmWIXFeaturesSourceWriter.h"
#include "cmWIXFilesSourceWriter.h"
#include "cmWIXRichTextFormatWriter.h"
#include "cmWIXSourceWriter.h"
#include "cmsys/Directory.hxx"
#include "cmsys/Encoding.hxx"
#include "cmsys/FStream.hxx"
#include "cmsys/SystemTools.hxx"
#ifdef _WIN32
# include <rpc.h> // for GUID generation (windows only)
#else
......
......@@ -3,14 +3,13 @@
#ifndef cmCPackWIXGenerator_h
#define cmCPackWIXGenerator_h
#include "cmCPackGenerator.h"
#include <map>
#include <string>
#include "cmCPackGenerator.h"
#include "cmWIXPatch.h"
#include "cmWIXShortcut.h"
#include <map>
#include <string>
class cmWIXSourceWriter;
class cmWIXDirectoriesSourceWriter;
class cmWIXFilesSourceWriter;
......
......@@ -3,7 +3,6 @@
#include "cmWIXAccessControlList.h"
#include "cmCPackGenerator.h"
#include "cmStringAlgorithms.h"
#include "cmSystemTools.h"
......
......@@ -3,10 +3,9 @@
#ifndef cmWIXAccessControlList_h
#define cmWIXAccessControlList_h
#include "cmWIXSourceWriter.h"
#include "cmCPackLog.h"
#include "cmInstalledFile.h"
#include "cmWIXSourceWriter.h"
class cmWIXAccessControlList
{
......
......@@ -3,11 +3,10 @@
#ifndef cmWIXDirectoriesSourceWriter_h
#define cmWIXDirectoriesSourceWriter_h
#include "cmWIXSourceWriter.h"
#include <string>
#include "cmCPackGenerator.h"
#include <string>
#include "cmWIXSourceWriter.h"
/** \class cmWIXDirectoriesSourceWriter
* \brief Helper class to generate directories.wxs
......
......@@ -3,11 +3,10 @@
#ifndef cmWIXFeaturesSourceWriter_h
#define cmWIXFeaturesSourceWriter_h
#include "cmCPackGenerator.h"
#include "cmWIXPatch.h"
#include "cmWIXSourceWriter.h"
#include "cmCPackGenerator.h"
/** \class cmWIXFeaturesSourceWriter
* \brief Helper class to generate features.wxs
*/
......
......@@ -2,16 +2,13 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmWIXFilesSourceWriter.h"