From ed98209ddc8d5e9f5b20cd010c69a25d553b2654 Mon Sep 17 00:00:00 2001 From: Kitware Robot Date: Mon, 30 Sep 2019 10:46:28 -0400 Subject: 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. --- Source/CPack/IFW/cmCPackIFWCommon.cxx | 10 +++++----- Source/CPack/IFW/cmCPackIFWGenerator.cxx | 6 +++--- Source/CPack/IFW/cmCPackIFWGenerator.h | 10 +++++----- Source/CPack/IFW/cmCPackIFWInstaller.cxx | 8 ++++---- Source/CPack/IFW/cmCPackIFWInstaller.h | 4 ++-- Source/CPack/IFW/cmCPackIFWPackage.cxx | 10 +++++----- Source/CPack/IFW/cmCPackIFWPackage.h | 4 ++-- Source/CPack/IFW/cmCPackIFWRepository.cxx | 4 ++-- Source/CPack/IFW/cmCPackIFWRepository.h | 4 ++-- 9 files changed, 30 insertions(+), 30 deletions(-) (limited to 'Source/CPack/IFW') diff --git a/Source/CPack/IFW/cmCPackIFWCommon.cxx b/Source/CPack/IFW/cmCPackIFWCommon.cxx index aa9a4572c6..9fa74be761 100644 --- a/Source/CPack/IFW/cmCPackIFWCommon.cxx +++ b/Source/CPack/IFW/cmCPackIFWCommon.cxx @@ -2,6 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackIFWCommon.h" +#include +#include +#include +#include + #include "cmCPackGenerator.h" #include "cmCPackIFWGenerator.h" #include "cmCPackLog.h" // IWYU pragma: keep @@ -11,11 +16,6 @@ #include "cmVersionConfig.h" #include "cmXMLWriter.h" -#include -#include -#include -#include - cmCPackIFWCommon::cmCPackIFWCommon() : Generator(nullptr) { diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.cxx b/Source/CPack/IFW/cmCPackIFWGenerator.cxx index 94530c1ee5..509ac65075 100644 --- a/Source/CPack/IFW/cmCPackIFWGenerator.cxx +++ b/Source/CPack/IFW/cmCPackIFWGenerator.cxx @@ -2,6 +2,9 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackIFWGenerator.h" +#include +#include + #include "cmCPackComponentGroup.h" #include "cmCPackGenerator.h" #include "cmCPackIFWCommon.h" @@ -14,9 +17,6 @@ #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include -#include - cmCPackIFWGenerator::cmCPackIFWGenerator() { this->Generator = this; diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.h b/Source/CPack/IFW/cmCPackIFWGenerator.h index ee3c166d2b..86a73c83ff 100644 --- a/Source/CPack/IFW/cmCPackIFWGenerator.h +++ b/Source/CPack/IFW/cmCPackIFWGenerator.h @@ -5,6 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep +#include +#include +#include +#include + #include "cmCPackComponentGroup.h" #include "cmCPackGenerator.h" #include "cmCPackIFWCommon.h" @@ -12,11 +17,6 @@ #include "cmCPackIFWPackage.h" #include "cmCPackIFWRepository.h" -#include -#include -#include -#include - /** \class cmCPackIFWGenerator * \brief A generator for Qt Installer Framework tools * diff --git a/Source/CPack/IFW/cmCPackIFWInstaller.cxx b/Source/CPack/IFW/cmCPackIFWInstaller.cxx index 2393279e9d..4bad598e97 100644 --- a/Source/CPack/IFW/cmCPackIFWInstaller.cxx +++ b/Source/CPack/IFW/cmCPackIFWInstaller.cxx @@ -2,6 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackIFWInstaller.h" +#include +#include +#include + #include "cmCPackIFWCommon.h" #include "cmCPackIFWGenerator.h" #include "cmCPackIFWPackage.h" @@ -13,10 +17,6 @@ #include "cmXMLParser.h" #include "cmXMLWriter.h" -#include -#include -#include - cmCPackIFWInstaller::cmCPackIFWInstaller() = default; void cmCPackIFWInstaller::printSkippedOptionWarning( diff --git a/Source/CPack/IFW/cmCPackIFWInstaller.h b/Source/CPack/IFW/cmCPackIFWInstaller.h index 467779e029..8b3f96af8e 100644 --- a/Source/CPack/IFW/cmCPackIFWInstaller.h +++ b/Source/CPack/IFW/cmCPackIFWInstaller.h @@ -5,12 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCPackIFWCommon.h" - #include #include #include +#include "cmCPackIFWCommon.h" + class cmCPackIFWPackage; class cmCPackIFWRepository; diff --git a/Source/CPack/IFW/cmCPackIFWPackage.cxx b/Source/CPack/IFW/cmCPackIFWPackage.cxx index 9f2a443f69..9a9cd56781 100644 --- a/Source/CPack/IFW/cmCPackIFWPackage.cxx +++ b/Source/CPack/IFW/cmCPackIFWPackage.cxx @@ -2,6 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackIFWPackage.h" +#include +#include +#include +#include + #include "cmCPackComponentGroup.h" #include "cmCPackIFWCommon.h" #include "cmCPackIFWGenerator.h" @@ -13,11 +18,6 @@ #include "cmTimestamp.h" #include "cmXMLWriter.h" -#include -#include -#include -#include - //---------------------------------------------------------- CompareStruct --- cmCPackIFWPackage::CompareStruct::CompareStruct() : Type(cmCPackIFWPackage::CompareNone) diff --git a/Source/CPack/IFW/cmCPackIFWPackage.h b/Source/CPack/IFW/cmCPackIFWPackage.h index ae411462a1..6a4a170a5c 100644 --- a/Source/CPack/IFW/cmCPackIFWPackage.h +++ b/Source/CPack/IFW/cmCPackIFWPackage.h @@ -5,13 +5,13 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCPackIFWCommon.h" - #include #include #include #include +#include "cmCPackIFWCommon.h" + class cmCPackComponent; class cmCPackComponentGroup; class cmCPackIFWInstaller; diff --git a/Source/CPack/IFW/cmCPackIFWRepository.cxx b/Source/CPack/IFW/cmCPackIFWRepository.cxx index 82ddbdbd80..a6965491eb 100644 --- a/Source/CPack/IFW/cmCPackIFWRepository.cxx +++ b/Source/CPack/IFW/cmCPackIFWRepository.cxx @@ -2,14 +2,14 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackIFWRepository.h" +#include + #include "cmCPackIFWGenerator.h" #include "cmGeneratedFileStream.h" #include "cmSystemTools.h" #include "cmXMLParser.h" #include "cmXMLWriter.h" -#include - cmCPackIFWRepository::cmCPackIFWRepository() : Update(cmCPackIFWRepository::None) { diff --git a/Source/CPack/IFW/cmCPackIFWRepository.h b/Source/CPack/IFW/cmCPackIFWRepository.h index 585334c4b3..c29398124e 100644 --- a/Source/CPack/IFW/cmCPackIFWRepository.h +++ b/Source/CPack/IFW/cmCPackIFWRepository.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCPackIFWCommon.h" - #include #include +#include "cmCPackIFWCommon.h" + class cmXMLWriter; /** \class cmCPackIFWRepository -- cgit v1.2.1