Merge topic 'clang-format-include-order'

e1c77472 Format include directive blocks and ordering with clang-format
180538c7 Source: Stabilize include order
0e7bca92 Utilities/Release: Stabilize include order in WiX custom action
eb817be0 Tests: Stabilize include order in MFC, VSXaml, and VSWinStorePhone
eda313b4 Tests: Stabilize include order in StringFileTest
7110b754 CursesDialog: add missing cmState include
d7a5f255 Modules: Remove unused CMakeTestWatcomVersion.c file

Modules/CMakeTestWatcomVersion.c

@@ -1 +0,0 @@
-VERSION=__WATCOMC__

Modules/CheckForPthreads.c

@@ -1,5 +1,5 @@
-#include <stdio.h>
 #include <pthread.h>
+#include <stdio.h>
 #include <unistd.h>
 
 void* runner(void*);

Source/CPack/IFW/cmCPackIFWGenerator.cxx

@@ -12,24 +12,24 @@
 
 #include "cmCPackIFWGenerator.h"
 
-#include "cmCPackIFWPackage.h"
 #include "cmCPackIFWInstaller.h"
+#include "cmCPackIFWPackage.h"
 
-#include <CPack/cmCPackLog.h>
 #include <CPack/cmCPackComponentGroup.h>
+#include <CPack/cmCPackLog.h>
 
-#include <cmsys/SystemTools.hxx>
-#include <cmsys/Glob.hxx>
 #include <cmsys/Directory.hxx>
+#include <cmsys/Glob.hxx>
 #include <cmsys/RegularExpression.hxx>
+#include <cmsys/SystemTools.hxx>
 
-#include <cmGlobalGenerator.h>
-#include <cmSystemTools.h>
-#include <cmMakefile.h>
 #include <cmGeneratedFileStream.h>
-#include <cmXMLWriter.h>
+#include <cmGlobalGenerator.h>
-#include <cmVersionConfig.h>
+#include <cmMakefile.h>
+#include <cmSystemTools.h>
 #include <cmTimestamp.h>
+#include <cmVersionConfig.h>
+#include <cmXMLWriter.h>
 
 //----------------------------------------------------------------------------
 cmCPackIFWGenerator::cmCPackIFWGenerator()

Source/CPack/IFW/cmCPackIFWGenerator.h

@@ -15,8 +15,8 @@
 
 #include <CPack/cmCPackGenerator.h>
 
-#include "cmCPackIFWPackage.h"
 #include "cmCPackIFWInstaller.h"
+#include "cmCPackIFWPackage.h"
 
 class cmXMLWriter;
 

Source/CPack/OSXScriptLauncher.cxx

@@ -9,9 +9,9 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#include <cmsys/SystemTools.hxx>
-#include <cmsys/Process.h>
 #include <cmsys/FStream.hxx>
+#include <cmsys/Process.h>
+#include <cmsys/SystemTools.hxx>
 
 #include <iostream>
 

Source/CPack/WiX/cmCPackWIXGenerator.cxx

@@ -12,23 +12,23 @@
 
 #include "cmCPackWIXGenerator.h"
 
-#include <cmSystemTools.h>
-#include <cmGeneratedFileStream.h>
-#include <cmCryptoHash.h>
-#include <cmInstalledFile.h>
-#include <CPack/cmCPackLog.h>
 #include <CPack/cmCPackComponentGroup.h>
+#include <CPack/cmCPackLog.h>
+#include <cmCryptoHash.h>
+#include <cmGeneratedFileStream.h>
+#include <cmInstalledFile.h>
+#include <cmSystemTools.h>
 
-#include "cmWIXSourceWriter.h"
 #include "cmWIXDirectoriesSourceWriter.h"
 #include "cmWIXFeaturesSourceWriter.h"
 #include "cmWIXFilesSourceWriter.h"
 #include "cmWIXRichTextFormatWriter.h"
+#include "cmWIXSourceWriter.h"
 
-#include <cmsys/SystemTools.hxx>
 #include <cmsys/Directory.hxx>
 #include <cmsys/Encoding.hxx>
 #include <cmsys/FStream.hxx>
+#include <cmsys/SystemTools.hxx>
 
 #include <rpc.h> // for GUID generation
 

Source/CPack/WiX/cmCPackWIXGenerator.h

@@ -13,13 +13,13 @@
 #ifndef cmCPackWIXGenerator_h
 #define cmCPackWIXGenerator_h
 
+#include <CPack/cmCPackGenerator.h>
+
 #include "cmWIXPatch.h"
 #include "cmWIXShortcut.h"
 
-#include <CPack/cmCPackGenerator.h>
-
-#include <string>
 #include <map>
+#include <string>
 
 class cmWIXSourceWriter;
 class cmWIXDirectoriesSourceWriter;

Source/CPack/WiX/cmWIXAccessControlList.h

@@ -13,11 +13,11 @@
 #ifndef cmWIXAccessControlList_h
 #define cmWIXAccessControlList_h
 
-#include <cmInstalledFile.h>
-#include <CPack/cmCPackLog.h>
-
 #include "cmWIXSourceWriter.h"
 
+#include <CPack/cmCPackLog.h>
+#include <cmInstalledFile.h>
+
 class cmWIXAccessControlList
 {
 public:

Source/CPack/WiX/cmWIXFeaturesSourceWriter.h

@@ -14,6 +14,7 @@
 #define cmWIXFeaturesSourceWriter_h
 
 #include "cmWIXSourceWriter.h"
+
 #include <CPack/cmCPackGenerator.h>
 
 /** \class cmWIXFeaturesSourceWriter

Source/CPack/WiX/cmWIXFilesSourceWriter.cxx

@@ -11,6 +11,7 @@
 ============================================================================*/
 
 #include "cmWIXFilesSourceWriter.h"
+
 #include "cmWIXAccessControlList.h"
 
 #include <cmInstalledFile.h>

Source/CPack/WiX/cmWIXFilesSourceWriter.h

@@ -14,8 +14,9 @@
 #define cmWIXFilesSourceWriter_h
 
 #include "cmWIXSourceWriter.h"
-#include "cmWIXShortcut.h"
+
 #include "cmWIXPatch.h"
+#include "cmWIXShortcut.h"
 
 #include <CPack/cmCPackGenerator.h>
 

Source/CPack/WiX/cmWIXPatch.h

@@ -13,8 +13,8 @@
 #ifndef cmWIXPatch_h
 #define cmWIXPatch_h
 
-#include "cmWIXSourceWriter.h"
 #include "cmWIXPatchParser.h"
+#include "cmWIXSourceWriter.h"
 
 #include <string>
 

Source/CPack/WiX/cmWIXPatchParser.h

@@ -13,10 +13,10 @@
 #ifndef cmCPackWIXPatchParser_h
 #define cmCPackWIXPatchParser_h
 
-#include <cmXMLParser.h>
-
 #include <CPack/cmCPackLog.h>
 
+#include <cmXMLParser.h>
+
 #include <map>
 #include <list>
 

Source/CPack/WiX/cmWIXRichTextFormatWriter.h

@@ -13,6 +13,8 @@
 #ifndef cmWIXRichTextFormatWriter_h
 #define cmWIXRichTextFormatWriter_h
 
+#include "cmStandardIncludes.h"
+
 #include <cmsys/FStream.hxx>
 
 /** \class cmWIXRichtTextFormatWriter

Source/CPack/WiX/cmWIXShortcut.h

@@ -13,13 +13,13 @@
 #ifndef cmWIXShortcut_h
 #define cmWIXShortcut_h
 
-#include <string>
+#include <cmInstalledFile.h>
+
 #include <map>
 #include <set>
+#include <string>
 #include <vector>
 
-#include <cmInstalledFile.h>
-
 class cmWIXFilesSourceWriter;
 
 struct cmWIXShortcut

Source/CPack/WiX/cmWIXSourceWriter.cxx

@@ -10,8 +10,6 @@
   See the License for more information.
 ============================================================================*/
 
-#include "cmStandardIncludes.h"
-
 #include "cmWIXSourceWriter.h"
 
 #include <CPack/cmCPackGenerator.h>

Source/CPack/WiX/cmWIXSourceWriter.h

@@ -13,11 +13,12 @@
 #ifndef cmWIXSourceWriter_h
 #define cmWIXSourceWriter_h
 
-#include <vector>
+#include <CPack/cmCPackLog.h>
-#include <string>
+
 #include <cmsys/FStream.hxx>
 
-#include <CPack/cmCPackLog.h>
+#include <string>
+#include <vector>
 
 /** \class cmWIXSourceWriter
  * \brief Helper class to generate XML WiX source files

Source/CPack/cmCPackArchiveGenerator.cxx

@@ -12,17 +12,17 @@
 
 #include "cmCPackArchiveGenerator.h"
 
-#include "cmake.h"
-#include "cmGlobalGenerator.h"
-#include "cmSystemTools.h"
-#include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
 #include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
 #include <errno.h>
 
-#include <cmsys/SystemTools.hxx>
-#include <cmsys/Directory.hxx>
 #include <cm_libarchive.h>
+#include <cmsys/Directory.hxx>
+#include <cmsys/SystemTools.hxx>
 
 //----------------------------------------------------------------------
 cmCPackArchiveGenerator::cmCPackArchiveGenerator(cmArchiveWrite::Compress t,

Source/CPack/cmCPackArchiveGenerator.h

@@ -13,9 +13,10 @@
 #ifndef cmCPackArchiveGenerator_h
 #define cmCPackArchiveGenerator_h
 
-#include "cmArchiveWrite.h"
 #include "cmCPackGenerator.h"
 
+#include "cmArchiveWrite.h"
+
 
 /** \class cmCPackArchiveGenerator
  * \brief A generator base for libarchive generation.

Source/CPack/cmCPackBundleGenerator.cxx

@@ -11,6 +11,7 @@
 ============================================================================*/
 
 #include "cmCPackBundleGenerator.h"
+
 #include "cmCPackLog.h"
 #include "cmSystemTools.h"
 

Source/CPack/cmCPackComponentGroup.cxx

@@ -11,9 +11,11 @@
 ============================================================================*/
 
 #include "cmCPackComponentGroup.h"
+
 #include "cmSystemTools.h"
-#include <vector>
+
 #include <string>
+#include <vector>
 
 //----------------------------------------------------------------------
 unsigned long cmCPackComponent::GetInstalledSize(

Source/CPack/cmCPackCygwinBinaryGenerator.cxx

@@ -12,12 +12,12 @@
 
 #include "cmCPackCygwinBinaryGenerator.h"
 
-#include "cmake.h"
-#include "cmGlobalGenerator.h"
-#include "cmSystemTools.h"
-#include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
 #include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
 
 #include <cmsys/SystemTools.hxx>
 

Source/CPack/cmCPackCygwinSourceGenerator.cxx

@@ -12,12 +12,12 @@
 
 #include "cmCPackCygwinSourceGenerator.h"
 
-#include "cmake.h"
-#include "cmGlobalGenerator.h"
-#include "cmSystemTools.h"
-#include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
 #include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
 
 #include <cmsys/SystemTools.hxx>
 
@@ -25,8 +25,8 @@
 // system tools because it is not implemented robustly enough to move
 // files across directories.
 #ifdef _WIN32
-# include <windows.h>
 # include <sys/stat.h>
+# include <windows.h>
 #endif
 
 //----------------------------------------------------------------------

Source/CPack/cmCPackDebGenerator.cxx

@@ -9,16 +9,17 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
+
 #include "cmCPackDebGenerator.h"
 
-#include "cmSystemTools.h"
-#include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
-#include "cmCPackLog.h"
 #include "cmArchiveWrite.h"
+#include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
+#include "cmMakefile.h"
+#include "cmSystemTools.h"
 
-#include <cmsys/SystemTools.hxx>
 #include <cmsys/Glob.hxx>
+#include <cmsys/SystemTools.hxx>
 
 #include <limits.h> // USHRT_MAX
 #include <sys/stat.h>
@@ -763,8 +764,8 @@ std::string cmCPackDebGenerator::GetComponentInstallDirNameSuffix(
 #include <sys/stat.h>
 
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 
 #define ARMAG           "!<arch>\n"        /* ar "magic number" */
 #define SARMAG          8                  /* strlen(ARMAG); */

Source/CPack/cmCPackDebGenerator.h

@@ -13,7 +13,6 @@
 #ifndef cmCPackDebGenerator_h
 #define cmCPackDebGenerator_h
 
-
 #include "cmCPackGenerator.h"
 
 /** \class cmCPackDebGenerator

Source/CPack/cmCPackDragNDropGenerator.cxx

@@ -11,12 +11,13 @@
 ============================================================================*/
 
 #include "cmCPackDragNDropGenerator.h"
-#include "cmCPackLog.h"
-#include "cmSystemTools.h"
-#include "cmGeneratedFileStream.h"
 
-#include <cmsys/RegularExpression.hxx>
+#include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
+#include "cmSystemTools.h"
+
 #include <cmsys/FStream.hxx>
+#include <cmsys/RegularExpression.hxx>
 
 #include <iomanip>
 

Source/CPack/cmCPackGenerator.cxx

@@ -12,18 +12,18 @@
 
 #include "cmCPackGenerator.h"
 
-#include "cmMakefile.h"
-#include "cmCPackLog.h"
-#include "cmake.h"
-#include "cmGlobalGenerator.h"
-#include "cmGeneratedFileStream.h"
 #include "cmCPackComponentGroup.h"
+#include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
 #include "cmXMLSafe.h"
+#include "cmake.h"
 
-#include <cmsys/SystemTools.hxx>
-#include <cmsys/Glob.hxx>
-#include <cmsys/FStream.hxx>
 #include <algorithm>
+#include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
+#include <cmsys/SystemTools.hxx>
 #include <list>
 
 #if defined(__HAIKU__)

Source/CPack/cmCPackGenerator.h

@@ -14,6 +14,7 @@
 #define cmCPackGenerator_h
 
 #include "cmObject.h"
+
 #include "cmSystemTools.h"
 #include <map>
 #include <vector>

Source/CPack/cmCPackGeneratorFactory.cxx

@@ -12,22 +12,22 @@
 
 #include "cmCPackGeneratorFactory.h"
 
+#include "IFW/cmCPackIFWGenerator.h"
+#include "cmCPack7zGenerator.h"
 #include "cmCPackGenerator.h"
+#include "cmCPackNSISGenerator.h"
+#include "cmCPackSTGZGenerator.h"
 #include "cmCPackTGZGenerator.h"
 #include "cmCPackTXZGenerator.h"
 #include "cmCPackTarBZip2Generator.h"
 #include "cmCPackTarCompressGenerator.h"
 #include "cmCPackZIPGenerator.h"
-#include "cmCPack7zGenerator.h"
-#include "cmCPackSTGZGenerator.h"
-#include "cmCPackNSISGenerator.h"
-#include "IFW/cmCPackIFWGenerator.h"
 
 #ifdef __APPLE__
-#  include "cmCPackDragNDropGenerator.h"
+#   include "cmCPackBundleGenerator.h"
-#  include "cmCPackBundleGenerator.h"
+#   include "cmCPackDragNDropGenerator.h"
-#  include "cmCPackPackageMakerGenerator.h"
+#   include "cmCPackOSXX11Generator.h"
-#  include "cmCPackOSXX11Generator.h"
+#   include "cmCPackPackageMakerGenerator.h"
 #endif
 
 #ifdef __CYGWIN__
@@ -45,8 +45,8 @@
 #  include "WiX/cmCPackWIXGenerator.h"
 #endif
 
-#include "cmCPackLog.h"
 #include "cmAlgorithms.h"
+#include "cmCPackLog.h"
 
 
 //----------------------------------------------------------------------

Source/CPack/cmCPackNSISGenerator.cxx

@@ -12,17 +12,17 @@
 
 #include "cmCPackNSISGenerator.h"
 
-#include "cmGlobalGenerator.h"
-#include "cmSystemTools.h"
-#include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
-#include "cmCPackLog.h"
 #include "cmCPackComponentGroup.h"
+#include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
+#include "cmSystemTools.h"
 
-#include <cmsys/SystemTools.hxx>
-#include <cmsys/Glob.hxx>
 #include <cmsys/Directory.hxx>
+#include <cmsys/Glob.hxx>
 #include <cmsys/RegularExpression.hxx>
+#include <cmsys/SystemTools.hxx>
 
 /* NSIS uses different command line syntax on Windows and others */
 #ifdef _WIN32

Source/CPack/cmCPackNSISGenerator.h

@@ -13,8 +13,8 @@
 #ifndef cmCPackNSISGenerator_h
 #define cmCPackNSISGenerator_h
 
-
 #include "cmCPackGenerator.h"
+
 #include <set>
 
 /** \class cmCPackNSISGenerator

Source/CPack/cmCPackOSXX11Generator.cxx

@@ -9,17 +9,18 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
+
 #include "cmCPackOSXX11Generator.h"
 
-#include "cmake.h"
-#include "cmGlobalGenerator.h"
-#include "cmSystemTools.h"
-#include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
 #include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
 
-#include <cmsys/SystemTools.hxx>
 #include <cmsys/Glob.hxx>
+#include <cmsys/SystemTools.hxx>
 #include <sys/stat.h>
 
 //----------------------------------------------------------------------

Source/CPack/cmCPackPackageMakerGenerator.cxx

@@ -11,17 +11,17 @@
 ============================================================================*/
 #include "cmCPackPackageMakerGenerator.h"
 
-#include "cmake.h"
-#include "cmGlobalGenerator.h"
-#include "cmSystemTools.h"
-#include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
 #include "cmCPackComponentGroup.h"
 #include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
 
-#include <cmsys/SystemTools.hxx>
-#include <cmsys/Glob.hxx>
 #include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
+#include <cmsys/SystemTools.hxx>
 
 #include <assert.h>
 

Source/CPack/cmCPackPackageMakerGenerator.h

@@ -13,7 +13,6 @@
 #ifndef cmCPackPackageMakerGenerator_h
 #define cmCPackPackageMakerGenerator_h
 
-
 #include "cmCPackGenerator.h"
 
 class cmCPackComponent;

Source/CPack/cmCPackRPMGenerator.cxx

@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmCPackRPMGenerator.h"
+
 #include "cmCPackLog.h"
 #include "cmSystemTools.h"
 

Source/CPack/cmCPackRPMGenerator.h

@@ -13,7 +13,6 @@
 #ifndef cmCPackRPMGenerator_h
 #define cmCPackRPMGenerator_h
 
-
 #include "cmCPackGenerator.h"
 
 /** \class cmCPackRPMGenerator

Source/CPack/cmCPackSTGZGenerator.cxx

@@ -12,14 +12,14 @@
 
 #include "cmCPackSTGZGenerator.h"
 
-#include "cmake.h"
-#include "cmGlobalGenerator.h"
-#include "cmSystemTools.h"
-#include "cmMakefile.h"
 #include "cmCPackLog.h"
+#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
 
-#include <cmsys/FStream.hxx>
 #include <sys/types.h>
+#include <cmsys/FStream.hxx>
 #include <sys/stat.h>
 
 //----------------------------------------------------------------------

Source/CPack/cmCPackSTGZGenerator.h

@@ -13,7 +13,6 @@
 #ifndef cmCPackSTGZGenerator_h
 #define cmCPackSTGZGenerator_h
 
-
 #include "cmCPackTGZGenerator.h"
 
 /** \class cmCPackSTGZGenerator

Source/CPack/cmCPackTarBZip2Generator.cxx

@@ -11,6 +11,7 @@
 ============================================================================*/
 
 #include "cmCPackTarBZip2Generator.h"
+
 //----------------------------------------------------------------------
 cmCPackTarBZip2Generator::cmCPackTarBZip2Generator()
  :cmCPackArchiveGenerator(cmArchiveWrite::CompressBZip2,

Source/CPack/cpack.cxx

@@ -12,19 +12,19 @@
 #include "cmSystemTools.h"
 
 // Need these for documentation support.
-#include "cmake.h"
-#include "cmDocumentation.h"
-#include "cmCPackGeneratorFactory.h"
 #include "cmCPackGenerator.h"
-#include "cmake.h"
+#include "cmCPackGeneratorFactory.h"
+#include "cmDocumentation.h"
 #include "cmGlobalGenerator.h"
 #include "cmMakefile.h"
+#include "cmake.h"
+#include "cmake.h"
 
 #include "cmCPackLog.h"
 
 #include <cmsys/CommandLineArguments.hxx>
-#include <cmsys/SystemTools.hxx>
 #include <cmsys/Encoding.hxx>
+#include <cmsys/SystemTools.hxx>
 
 //----------------------------------------------------------------------------
 static const char * cmDocumentationName[][2] =

Source/CTest/cmCTestBatchTestHandler.cxx

@@ -11,9 +11,10 @@
 ============================================================================*/
 
 #include "cmCTestBatchTestHandler.h"
+
+#include "cmCTest.h"
 #include "cmProcess.h"
 #include "cmStandardIncludes.h"
-#include "cmCTest.h"
 #include "cmSystemTools.h"
 #include <stdlib.h>
 

Source/CTest/cmCTestBatchTestHandler.h

@@ -14,9 +14,10 @@
 #define cmCTestBatchTestHandler_h
 
 #include <cmStandardIncludes.h>
-#include <cmCTestTestHandler.h>
+
 #include <cmCTestMultiProcessHandler.h>
 #include <cmCTestRunTest.h>
+#include <cmCTestTestHandler.h>
 #include <cmsys/FStream.hxx>
 
 /** \class cmCTestBatchTestHandler

Source/CTest/cmCTestBuildAndTestHandler.cxx

@@ -12,12 +12,12 @@
 
 #include "cmCTestBuildAndTestHandler.h"
 
-#include "cmSystemTools.h"
 #include "cmCTest.h"
-#include "cmake.h"
-#include "cmGlobalGenerator.h"
-#include <cmsys/Process.h>
 #include "cmCTestTestHandler.h"
+#include "cmGlobalGenerator.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
+#include <cmsys/Process.h>
 
 //----------------------------------------------------------------------
 cmCTestBuildAndTestHandler::cmCTestBuildAndTestHandler()

Source/CTest/cmCTestBuildCommand.cxx

@@ -12,10 +12,10 @@
 #include "cmCTestBuildCommand.h"
 
 #include "cmCTest.h"
-#include "cmCTestGenericHandler.h"
 #include "cmCTestBuildHandler.h"
-#include "cmake.h"
+#include "cmCTestGenericHandler.h"
 #include "cmGlobalGenerator.h"
+#include "cmake.h"
 
 
 //----------------------------------------------------------------------------

Source/CTest/cmCTestBuildHandler.cxx

@@ -12,29 +12,29 @@
 
 #include "cmCTestBuildHandler.h"
 
-#include "cmCTest.h"
-#include "cmake.h"
-#include "cmMakefile.h"
-#include "cmGlobalGenerator.h"
-#include "cmGeneratedFileStream.h"
-#include "cmXMLWriter.h"
-#include "cmFileTimeComparison.h"
 #include "cmAlgorithms.h"
+#include "cmCTest.h"
+#include "cmFileTimeComparison.h"
+#include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
+#include "cmXMLWriter.h"
+#include "cmake.h"
 
 //#include <cmsys/RegularExpression.hxx>
-#include <cmsys/Process.h>
 #include <cmsys/Directory.hxx>
 #include <cmsys/FStream.hxx>
+#include <cmsys/Process.h>
 
 // used for sleep
 #ifdef _WIN32
 #include "windows.h"
 #endif
 
+#include <float.h>
+#include <math.h>
 #include <stdlib.h>
 #include <time.h>
-#include <math.h>
-#include <float.h>
 
 
 static const char* cmCTestErrorMatches[] = {

Source/CTest/cmCTestBuildHandler.h

@@ -13,8 +13,8 @@
 #ifndef cmCTestBuildHandler_h
 #define cmCTestBuildHandler_h
 
-
 #include "cmCTestGenericHandler.h"
+
 #include "cmListFileCache.h"
 
 #include <cmsys/RegularExpression.hxx>

Source/CTest/cmCTestCVS.cxx

@@ -15,8 +15,8 @@
 #include "cmSystemTools.h"
 #include "cmXMLWriter.h"
 
-#include <cmsys/RegularExpression.hxx>
 #include <cmsys/FStream.hxx>
+#include <cmsys/RegularExpression.hxx>
 
 //----------------------------------------------------------------------------
 cmCTestCVS::cmCTestCVS(cmCTest* ct, std::ostream& log): cmCTestVC(ct, log)

Source/CTest/cmCTestConfigureCommand.cxx

@@ -11,9 +11,9 @@
 ============================================================================*/
 #include "cmCTestConfigureCommand.h"
 
-#include "cmGlobalGenerator.h"
 #include "cmCTest.h"
 #include "cmCTestGenericHandler.h"
+#include "cmGlobalGenerator.h"
 
 cmCTestConfigureCommand::cmCTestConfigureCommand()
 {

Source/CTest/cmCTestConfigureHandler.cxx

@@ -14,8 +14,8 @@
 
 #include "cmCTest.h"
 #include "cmGeneratedFileStream.h"
-#include "cmake.h"
 #include "cmXMLWriter.h"
+#include "cmake.h"
 #include <cmsys/Process.h>
 
 

Source/CTest/cmCTestConfigureHandler.h

@@ -13,8 +13,8 @@
 #ifndef cmCTestConfigureHandler_h
 #define cmCTestConfigureHandler_h
 
-
 #include "cmCTestGenericHandler.h"
+
 #include "cmListFileCache.h"
 
 /** \class cmCTestConfigureHandler

Source/CTest/cmCTestCoverageHandler.cxx

@@ -10,28 +10,29 @@
   See the License for more information.
 ============================================================================*/
 #include "cmCTestCoverageHandler.h"
-#include "cmParsePHPCoverage.h"
-#include "cmParseCoberturaCoverage.h"
-#include "cmParseGTMCoverage.h"
-#include "cmParseCacheCoverage.h"
-#include "cmParseJacocoCoverage.h"
-#include "cmParseDelphiCoverage.h"
-#include "cmParseBlanketJSCoverage.h"
-#include "cmCTest.h"
-#include "cmake.h"
-#include "cmMakefile.h"
-#include "cmSystemTools.h"
-#include "cmGeneratedFileStream.h"
-#include "cmXMLWriter.h"
 
+#include "cmCTest.h"
+#include "cmGeneratedFileStream.h"
+#include "cmMakefile.h"
+#include "cmParseBlanketJSCoverage.h"
+#include "cmParseCacheCoverage.h"
+#include "cmParseCoberturaCoverage.h"
+#include "cmParseDelphiCoverage.h"
+#include "cmParseGTMCoverage.h"
+#include "cmParseJacocoCoverage.h"
+#include "cmParsePHPCoverage.h"
+#include "cmSystemTools.h"
+#include "cmXMLWriter.h"
+#include "cmake.h"
+
+#include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
 #include <cmsys/Process.h>
 #include <cmsys/RegularExpression.hxx>
-#include <cmsys/Glob.hxx>
-#include <cmsys/FStream.hxx>
 
-#include <stdlib.h>
-#include <math.h>
 #include <float.h>
+#include <math.h>
+#include <stdlib.h>
 
 #define SAFEDIV(x,y) (((y)!=0)?((x)/(y)):(0))
 

Source/CTest/cmCTestCoverageHandler.h

@@ -13,8 +13,8 @@
 #ifndef cmCTestCoverageHandler_h
 #define cmCTestCoverageHandler_h
 
-
 #include "cmCTestGenericHandler.h"
+
 #include "cmListFileCache.h"
 
 #include <cmsys/RegularExpression.hxx>

Source/CTest/cmCTestCurl.cxx

@@ -11,8 +11,8 @@
 ============================================================================*/
 #include "cmCTestCurl.h"
 
-#include "cmSystemTools.h"
 #include "cmCTest.h"
+#include "cmSystemTools.h"
 
 cmCTestCurl::cmCTestCurl(cmCTest* ctest)
 {

Source/CTest/cmCTestGIT.cxx

@@ -11,17 +11,17 @@
 ============================================================================*/
 #include "cmCTestGIT.h"
 
+#include "cmAlgorithms.h"
 #include "cmCTest.h"
 #include "cmSystemTools.h"
-#include "cmAlgorithms.h"
 
-#include <cmsys/RegularExpression.hxx>
-#include <cmsys/Process.h>
 #include <cmsys/FStream.hxx>
+#include <cmsys/Process.h>
+#include <cmsys/RegularExpression.hxx>
 
 #include <sys/types.h>
-#include <time.h>
 #include <ctype.h>
+#include <time.h>
 
 //----------------------------------------------------------------------------
 static unsigned int cmCTestGITVersion(unsigned int epic, unsigned int major,

Source/CTest/cmCTestGenericHandler.cxx

@@ -11,6 +11,7 @@
 ============================================================================*/
 
 #include "cmCTestGenericHandler.h"
+
 #include "cmSystemTools.h"
 
 #include "cmCTest.h"

Source/CTest/cmCTestGenericHandler.h

@@ -13,8 +13,8 @@
 #ifndef cmCTestGenericHandler_h
 #define cmCTestGenericHandler_h
 
-
 #include "cmObject.h"
+
 #include "cmCTest.h"
 #include "cmSystemTools.h" //OutputOption
 

Source/CTest/cmCTestLaunch.cxx

@@ -16,14 +16,14 @@
 #include "cmXMLWriter.h"
 #include "cmake.h"
 
+#include <cmsys/FStream.hxx>
 #include <cmsys/MD5.h>
 #include <cmsys/Process.h>
 #include <cmsys/RegularExpression.hxx>
-#include <cmsys/FStream.hxx>
 
 #ifdef _WIN32
-#include <io.h> // for _setmode
 #include <fcntl.h> // for _O_BINARY
+#include <io.h>    // for _setmode
 #include <stdio.h> // for std{out,err} and fileno
 #endif
 

Source/CTest/cmCTestLaunch.h

@@ -13,6 +13,7 @@
 #define cmCTestLaunch_h
 
 #include "cmStandardIncludes.h"
+
 #include <cmsys/RegularExpression.hxx>
 
 class cmXMLWriter;

Source/CTest/cmCTestMemCheckHandler.cxx

@@ -11,21 +11,22 @@
 ============================================================================*/
 
 #include "cmCTestMemCheckHandler.h"
-#include "cmXMLParser.h"
+
 #include "cmCTest.h"
-#include "cmake.h"
 #include "cmGeneratedFileStream.h"
+#include "cmMakefile.h"
+#include "cmXMLParser.h"
+#include "cmXMLWriter.h"
+#include "cmake.h"
+#include <cmsys/Base64.h>
+#include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
 #include <cmsys/Process.h>
 #include <cmsys/RegularExpression.hxx>
-#include <cmsys/Base64.h>
-#include <cmsys/Glob.hxx>
-#include <cmsys/FStream.hxx>
-#include "cmMakefile.h"
-#include "cmXMLWriter.h"
 
-#include <stdlib.h>
-#include <math.h>
 #include <float.h>
+#include <math.h>
+#include <stdlib.h>
 
 struct CatToErrorType
 {

Source/CTest/cmCTestMemCheckHandler.h

@@ -13,12 +13,11 @@
 #ifndef cmCTestMemCheckHandler_h
 #define cmCTestMemCheckHandler_h
 
-
 #include "cmCTestTestHandler.h"
-#include "cmStandardIncludes.h"
+
 #include "cmListFileCache.h"
-#include <vector>
 #include <string>
+#include <vector>
 
 class cmMakefile;
 class cmXMLWriter;

Source/CTest/cmCTestMultiProcessHandler.cxx

@@ -10,18 +10,19 @@
   See the License for more information.
 ============================================================================*/
 #include "cmCTestMultiProcessHandler.h"
-#include "cmProcess.h"
+
-#include "cmStandardIncludes.h"
 #include "cmCTest.h"
 #include "cmCTestScriptHandler.h"
+#include "cmProcess.h"
+#include "cmStandardIncludes.h"
 #include "cmSystemTools.h"
-#include <stdlib.h>
-#include <stack>
-#include <list>
-#include <float.h>
-#include <math.h>
 #include <cmsys/FStream.hxx>
 #include <cmsys/SystemInformation.hxx>
+#include <float.h>
+#include <list>
+#include <math.h>
+#include <stack>
+#include <stdlib.h>
 
 class TestComparator
 {

Source/CTest/cmCTestMultiProcessHandler.h

@@ -12,8 +12,8 @@
 #ifndef cmCTestMultiProcessHandler_h
 #define cmCTestMultiProcessHandler_h
 
-#include <cmStandardIncludes.h>
 #include <cmCTestTestHandler.h>
+
 #include <cmCTestRunTest.h>
 
 /** \class cmCTestMultiProcessHandler

Source/CTest/cmCTestP4.cxx

@@ -14,12 +14,12 @@
 #include "cmCTest.h"
 #include "cmSystemTools.h"
 
-#include <cmsys/RegularExpression.hxx>
 #include <cmsys/Process.h>
+#include <cmsys/RegularExpression.hxx>
 
 #include <sys/types.h>
-#include <time.h>
 #include <ctype.h>
+#include <time.h>
 
 //----------------------------------------------------------------------------
 cmCTestP4::cmCTestP4(cmCTest* ct, std::ostream& log):

Source/CTest/cmCTestP4.h

@@ -13,8 +13,9 @@
 #define cmCTestP4_h
 
 #include "cmCTestGlobalVC.h"
-#include <vector>
+
 #include <map>
+#include <vector>
 
 /** \class cmCTestP4
  * \brief Interaction with the Perforce command-line tool

Source/CTest/cmCTestReadCustomFilesCommand.cxx

@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmCTestReadCustomFilesCommand.h"
+
 #include "cmCTest.h"
 
 bool cmCTestReadCustomFilesCommand

Source/CTest/cmCTestRunTest.cxx

@@ -11,8 +11,9 @@
 ============================================================================*/
 
 #include "cmCTestRunTest.h"
-#include "cmCTestMemCheckHandler.h"
+
 #include "cmCTest.h"
+#include "cmCTestMemCheckHandler.h"
 #include "cmSystemTools.h"
 #include "cm_curl.h"
 

Source/CTest/cmCTestRunTest.h

@@ -12,8 +12,8 @@
 #ifndef cmCTestRunTest_h
 #define cmCTestRunTest_h
 
-#include <cmStandardIncludes.h>
 #include <cmCTestTestHandler.h>
+
 #include <cmProcess.h>
 
 /** \class cmRunTest

Source/CTest/cmCTestScriptHandler.cxx

@@ -13,25 +13,25 @@
 #include "cmCTestScriptHandler.h"
 
 #include "cmCTest.h"
-#include "cmake.h"
 #include "cmFunctionBlocker.h"
-#include "cmMakefile.h"
-#include "cmGlobalGenerator.h"
 #include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
+#include "cmake.h"
 
 //#include <cmsys/RegularExpression.hxx>
-#include <cmsys/Process.h>
 #include <cmsys/Directory.hxx>
+#include <cmsys/Process.h>
 
 // used for sleep
 #ifdef _WIN32
 #include "windows.h"
 #endif
 
+#include <float.h>
+#include <math.h>
 #include <stdlib.h>
 #include <time.h>
-#include <math.h>
-#include <float.h>
 
 // needed for sleep
 #if !defined(_WIN32)

Source/CTest/cmCTestScriptHandler.h

@@ -13,8 +13,8 @@
 #ifndef cmCTestScriptHandler_h
 #define cmCTestScriptHandler_h
 
-
 #include "cmCTestGenericHandler.h"
+
 #include "cmListFileCache.h"
 
 class cmMakefile;

Source/CTest/cmCTestStartCommand.cxx

@@ -12,9 +12,9 @@
 #include "cmCTestStartCommand.h"
 
 #include "cmCTest.h"
-#include "cmGlobalGenerator.h"
 #include "cmCTestVC.h"
 #include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
 
 cmCTestStartCommand::cmCTestStartCommand()
 {

Source/CTest/cmCTestSubmitCommand.h

@@ -13,6 +13,7 @@
 #define cmCTestSubmitCommand_h
 
 #include "cmCTestHandlerCommand.h"
+
 #include "cmCTest.h"
 
 /** \class cmCTestSubmit

Source/CTest/cmCTestSubmitHandler.cxx

@@ -10,25 +10,26 @@
   See the License for more information.
 ============================================================================*/
 #include "cmCTestSubmitHandler.h"
+
+#include "cmCTest.h"
 #include "cmCTestScriptHandler.h"
-#include "cmake.h"
+#include "cmGeneratedFileStream.h"
+#include "cmState.h"
 #include "cmSystemTools.h"
 #include "cmVersion.h"
-#include "cmGeneratedFileStream.h"
-#include "cmCTest.h"
 #include "cmXMLParser.h"
-#include "cmState.h"
+#include "cmake.h"
 
-#include <cmsys/Process.h>
 #include <cmsys/Base64.h>
+#include <cmsys/Process.h>
 
 // For XML-RPC submission
 #include "cm_xmlrpc.h"
 
 #include <cm_jsoncpp_reader.h>
 // For curl submission
-#include "cmCurl.h"
 #include "cmCTestCurl.h"
+#include "cmCurl.h"
 
 #include <sys/stat.h>
 

Source/CTest/cmCTestTestHandler.cxx

@@ -11,27 +11,28 @@
 ============================================================================*/
 
 #include "cmCTestTestHandler.h"
-#include "cmCTestMultiProcessHandler.h"
+
-#include "cmCTestBatchTestHandler.h"
 #include "cmCTest.h"
+#include "cmCTestBatchTestHandler.h"
+#include "cmCTestMultiProcessHandler.h"
 #include "cmCTestRunTest.h"
-#include "cmake.h"
-#include "cmGeneratedFileStream.h"
-#include <cmsys/Process.h>
-#include <cmsys/RegularExpression.hxx>
-#include <cmsys/Base64.h>
-#include <cmsys/Directory.hxx>
-#include <cmsys/FStream.hxx>
-#include "cmMakefile.h"
-#include "cmGlobalGenerator.h"
 #include "cmCommand.h"
+#include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
 #include "cmSystemTools.h"
 #include "cmXMLWriter.h"
 #include "cm_utf8.h"
+#include "cmake.h"
+#include <cmsys/Base64.h>
+#include <cmsys/Directory.hxx>
+#include <cmsys/FStream.hxx>
+#include <cmsys/Process.h>
+#include <cmsys/RegularExpression.hxx>
 
-#include <stdlib.h>
-#include <math.h>
 #include <float.h>
+#include <math.h>
+#include <stdlib.h>
 
 #include <set>
 

Source/CTest/cmCTestTestHandler.h

@@ -13,8 +13,8 @@
 #ifndef cmCTestTestHandler_h
 #define cmCTestTestHandler_h
 
-
 #include "cmCTestGenericHandler.h"
+
 #include <cmsys/RegularExpression.hxx>
 
 class cmMakefile;

Source/CTest/cmCTestUpdateHandler.cxx

@@ -12,23 +12,23 @@
 
 #include "cmCTestUpdateHandler.h"
 
+#include "cmCLocaleEnvironmentScope.h"
 #include "cmCTest.h"
-#include "cmake.h"
-#include "cmMakefile.h"
-#include "cmGlobalGenerator.h"
-#include "cmVersion.h"
 #include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
+#include "cmVersion.h"
 #include "cmXMLParser.h"
 #include "cmXMLWriter.h"
-#include "cmCLocaleEnvironmentScope.h"
+#include "cmake.h"
 
-#include "cmCTestVC.h"
-#include "cmCTestCVS.h"
-#include "cmCTestSVN.h"
 #include "cmCTestBZR.h"
+#include "cmCTestCVS.h"
 #include "cmCTestGIT.h"
 #include "cmCTestHG.h"
 #include "cmCTestP4.h"
+#include "cmCTestSVN.h"
+#include "cmCTestVC.h"
 
 #include <cmsys/auto_ptr.hxx>
 
@@ -40,9 +40,9 @@
 #include "windows.h"
 #endif
 
-#include <stdlib.h>
-#include <math.h>
 #include <float.h>
+#include <math.h>
+#include <stdlib.h>
 
 //----------------------------------------------------------------------
 static const char* cmCTestUpdateHandlerUpdateStrings[] =

Source/CTest/cmCTestUpdateHandler.h

@@ -13,8 +13,8 @@
 #ifndef cmCTestUpdateHandler_h
 #define cmCTestUpdateHandler_h
 
-
 #include "cmCTestGenericHandler.h"
+
 #include "cmListFileCache.h"
 
 /** \class cmCTestUpdateHandler

Source/CTest/cmCTestUploadCommand.h

@@ -13,6 +13,7 @@
 #define cmCTestUploadCommand_h
 
 #include "cmCTestHandlerCommand.h"
+
 #include "cmCTest.h"
 
 /** \class cmCTestUpload

Source/CTest/cmParseBlanketJSCoverage.cxx

@@ -9,14 +9,14 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#include "cmStandardIncludes.h"
+#include "cmParseBlanketJSCoverage.h"
+
+#include "cmSystemTools.h"
+#include <cmsys/Directory.hxx>
+#include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
 #include <stdio.h>
 #include <stdlib.h>
-#include "cmSystemTools.h"
-#include "cmParseBlanketJSCoverage.h"
-#include <cmsys/Directory.hxx>
-#include <cmsys/Glob.hxx>
-#include <cmsys/FStream.hxx>
 
 
 class cmParseBlanketJSCoverage::JSONParser

Source/CTest/cmParseBlanketJSCoverage.h

@@ -13,7 +13,6 @@
 #ifndef cmParseBlanketJSCoverage_h
 #define cmParseBlanketJSCoverage_h
 
-#include "cmStandardIncludes.h"
 #include "cmCTestCoverageHandler.h"
 
 

Source/CTest/cmParseCacheCoverage.cxx

@@ -1,11 +1,11 @@
-#include "cmStandardIncludes.h"
+#include "cmParseCacheCoverage.h"
+
+#include "cmSystemTools.h"
+#include <cmsys/Directory.hxx>
+#include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
 #include <stdio.h>
 #include <stdlib.h>
-#include "cmSystemTools.h"
-#include "cmParseCacheCoverage.h"
-#include <cmsys/Directory.hxx>
-#include <cmsys/Glob.hxx>
-#include <cmsys/FStream.hxx>
 
 
 cmParseCacheCoverage::cmParseCacheCoverage(

Source/CTest/cmParseCoberturaCoverage.cxx

@@ -1,7 +1,7 @@
-#include "cmStandardIncludes.h"
+#include "cmParseCoberturaCoverage.h"
+
 #include "cmSystemTools.h"
 #include "cmXMLParser.h"
-#include "cmParseCoberturaCoverage.h"
 #include <cmsys/Directory.hxx>
 #include <cmsys/FStream.hxx>
 

Source/CTest/cmParseCoberturaCoverage.h

@@ -13,7 +13,6 @@
 #ifndef cmParseCoberturaCoverage_h
 #define cmParseCoberturaCoverage_h
 
-#include "cmStandardIncludes.h"
 #include "cmCTestCoverageHandler.h"
 
 /** \class cmParsePythonCoverage

Source/CTest/cmParseDelphiCoverage.cxx

@@ -1,12 +1,12 @@
-#include "cmStandardIncludes.h"
+#include "cmParseDelphiCoverage.h"
-#include <stdio.h>
+
-#include <stdlib.h>
 #include "cmSystemTools.h"
 #include "cmXMLParser.h"
-#include "cmParseDelphiCoverage.h"
 #include <cmsys/Directory.hxx>
-#include <cmsys/Glob.hxx>
 #include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
+#include <stdio.h>
+#include <stdlib.h>
 
 
 class cmParseDelphiCoverage::HTMLParser

Source/CTest/cmParseDelphiCoverage.h

@@ -13,7 +13,6 @@
 #ifndef cmParseDelphiCoverage_h
 #define cmParseDelphiCoverage_h
 
-#include "cmStandardIncludes.h"
 #include "cmCTestCoverageHandler.h"
 
 

Source/CTest/cmParseGTMCoverage.cxx

@@ -1,11 +1,11 @@
-#include "cmStandardIncludes.h"
+#include "cmParseGTMCoverage.h"
+
+#include "cmSystemTools.h"
+#include <cmsys/Directory.hxx>
+#include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
 #include <stdio.h>
 #include <stdlib.h>
-#include "cmSystemTools.h"
-#include "cmParseGTMCoverage.h"
-#include <cmsys/Directory.hxx>
-#include <cmsys/Glob.hxx>
-#include <cmsys/FStream.hxx>
 
 
 cmParseGTMCoverage::cmParseGTMCoverage(cmCTestCoverageHandlerContainer& cont,

Source/CTest/cmParseJacocoCoverage.cxx

@@ -1,12 +1,12 @@
-#include "cmStandardIncludes.h"
+#include "cmParseJacocoCoverage.h"
-#include <stdio.h>
+
-#include <stdlib.h>
 #include "cmSystemTools.h"
 #include "cmXMLParser.h"
-#include "cmParseJacocoCoverage.h"
 #include <cmsys/Directory.hxx>
-#include <cmsys/Glob.hxx>
 #include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
+#include <stdio.h>
+#include <stdlib.h>
 
 
 class cmParseJacocoCoverage::XMLParser: public cmXMLParser

Source/CTest/cmParseJacocoCoverage.h

@@ -13,7 +13,6 @@
 #ifndef cmParseJacocoCoverage_h
 #define cmParseJacocoCoverage_h
 
-#include "cmStandardIncludes.h"
 #include "cmCTestCoverageHandler.h"
 
 

Source/CTest/cmParseMumpsCoverage.cxx

@@ -1,11 +1,11 @@
-#include "cmStandardIncludes.h"
+#include "cmParseGTMCoverage.h"
+
+#include "cmSystemTools.h"
+#include <cmsys/Directory.hxx>
+#include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
 #include <stdio.h>
 #include <stdlib.h>
-#include "cmSystemTools.h"
-#include "cmParseGTMCoverage.h"
-#include <cmsys/Directory.hxx>
-#include <cmsys/Glob.hxx>
-#include <cmsys/FStream.hxx>
 
 
 cmParseMumpsCoverage::cmParseMumpsCoverage(

Source/CTest/cmParseMumpsCoverage.h

@@ -13,7 +13,6 @@
 #ifndef cmParseMumpsCoverage_h
 #define cmParseMumpsCoverage_h
 
-#include "cmStandardIncludes.h"
 #include "cmCTestCoverageHandler.h"
 
 /** \class cmParseMumpsCoverage

Source/CTest/cmParsePHPCoverage.cxx

@@ -1,6 +1,6 @@
-#include "cmStandardIncludes.h"
-#include "cmSystemTools.h"
 #include "cmParsePHPCoverage.h"
+
+#include "cmSystemTools.h"
 #include <cmsys/Directory.hxx>
 #include <cmsys/FStream.hxx>
 

Source/CTest/cmParsePHPCoverage.h

@@ -13,7 +13,6 @@
 #ifndef cmParsePHPCoverage_h
 #define cmParsePHPCoverage_h
 
-#include "cmStandardIncludes.h"
 #include "cmCTestCoverageHandler.h"
 
 /** \class cmParsePHPCoverage

Source/CTest/cmProcess.cxx

@@ -11,6 +11,7 @@
 ============================================================================*/
 
 #include <cmProcess.h>
+
 #include <cmSystemTools.h>
 
 cmProcess::cmProcess()

Source/CTest/cmProcess.h

@@ -12,8 +12,8 @@
 #ifndef cmProcess_h
 #define cmProcess_h
 
-
 #include "cmStandardIncludes.h"
+
 #include <cmsys/Process.h>
 
 

Source/CursesDialog/ccmake.cxx

@@ -9,15 +9,16 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
+#include "cmCursesStandardIncludes.h"
+
+#include "../cmDocumentation.h"
 #include "../cmSystemTools.h"
 #include "../cmake.h"
-#include "../cmDocumentation.h"
 
 #include <signal.h>
 #include <sys/ioctl.h>
 
 #include "cmCursesMainForm.h"
-#include "cmCursesStandardIncludes.h"
 #include <cmsys/Encoding.hxx>
 
 #include <form.h>

Source/CursesDialog/cmCursesBoolWidget.cxx

@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmCursesBoolWidget.h"
+
 #include "cmCursesMainForm.h"
 
 cmCursesBoolWidget::cmCursesBoolWidget(int width, int height,

Source/CursesDialog/cmCursesBoolWidget.h

@@ -13,6 +13,7 @@
 #define cmCursesBoolWidget_h
 
 #include "cmCursesWidget.h"
+
 class cmCursesMainForm;
 
 class cmCursesBoolWidget : public cmCursesWidget

Source/CursesDialog/cmCursesCacheEntryComposite.cxx

@@ -10,16 +10,17 @@
   See the License for more information.
 ============================================================================*/
 #include "cmCursesCacheEntryComposite.h"
-#include "cmCursesOptionsWidget.h"
+
-#include "cmCursesStringWidget.h"
+#include "../cmState.h"
-#include "cmCursesLabelWidget.h"
-#include "cmCursesBoolWidget.h"
-#include "cmCursesPathWidget.h"
-#include "cmCursesFilePathWidget.h"
-#include "cmCursesDummyWidget.h"
 #include "../cmSystemTools.h"
 #include "../cmake.h"
-#include "../cmState.h"
+#include "cmCursesBoolWidget.h"
+#include "cmCursesDummyWidget.h"
+#include "cmCursesFilePathWidget.h"
+#include "cmCursesLabelWidget.h"
+#include "cmCursesOptionsWidget.h"
+#include "cmCursesPathWidget.h"
+#include "cmCursesStringWidget.h"
 
 #include <assert.h>
 

Source/CursesDialog/cmCursesForm.h

@@ -12,8 +12,8 @@
 #ifndef cmCursesForm_h
 #define cmCursesForm_h
 
-#include "../cmStandardIncludes.h"
 #include "cmCursesStandardIncludes.h"
+
 #include <cmsys/FStream.hxx>
 
 class cmCursesForm

Source/CursesDialog/cmCursesLabelWidget.h

@@ -13,7 +13,6 @@
 #define cmCursesLabelWidget_h
 
 #include "cmCursesWidget.h"
-#include "cmCursesStandardIncludes.h"
 
 class cmCursesMainForm;
 

Source/CursesDialog/cmCursesLongMessageForm.cxx

@@ -9,10 +9,11 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#include "../cmSystemTools.h"
-#include "../cmake.h"
-#include "../cmVersion.h"
 #include "cmCursesLongMessageForm.h"
+
+#include "../cmSystemTools.h"
+#include "../cmVersion.h"
+#include "../cmake.h"
 #include "cmCursesMainForm.h"
 
 inline int ctrl(int z)