1
0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 02:08:27 +08:00

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.
This commit is contained in:
Kitware Robot
2019-09-30 10:46:28 -04:00
committed by Brad King
parent 185fe49f29
commit ed98209ddc
599 changed files with 2043 additions and 1741 deletions

View File

@@ -1,6 +1,14 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
#include <csignal>
#include <cstring>
#include <iostream>
#include <string>
#include <vector>
#include "cmsys/Encoding.hxx"
#include "cmCursesForm.h"
#include "cmCursesMainForm.h"
#include "cmCursesStandardIncludes.h"
@@ -10,13 +18,6 @@
#include "cmSystemTools.h"
#include "cmake.h"
#include "cmsys/Encoding.hxx"
#include <csignal>
#include <cstring>
#include <iostream>
#include <string>
#include <vector>
static const char* cmDocumentationName[][2] = {
{ nullptr, " ccmake - Curses Interface for CMake." },
{ nullptr, nullptr }

View File

@@ -2,11 +2,11 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmCursesBoolWidget.h"
#include <string>
#include "cmCursesWidget.h"
#include "cmStateTypes.h"
#include <string>
cmCursesBoolWidget::cmCursesBoolWidget(int width, int height, int left,
int top)
: cmCursesWidget(width, height, left, top)

View File

@@ -2,6 +2,12 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmCursesCacheEntryComposite.h"
#include <cassert>
#include <utility>
#include <vector>
#include <cm/memory>
#include "cmCursesBoolWidget.h"
#include "cmCursesFilePathWidget.h"
#include "cmCursesLabelWidget.h"
@@ -14,12 +20,6 @@
#include "cmStringAlgorithms.h"
#include "cmSystemTools.h"
#include <cm/memory>
#include <cassert>
#include <utility>
#include <vector>
cmCursesCacheEntryComposite::cmCursesCacheEntryComposite(
const std::string& key, int labelwidth, int entrywidth)
: Key(key)

View File

@@ -5,11 +5,11 @@
#include "cmConfigure.h" // IWYU pragma: keep
#include "cmCursesStandardIncludes.h"
#include <string>
#include "cmsys/FStream.hxx"
#include <string>
#include "cmCursesStandardIncludes.h"
class cmCursesForm
{

View File

@@ -5,11 +5,11 @@
#include "cmConfigure.h" // IWYU pragma: keep
#include <string>
#include "cmCursesStandardIncludes.h"
#include "cmCursesWidget.h"
#include <string>
class cmCursesMainForm;
class cmCursesLabelWidget : public cmCursesWidget

View File

@@ -2,14 +2,14 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmCursesLongMessageForm.h"
#include <cstdio>
#include <cstring>
#include "cmCursesForm.h"
#include "cmCursesMainForm.h"
#include "cmCursesStandardIncludes.h"
#include "cmVersion.h"
#include <cstdio>
#include <cstring>
inline int ctrl(int z)
{
return (z & 037);

View File

@@ -5,12 +5,12 @@
#include "cmConfigure.h" // IWYU pragma: keep
#include "cmCursesForm.h"
#include "cmCursesStandardIncludes.h"
#include <string>
#include <vector>
#include "cmCursesForm.h"
#include "cmCursesStandardIncludes.h"
class cmCursesLongMessageForm : public cmCursesForm
{
public:

View File

@@ -2,6 +2,13 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmCursesMainForm.h"
#include <algorithm>
#include <cstdio>
#include <cstring>
#include <utility>
#include <cm/memory>
#include "cmCursesCacheEntryComposite.h"
#include "cmCursesDummyWidget.h"
#include "cmCursesForm.h"
@@ -17,13 +24,6 @@
#include "cmVersion.h"
#include "cmake.h"
#include <cm/memory>
#include <algorithm>
#include <cstdio>
#include <cstring>
#include <utility>
inline int ctrl(int z)
{
return (z & 037);

View File

@@ -5,16 +5,16 @@
#include "cmConfigure.h" // IWYU pragma: keep
#include "cmCursesCacheEntryComposite.h"
#include "cmCursesForm.h"
#include "cmCursesStandardIncludes.h"
#include "cmStateTypes.h"
#include <cstddef>
#include <memory>
#include <string>
#include <vector>
#include "cmCursesCacheEntryComposite.h"
#include "cmCursesForm.h"
#include "cmCursesStandardIncludes.h"
#include "cmStateTypes.h"
class cmake;
/** \class cmCursesMainForm

View File

@@ -5,12 +5,12 @@
#include "cmConfigure.h" // IWYU pragma: keep
#include "cmCursesStandardIncludes.h"
#include "cmCursesWidget.h"
#include <string>
#include <vector>
#include "cmCursesStandardIncludes.h"
#include "cmCursesWidget.h"
class cmCursesMainForm;
class cmCursesOptionsWidget : public cmCursesWidget

View File

@@ -2,13 +2,13 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmCursesPathWidget.h"
#include <vector>
#include "cmCursesMainForm.h"
#include "cmCursesStringWidget.h"
#include "cmStateTypes.h"
#include "cmSystemTools.h"
#include <vector>
cmCursesPathWidget::cmCursesPathWidget(int width, int height, int left,
int top)
: cmCursesStringWidget(width, height, left, top)

View File

@@ -5,11 +5,11 @@
#include "cmConfigure.h" // IWYU pragma: keep
#include <string>
#include "cmCursesStandardIncludes.h"
#include "cmCursesStringWidget.h"
#include <string>
class cmCursesMainForm;
class cmCursesPathWidget : public cmCursesStringWidget

View File

@@ -2,14 +2,14 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmCursesStringWidget.h"
#include <cstdio>
#include "cmCursesForm.h"
#include "cmCursesMainForm.h"
#include "cmCursesStandardIncludes.h"
#include "cmCursesWidget.h"
#include "cmStateTypes.h"
#include <cstdio>
inline int ctrl(int z)
{
return (z & 037);

View File

@@ -5,11 +5,11 @@
#include "cmConfigure.h" // IWYU pragma: keep
#include <string>
#include "cmCursesStandardIncludes.h"
#include "cmCursesWidget.h"
#include <string>
class cmCursesMainForm;
/** \class cmCursesStringWidget

View File

@@ -5,11 +5,11 @@
#include "cmConfigure.h" // IWYU pragma: keep
#include <string>
#include "cmCursesStandardIncludes.h"
#include "cmStateTypes.h"
#include <string>
class cmCursesMainForm;
class cmCursesWidget