From e1c7747253ac71a5215dd32a910b62a1fd8c561a Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 29 Apr 2016 10:53:13 -0400 Subject: Format include directive blocks and ordering with clang-format Sort include directives within each block (separated by a blank line) in lexicographic order (except to prioritize `sys/types.h` first). First run `clang-format` with the config file: --- SortIncludes: false ... Commit the result temporarily. Then run `clang-format` again with: --- SortIncludes: true IncludeCategories: - Regex: 'sys/types.h' Priority: -1 ... Commit the result temporarily. Start a new branch and cherry-pick the second commit. Manually resolve conflicts to preserve indentation of re-ordered includes. This cleans up the include ordering without changing any other style. Use the following command to run `clang-format`: $ git ls-files -z -- \ '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' | egrep -z -v '(Lexer|Parser|ParserHelper)\.' | egrep -z -v '^Source/cm_sha2' | egrep -z -v '^Source/(kwsys|CursesDialog/form)/' | egrep -z -v '^Utilities/(KW|cm).*/' | egrep -z -v '^Tests/Module/GenerateExportHeader' | egrep -z -v '^Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h' | xargs -0 clang-format -i This selects source files that do not come from a third-party. Inspired-by: Daniel Pfeifer --- Tests/BuildDepends/Project/bar.cxx | 4 ++-- Tests/BuildDepends/Project/ninjadep.cpp | 2 +- Tests/BuildDepends/Project/zot.cxx | 2 +- Tests/BundleTest/BundleLib.cxx | 2 +- Tests/BundleUtilities/module.cpp | 2 +- Tests/CMakeCommands/target_include_directories/consumer.cpp | 4 ++-- Tests/CMakeCommands/target_link_libraries/targetC.cpp | 2 +- Tests/CMakeLib/testUTF8.cxx | 2 +- Tests/CompileDefinitions/runtest.c | 4 ++-- Tests/Complex/Executable/complex.cxx | 8 ++++---- Tests/ComplexOneConfig/Executable/complex.cxx | 8 ++++---- Tests/ExportImport/Export/testSharedLibDepends.h | 2 +- Tests/ExportImport/Import/A/deps_shared_iface.cpp | 2 +- Tests/FindGSL/rng/main.cc | 2 +- Tests/FindGTK2/cairomm/main.cpp | 6 +++--- Tests/FindGTK2/gtkmm/main.cpp | 2 +- Tests/FindGTK2/sigc++/main.cpp | 3 +-- Tests/FindLTTngUST/Test/main.c | 4 ++-- Tests/FindPNG/Test/main.c | 2 +- Tests/FindPackageModeMakefileTest/main.cpp | 2 +- Tests/FindXalanC/Test/main.cxx | 2 +- Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp | 12 ++++++------ Tests/LoadCommand/CMakeCommands/cmTestCommand.c | 4 ++-- Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c | 4 ++-- Tests/MFC/mfc1/mfc1.cpp | 2 +- Tests/MFC/mfc1/stdafx.h | 6 +++--- Tests/OutOfSource/OutOfSourceSubdir/simple.cxx | 2 +- Tests/Plugin/src/example_exe.cxx | 2 +- Tests/Preprocess/preprocess.c | 2 +- Tests/Preprocess/preprocess.cxx | 2 +- Tests/Qt4Deploy/testdeploy.cpp | 4 ++-- Tests/QtAutogen/Bdir/libB.h | 2 +- Tests/QtAutogen/calwidget.cpp | 8 ++++---- Tests/QtAutogen/codeeditor.h | 2 +- Tests/QtAutogen/libC.h | 2 +- Tests/QtAutogen/main.cpp | 10 +++++----- Tests/QtAutogen/resourcetester.cpp | 2 +- Tests/QtAutogen/same_name/ccc/item.cpp | 2 +- Tests/QtAutogen/same_name/main.cpp | 4 ++-- Tests/RunCMake/AutoExportDll/hello.cxx | 2 +- Tests/RunCMake/AutoExportDll/say.cxx | 2 +- Tests/StagingPrefix/Consumer/main.cpp | 2 +- Tests/TestsWorkingDirectory/main.c | 2 +- Tests/Tutorial/Step1/tutorial.cxx | 4 ++-- Tests/Tutorial/Step2/MathFunctions/mysqrt.cxx | 2 +- Tests/Tutorial/Step2/tutorial.cxx | 4 ++-- Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx | 2 +- Tests/Tutorial/Step3/tutorial.cxx | 4 ++-- Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx | 2 +- Tests/Tutorial/Step4/tutorial.cxx | 4 ++-- Tests/Tutorial/Step5/MathFunctions/MakeTable.cxx | 2 +- Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx | 2 +- Tests/Tutorial/Step5/tutorial.cxx | 4 ++-- Tests/Tutorial/Step6/MathFunctions/MakeTable.cxx | 2 +- Tests/Tutorial/Step6/MathFunctions/mysqrt.cxx | 2 +- Tests/Tutorial/Step6/tutorial.cxx | 4 ++-- Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx | 2 +- Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx | 2 +- Tests/Tutorial/Step7/tutorial.cxx | 4 ++-- Tests/VSResource/main.cpp | 2 +- Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp | 2 +- Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h | 2 +- Tests/VSWinStorePhone/Direct3DApp1/pch.h | 6 +++--- Tests/Wrapping/qtwrappingmain.cxx | 4 ++-- Tests/X11/HelloWorldX11.cxx | 2 +- 65 files changed, 105 insertions(+), 106 deletions(-) (limited to 'Tests') diff --git a/Tests/BuildDepends/Project/bar.cxx b/Tests/BuildDepends/Project/bar.cxx index dadf93d6b9..c4adbf8e64 100644 --- a/Tests/BuildDepends/Project/bar.cxx +++ b/Tests/BuildDepends/Project/bar.cxx @@ -1,7 +1,7 @@ +#include +#include #include #include -#include -#include int main(int argc, char** argv) { diff --git a/Tests/BuildDepends/Project/ninjadep.cpp b/Tests/BuildDepends/Project/ninjadep.cpp index 8d61336137..5498b177ba 100644 --- a/Tests/BuildDepends/Project/ninjadep.cpp +++ b/Tests/BuildDepends/Project/ninjadep.cpp @@ -1,5 +1,5 @@ -#include #include "dir/header.h" +#include int main() { printf("HEADER_STRING: %s\n", HEADER_STRING); diff --git a/Tests/BuildDepends/Project/zot.cxx b/Tests/BuildDepends/Project/zot.cxx index 775fd3b438..186554b82e 100644 --- a/Tests/BuildDepends/Project/zot.cxx +++ b/Tests/BuildDepends/Project/zot.cxx @@ -1,6 +1,6 @@ +#include #include #include -#include const char* zot_macro_dir_f(); const char* zot_macro_tgt_f(); diff --git a/Tests/BundleTest/BundleLib.cxx b/Tests/BundleTest/BundleLib.cxx index 37bc178d63..54f9534d02 100644 --- a/Tests/BundleTest/BundleLib.cxx +++ b/Tests/BundleTest/BundleLib.cxx @@ -1,6 +1,6 @@ #include -#include #include +#include #include #include diff --git a/Tests/BundleUtilities/module.cpp b/Tests/BundleUtilities/module.cpp index ee1b542fb3..51730d9de3 100644 --- a/Tests/BundleUtilities/module.cpp +++ b/Tests/BundleUtilities/module.cpp @@ -1,7 +1,7 @@ #include "module.h" -#include "stdio.h" #include "shared2.h" +#include "stdio.h" void module() { diff --git a/Tests/CMakeCommands/target_include_directories/consumer.cpp b/Tests/CMakeCommands/target_include_directories/consumer.cpp index 649510ce08..9e1656a977 100644 --- a/Tests/CMakeCommands/target_include_directories/consumer.cpp +++ b/Tests/CMakeCommands/target_include_directories/consumer.cpp @@ -1,9 +1,9 @@ +#include "consumer.h" #include "common.h" -#include "publicinclude.h" #include "interfaceinclude.h" +#include "publicinclude.h" #include "relative_dir.h" -#include "consumer.h" #ifdef TEST_LANG_DEFINES #include "cxx_only.h" #endif diff --git a/Tests/CMakeCommands/target_link_libraries/targetC.cpp b/Tests/CMakeCommands/target_link_libraries/targetC.cpp index a4ef6369d0..35426605df 100644 --- a/Tests/CMakeCommands/target_link_libraries/targetC.cpp +++ b/Tests/CMakeCommands/target_link_libraries/targetC.cpp @@ -1,8 +1,8 @@ #include "depG.h" -#include "foo.h" #include "bar.h" +#include "foo.h" #ifndef TEST_DEF #error Expected TEST_DEF definition diff --git a/Tests/CMakeLib/testUTF8.cxx b/Tests/CMakeLib/testUTF8.cxx index 4ab96cf01e..204a717391 100644 --- a/Tests/CMakeLib/testUTF8.cxx +++ b/Tests/CMakeLib/testUTF8.cxx @@ -11,8 +11,8 @@ ============================================================================*/ #include -#include #include +#include typedef char test_utf8_char[5]; diff --git a/Tests/CompileDefinitions/runtest.c b/Tests/CompileDefinitions/runtest.c index 02d2cadb0c..c2d51aaf0c 100644 --- a/Tests/CompileDefinitions/runtest.c +++ b/Tests/CompileDefinitions/runtest.c @@ -1,6 +1,6 @@ -#include -#include #include +#include +#include #ifndef BUILD_CONFIG_NAME # error "BUILD_CONFIG_NAME not defined!" diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx index ec222a5ace..8d538db8a3 100644 --- a/Tests/Complex/Executable/complex.cxx +++ b/Tests/Complex/Executable/complex.cxx @@ -1,18 +1,18 @@ +#include "Aout.h" +#include "ExtraSources/file1.h" #include "cmTestConfigure.h" #include "cmTestConfigureEscape.h" #include "cmTestGeneratedHeader.h" #include "cmVersion.h" -#include "ExtraSources/file1.h" -#include "Aout.h" #include "file2.h" #include "sharedFile.h" extern "C" { #include "testConly.h" } -#include -#include #include #include +#include +#include #include #include diff --git a/Tests/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx index ec222a5ace..8d538db8a3 100644 --- a/Tests/ComplexOneConfig/Executable/complex.cxx +++ b/Tests/ComplexOneConfig/Executable/complex.cxx @@ -1,18 +1,18 @@ +#include "Aout.h" +#include "ExtraSources/file1.h" #include "cmTestConfigure.h" #include "cmTestConfigureEscape.h" #include "cmTestGeneratedHeader.h" #include "cmVersion.h" -#include "ExtraSources/file1.h" -#include "Aout.h" #include "file2.h" #include "sharedFile.h" extern "C" { #include "testConly.h" } -#include -#include #include #include +#include +#include #include #include diff --git a/Tests/ExportImport/Export/testSharedLibDepends.h b/Tests/ExportImport/Export/testSharedLibDepends.h index 8b2f84eb34..e84fb54544 100644 --- a/Tests/ExportImport/Export/testSharedLibDepends.h +++ b/Tests/ExportImport/Export/testSharedLibDepends.h @@ -4,8 +4,8 @@ #include "testsharedlibdepends_export.h" -#include "testSharedLibRequired.h" #include "renamed.h" +#include "testSharedLibRequired.h" struct TESTSHAREDLIBDEPENDS_EXPORT TestSharedLibDepends { diff --git a/Tests/ExportImport/Import/A/deps_shared_iface.cpp b/Tests/ExportImport/Import/A/deps_shared_iface.cpp index d5e4de3c0a..0c5cb7fd70 100644 --- a/Tests/ExportImport/Import/A/deps_shared_iface.cpp +++ b/Tests/ExportImport/Import/A/deps_shared_iface.cpp @@ -21,8 +21,8 @@ #endif #ifdef TEST_SUBDIR_LIB -#include "subdir.h" #include "renamed.h" +#include "subdir.h" #endif #ifdef DO_GNU_TESTS diff --git a/Tests/FindGSL/rng/main.cc b/Tests/FindGSL/rng/main.cc index 72543be779..e1e0a4778b 100644 --- a/Tests/FindGSL/rng/main.cc +++ b/Tests/FindGSL/rng/main.cc @@ -1,5 +1,5 @@ -#include #include "gsl/gsl_rng.h" +#include int main() { diff --git a/Tests/FindGTK2/cairomm/main.cpp b/Tests/FindGTK2/cairomm/main.cpp index ea8f1065cc..0db3a04214 100644 --- a/Tests/FindGTK2/cairomm/main.cpp +++ b/Tests/FindGTK2/cairomm/main.cpp @@ -8,11 +8,11 @@ #define _USE_MATH_DEFINES #endif -#include -#include -#include #include #include +#include +#include +#include #include diff --git a/Tests/FindGTK2/gtkmm/main.cpp b/Tests/FindGTK2/gtkmm/main.cpp index 5ff64d113a..566a4bd0af 100644 --- a/Tests/FindGTK2/gtkmm/main.cpp +++ b/Tests/FindGTK2/gtkmm/main.cpp @@ -1,5 +1,5 @@ -#include #include "helloworld.h" +#include int main(int argc, char *argv[]) { diff --git a/Tests/FindGTK2/sigc++/main.cpp b/Tests/FindGTK2/sigc++/main.cpp index 78428e76bf..ccf415e481 100644 --- a/Tests/FindGTK2/sigc++/main.cpp +++ b/Tests/FindGTK2/sigc++/main.cpp @@ -1,8 +1,7 @@ // Taken from https://developer.gnome.org/libsigc++-tutorial/stable/ch02.html - -#include #include +#include class AlienDetector { diff --git a/Tests/FindLTTngUST/Test/main.c b/Tests/FindLTTngUST/Test/main.c index ac775a0c4a..1f313c1a9b 100644 --- a/Tests/FindLTTngUST/Test/main.c +++ b/Tests/FindLTTngUST/Test/main.c @@ -1,7 +1,7 @@ #include -#include -#include #include +#include +#include #ifdef CMAKE_LTTNGUST_HAS_TRACEF #include diff --git a/Tests/FindPNG/Test/main.c b/Tests/FindPNG/Test/main.c index 27e14786bb..06d943d1b5 100644 --- a/Tests/FindPNG/Test/main.c +++ b/Tests/FindPNG/Test/main.c @@ -1,6 +1,6 @@ #include -#include #include +#include int main() { diff --git a/Tests/FindPackageModeMakefileTest/main.cpp b/Tests/FindPackageModeMakefileTest/main.cpp index e5f9134ce9..db1ffb19ed 100644 --- a/Tests/FindPackageModeMakefileTest/main.cpp +++ b/Tests/FindPackageModeMakefileTest/main.cpp @@ -1,5 +1,5 @@ -#include #include +#include int main() { diff --git a/Tests/FindXalanC/Test/main.cxx b/Tests/FindXalanC/Test/main.cxx index 3b4a2df8ee..7d0f42cf4a 100644 --- a/Tests/FindXalanC/Test/main.cxx +++ b/Tests/FindXalanC/Test/main.cxx @@ -1,5 +1,5 @@ -#include #include +#include int main() { diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp b/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp index aed0bde46b..2ee05e2eed 100644 --- a/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp +++ b/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp @@ -1,17 +1,17 @@ +#include "arguments.h" +#include "bang.h" #include "bar.h" #include "bat.h" -#include "foo.h" #include "baz.h" -#include "bang.h" #include "bing.h" #include "bung.h" -#include "ting.h" -#include "arguments.h" +#include "common.h" +#include "foo.h" #include "list.h" -#include "target.h" #include "prefix_foo_bar_bat.h" -#include "common.h" +#include "target.h" +#include "ting.h" int main(int, char**) { diff --git a/Tests/LoadCommand/CMakeCommands/cmTestCommand.c b/Tests/LoadCommand/CMakeCommands/cmTestCommand.c index fc04934dd9..eac121d41c 100644 --- a/Tests/LoadCommand/CMakeCommands/cmTestCommand.c +++ b/Tests/LoadCommand/CMakeCommands/cmTestCommand.c @@ -1,7 +1,7 @@ #include "cmCPluginAPI.h" -#include -#include #include +#include +#include typedef struct { diff --git a/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c b/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c index fc04934dd9..eac121d41c 100644 --- a/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c +++ b/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c @@ -1,7 +1,7 @@ #include "cmCPluginAPI.h" -#include -#include #include +#include +#include typedef struct { diff --git a/Tests/MFC/mfc1/mfc1.cpp b/Tests/MFC/mfc1/mfc1.cpp index 057e1d5738..1777d7f29b 100644 --- a/Tests/MFC/mfc1/mfc1.cpp +++ b/Tests/MFC/mfc1/mfc1.cpp @@ -3,8 +3,8 @@ #include "stdafx.h" -#include "mfc1.h" #include "MainFrm.h" +#include "mfc1.h" #include "ChildFrm.h" #include "mfc1Doc.h" diff --git a/Tests/MFC/mfc1/stdafx.h b/Tests/MFC/mfc1/stdafx.h index 35a678dcde..654a23f485 100644 --- a/Tests/MFC/mfc1/stdafx.h +++ b/Tests/MFC/mfc1/stdafx.h @@ -46,9 +46,9 @@ // turns off MFC's hiding of some common and often safely ignored warning messages #define _AFX_ALL_WARNINGS -#include // MFC core and standard components -#include // MFC extensions -#include // MFC Automation classes +#include // MFC Automation classes +#include // MFC extensions +#include // MFC core and standard components #include // MFC support for Internet Explorer 4 Common Controls #ifndef _AFX_NO_AFXCMN_SUPPORT diff --git a/Tests/OutOfSource/OutOfSourceSubdir/simple.cxx b/Tests/OutOfSource/OutOfSourceSubdir/simple.cxx index d88c311f8e..69d7c82d15 100644 --- a/Tests/OutOfSource/OutOfSourceSubdir/simple.cxx +++ b/Tests/OutOfSource/OutOfSourceSubdir/simple.cxx @@ -1,8 +1,8 @@ #include #include -#include "testlib.h" #include "testdp.h" +#include "testlib.h" extern int simple(); #ifndef NO_DEEPSRC diff --git a/Tests/Plugin/src/example_exe.cxx b/Tests/Plugin/src/example_exe.cxx index 12d92041aa..393bb680c0 100644 --- a/Tests/Plugin/src/example_exe.cxx +++ b/Tests/Plugin/src/example_exe.cxx @@ -2,8 +2,8 @@ #include -#include #include +#include #include #include diff --git a/Tests/Preprocess/preprocess.c b/Tests/Preprocess/preprocess.c index 16209acf49..af5eae6722 100644 --- a/Tests/Preprocess/preprocess.c +++ b/Tests/Preprocess/preprocess.c @@ -3,8 +3,8 @@ #include FILE_PATH #include TARGET_PATH -#include #include +#include int check_defines_C(void) { diff --git a/Tests/Preprocess/preprocess.cxx b/Tests/Preprocess/preprocess.cxx index 27b6ac89a6..d1681036f0 100644 --- a/Tests/Preprocess/preprocess.cxx +++ b/Tests/Preprocess/preprocess.cxx @@ -3,8 +3,8 @@ #include FILE_PATH #include TARGET_PATH -#include #include +#include extern "C" int check_defines_C(void); diff --git a/Tests/Qt4Deploy/testdeploy.cpp b/Tests/Qt4Deploy/testdeploy.cpp index 8b9c8d6fa5..255453a40e 100644 --- a/Tests/Qt4Deploy/testdeploy.cpp +++ b/Tests/Qt4Deploy/testdeploy.cpp @@ -1,7 +1,7 @@ #include -#include -#include #include +#include +#include #include int main(int argc, char** argv) diff --git a/Tests/QtAutogen/Bdir/libB.h b/Tests/QtAutogen/Bdir/libB.h index 510c17f8fe..746b67a67a 100644 --- a/Tests/QtAutogen/Bdir/libB.h +++ b/Tests/QtAutogen/Bdir/libB.h @@ -4,8 +4,8 @@ #include "libb_export.h" -#include #include "libA.h" +#include class LIBB_EXPORT LibB : public QObject { diff --git a/Tests/QtAutogen/calwidget.cpp b/Tests/QtAutogen/calwidget.cpp index 5f59994b7b..0e314cd6a9 100644 --- a/Tests/QtAutogen/calwidget.cpp +++ b/Tests/QtAutogen/calwidget.cpp @@ -38,13 +38,13 @@ ** ****************************************************************************/ + #include + #include #include + #include #include - #include #include - #include - #include - #include + #include #include #include "calwidget.h" diff --git a/Tests/QtAutogen/codeeditor.h b/Tests/QtAutogen/codeeditor.h index 56e9e79239..fd79a2ac43 100644 --- a/Tests/QtAutogen/codeeditor.h +++ b/Tests/QtAutogen/codeeditor.h @@ -41,8 +41,8 @@ #ifndef CODEEDITOR_H #define CODEEDITOR_H - #include #include + #include class QPaintEvent; class QResizeEvent; diff --git a/Tests/QtAutogen/libC.h b/Tests/QtAutogen/libC.h index 4fb4a2cf4c..6682576d18 100644 --- a/Tests/QtAutogen/libC.h +++ b/Tests/QtAutogen/libC.h @@ -4,8 +4,8 @@ #include "libc_export.h" -#include #include "libB.h" +#include class LIBC_EXPORT LibC : public QObject { diff --git a/Tests/QtAutogen/main.cpp b/Tests/QtAutogen/main.cpp index eb596650e5..1636cd443c 100644 --- a/Tests/QtAutogen/main.cpp +++ b/Tests/QtAutogen/main.cpp @@ -41,16 +41,16 @@ #include #include -#include "codeeditor.h" +#include "abc.h" +#include "blub.h" #include "calwidget.h" +#include "codeeditor.h" #include "foo.h" -#include "blub.h" +#include "libC.h" +#include "resourcetester.h" #include "sub/bar.h" -#include "abc.h" #include "xyz.h" #include "yaf.h" -#include "libC.h" -#include "resourcetester.h" #ifdef TEST_DEBUG_CLASS #include "debug_class.h" #include diff --git a/Tests/QtAutogen/resourcetester.cpp b/Tests/QtAutogen/resourcetester.cpp index 043ec75fc3..75ae28f8f4 100644 --- a/Tests/QtAutogen/resourcetester.cpp +++ b/Tests/QtAutogen/resourcetester.cpp @@ -1,8 +1,8 @@ #include "resourcetester.h" -#include #include +#include #include #include diff --git a/Tests/QtAutogen/same_name/ccc/item.cpp b/Tests/QtAutogen/same_name/ccc/item.cpp index 2584881e40..12c71d0fa7 100644 --- a/Tests/QtAutogen/same_name/ccc/item.cpp +++ b/Tests/QtAutogen/same_name/ccc/item.cpp @@ -22,5 +22,5 @@ MocTest::go() } // Include own moc files -#include "moc_item.cpp" #include "item.moc" +#include "moc_item.cpp" diff --git a/Tests/QtAutogen/same_name/main.cpp b/Tests/QtAutogen/same_name/main.cpp index 166466e327..fc77a9902c 100644 --- a/Tests/QtAutogen/same_name/main.cpp +++ b/Tests/QtAutogen/same_name/main.cpp @@ -1,7 +1,7 @@ -#include "aaa/item.hpp" #include "aaa/bbb/item.hpp" -#include "bbb/item.hpp" +#include "aaa/item.hpp" #include "bbb/aaa/item.hpp" +#include "bbb/item.hpp" #include "ccc/item.hpp" int main(int argv, char **args) diff --git a/Tests/RunCMake/AutoExportDll/hello.cxx b/Tests/RunCMake/AutoExportDll/hello.cxx index 3933fc114d..4196948f6f 100644 --- a/Tests/RunCMake/AutoExportDll/hello.cxx +++ b/Tests/RunCMake/AutoExportDll/hello.cxx @@ -1,5 +1,5 @@ -#include #include "hello.h" +#include int Hello::Data = 0; void Hello::real() { diff --git a/Tests/RunCMake/AutoExportDll/say.cxx b/Tests/RunCMake/AutoExportDll/say.cxx index 655b3c21a2..0d78d4be89 100644 --- a/Tests/RunCMake/AutoExportDll/say.cxx +++ b/Tests/RunCMake/AutoExportDll/say.cxx @@ -1,5 +1,5 @@ -#include #include "hello.h" +#include #ifdef _MSC_VER #include "windows.h" #else diff --git a/Tests/StagingPrefix/Consumer/main.cpp b/Tests/StagingPrefix/Consumer/main.cpp index 612ee05a91..5c0202d254 100644 --- a/Tests/StagingPrefix/Consumer/main.cpp +++ b/Tests/StagingPrefix/Consumer/main.cpp @@ -1,6 +1,6 @@ -#include "foo.h" #include "bar.h" +#include "foo.h" int main(int, char **) { diff --git a/Tests/TestsWorkingDirectory/main.c b/Tests/TestsWorkingDirectory/main.c index 19f2f14afd..3616f8e342 100644 --- a/Tests/TestsWorkingDirectory/main.c +++ b/Tests/TestsWorkingDirectory/main.c @@ -5,8 +5,8 @@ #if defined(_WIN32) && (defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__) || defined(__MINGW32__)) -#include #include +#include #if defined(__WATCOMC__) #include diff --git a/Tests/Tutorial/Step1/tutorial.cxx b/Tests/Tutorial/Step1/tutorial.cxx index 8ab6dc3067..a3584c475a 100644 --- a/Tests/Tutorial/Step1/tutorial.cxx +++ b/Tests/Tutorial/Step1/tutorial.cxx @@ -1,8 +1,8 @@ // A simple program that computes the square root of a number +#include "TutorialConfig.h" +#include #include #include -#include -#include "TutorialConfig.h" int main (int argc, char *argv[]) { diff --git a/Tests/Tutorial/Step2/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step2/MathFunctions/mysqrt.cxx index 62523f69fb..0f7c10605d 100644 --- a/Tests/Tutorial/Step2/MathFunctions/mysqrt.cxx +++ b/Tests/Tutorial/Step2/MathFunctions/mysqrt.cxx @@ -1,5 +1,5 @@ -#include #include "MathFunctions.h" +#include // a hack square root calculation using simple operations double mysqrt(double x) diff --git a/Tests/Tutorial/Step2/tutorial.cxx b/Tests/Tutorial/Step2/tutorial.cxx index c27da0b847..af88dad465 100644 --- a/Tests/Tutorial/Step2/tutorial.cxx +++ b/Tests/Tutorial/Step2/tutorial.cxx @@ -1,8 +1,8 @@ // A simple program that computes the square root of a number +#include "TutorialConfig.h" +#include #include #include -#include -#include "TutorialConfig.h" #ifdef USE_MYMATH #include "MathFunctions.h" diff --git a/Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx index 62523f69fb..0f7c10605d 100644 --- a/Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx +++ b/Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx @@ -1,5 +1,5 @@ -#include #include "MathFunctions.h" +#include // a hack square root calculation using simple operations double mysqrt(double x) diff --git a/Tests/Tutorial/Step3/tutorial.cxx b/Tests/Tutorial/Step3/tutorial.cxx index c27da0b847..af88dad465 100644 --- a/Tests/Tutorial/Step3/tutorial.cxx +++ b/Tests/Tutorial/Step3/tutorial.cxx @@ -1,8 +1,8 @@ // A simple program that computes the square root of a number +#include "TutorialConfig.h" +#include #include #include -#include -#include "TutorialConfig.h" #ifdef USE_MYMATH #include "MathFunctions.h" diff --git a/Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx index d081d11d20..bbd08fa0d3 100644 --- a/Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx +++ b/Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx @@ -1,6 +1,6 @@ -#include #include "MathFunctions.h" #include "TutorialConfig.h" +#include #include diff --git a/Tests/Tutorial/Step4/tutorial.cxx b/Tests/Tutorial/Step4/tutorial.cxx index c27da0b847..af88dad465 100644 --- a/Tests/Tutorial/Step4/tutorial.cxx +++ b/Tests/Tutorial/Step4/tutorial.cxx @@ -1,8 +1,8 @@ // A simple program that computes the square root of a number +#include "TutorialConfig.h" +#include #include #include -#include -#include "TutorialConfig.h" #ifdef USE_MYMATH #include "MathFunctions.h" diff --git a/Tests/Tutorial/Step5/MathFunctions/MakeTable.cxx b/Tests/Tutorial/Step5/MathFunctions/MakeTable.cxx index ef98d5fdcb..a23feeb620 100644 --- a/Tests/Tutorial/Step5/MathFunctions/MakeTable.cxx +++ b/Tests/Tutorial/Step5/MathFunctions/MakeTable.cxx @@ -1,6 +1,6 @@ // A simple program that builds a sqrt table -#include #include +#include int main (int argc, char *argv[]) { diff --git a/Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx index 1f9b887191..a488af6a3d 100644 --- a/Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx +++ b/Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx @@ -1,6 +1,6 @@ -#include #include "MathFunctions.h" #include "TutorialConfig.h" +#include // include the generated table #include "Table.h" diff --git a/Tests/Tutorial/Step5/tutorial.cxx b/Tests/Tutorial/Step5/tutorial.cxx index c27da0b847..af88dad465 100644 --- a/Tests/Tutorial/Step5/tutorial.cxx +++ b/Tests/Tutorial/Step5/tutorial.cxx @@ -1,8 +1,8 @@ // A simple program that computes the square root of a number +#include "TutorialConfig.h" +#include #include #include -#include -#include "TutorialConfig.h" #ifdef USE_MYMATH #include "MathFunctions.h" diff --git a/Tests/Tutorial/Step6/MathFunctions/MakeTable.cxx b/Tests/Tutorial/Step6/MathFunctions/MakeTable.cxx index ef98d5fdcb..a23feeb620 100644 --- a/Tests/Tutorial/Step6/MathFunctions/MakeTable.cxx +++ b/Tests/Tutorial/Step6/MathFunctions/MakeTable.cxx @@ -1,6 +1,6 @@ // A simple program that builds a sqrt table -#include #include +#include int main (int argc, char *argv[]) { diff --git a/Tests/Tutorial/Step6/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step6/MathFunctions/mysqrt.cxx index 1f9b887191..a488af6a3d 100644 --- a/Tests/Tutorial/Step6/MathFunctions/mysqrt.cxx +++ b/Tests/Tutorial/Step6/MathFunctions/mysqrt.cxx @@ -1,6 +1,6 @@ -#include #include "MathFunctions.h" #include "TutorialConfig.h" +#include // include the generated table #include "Table.h" diff --git a/Tests/Tutorial/Step6/tutorial.cxx b/Tests/Tutorial/Step6/tutorial.cxx index c27da0b847..af88dad465 100644 --- a/Tests/Tutorial/Step6/tutorial.cxx +++ b/Tests/Tutorial/Step6/tutorial.cxx @@ -1,8 +1,8 @@ // A simple program that computes the square root of a number +#include "TutorialConfig.h" +#include #include #include -#include -#include "TutorialConfig.h" #ifdef USE_MYMATH #include "MathFunctions.h" diff --git a/Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx b/Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx index ef98d5fdcb..a23feeb620 100644 --- a/Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx +++ b/Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx @@ -1,6 +1,6 @@ // A simple program that builds a sqrt table -#include #include +#include int main (int argc, char *argv[]) { diff --git a/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx index 1f9b887191..a488af6a3d 100644 --- a/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx +++ b/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx @@ -1,6 +1,6 @@ -#include #include "MathFunctions.h" #include "TutorialConfig.h" +#include // include the generated table #include "Table.h" diff --git a/Tests/Tutorial/Step7/tutorial.cxx b/Tests/Tutorial/Step7/tutorial.cxx index c27da0b847..af88dad465 100644 --- a/Tests/Tutorial/Step7/tutorial.cxx +++ b/Tests/Tutorial/Step7/tutorial.cxx @@ -1,8 +1,8 @@ // A simple program that computes the square root of a number +#include "TutorialConfig.h" +#include #include #include -#include -#include "TutorialConfig.h" #ifdef USE_MYMATH #include "MathFunctions.h" diff --git a/Tests/VSResource/main.cpp b/Tests/VSResource/main.cpp index ccf700c42d..f8372b70b5 100644 --- a/Tests/VSResource/main.cpp +++ b/Tests/VSResource/main.cpp @@ -1,5 +1,5 @@ -#include #include +#include extern int lib(); diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp index 3cfc5891b1..41ca124b34 100644 --- a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp +++ b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp @@ -1,7 +1,7 @@ #include "pch.h" -#include "Direct3DApp1.h" #include "BasicTimer.h" +#include "Direct3DApp1.h" using namespace Windows::ApplicationModel; using namespace Windows::ApplicationModel::Core; diff --git a/Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h b/Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h index d411a9b815..3434ba9ea8 100644 --- a/Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h +++ b/Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h @@ -1,8 +1,8 @@ #pragma once -#include #include #include +#include namespace DX { diff --git a/Tests/VSWinStorePhone/Direct3DApp1/pch.h b/Tests/VSWinStorePhone/Direct3DApp1/pch.h index 2302e66ba7..78ebea3472 100644 --- a/Tests/VSWinStorePhone/Direct3DApp1/pch.h +++ b/Tests/VSWinStorePhone/Direct3DApp1/pch.h @@ -1,7 +1,7 @@ #pragma once -#include -#include #include -#include #include +#include +#include +#include diff --git a/Tests/Wrapping/qtwrappingmain.cxx b/Tests/Wrapping/qtwrappingmain.cxx index fabecfc720..55c7952bac 100644 --- a/Tests/Wrapping/qtwrappingmain.cxx +++ b/Tests/Wrapping/qtwrappingmain.cxx @@ -1,9 +1,9 @@ -#include #include "qtwrapping.h" +#include #ifndef _WIN32 -# include # include +# include #endif int main(int argc, char *argv[]) diff --git a/Tests/X11/HelloWorldX11.cxx b/Tests/X11/HelloWorldX11.cxx index f2b8bdd473..27ab843b6a 100644 --- a/Tests/X11/HelloWorldX11.cxx +++ b/Tests/X11/HelloWorldX11.cxx @@ -19,8 +19,8 @@ /* include the X library headers */ #include -#include #include +#include class Main { -- cgit v1.2.1