diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 10:34:04 -0400 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 16:05:19 -0400 |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Source/cmNewLineStyle.cxx | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | cmake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz |
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update
all our C++ code to a new style defined by `.clang-format`.
Use `clang-format` version 3.8.
* If you reached this commit for a line in `git blame`, re-run the blame
operation starting at the parent of this commit to see older history
for the content.
* See the parent commit for instructions to rebase a change across this
style transition commit.
Diffstat (limited to 'Source/cmNewLineStyle.cxx')
-rw-r--r-- | Source/cmNewLineStyle.cxx | 41 |
1 files changed, 12 insertions, 29 deletions
diff --git a/Source/cmNewLineStyle.cxx b/Source/cmNewLineStyle.cxx index 08f0b5b092..c03f60de32 100644 --- a/Source/cmNewLineStyle.cxx +++ b/Source/cmNewLineStyle.cxx @@ -11,82 +11,65 @@ ============================================================================*/ #include "cmNewLineStyle.h" - - -cmNewLineStyle::cmNewLineStyle() : NewLineStyle(Invalid) +cmNewLineStyle::cmNewLineStyle() + : NewLineStyle(Invalid) { } - bool cmNewLineStyle::IsValid() const { return NewLineStyle != Invalid; } - bool cmNewLineStyle::ReadFromArguments(const std::vector<std::string>& args, std::string& errorString) { NewLineStyle = Invalid; - for (size_t i = 0; i< args.size(); i++) - { - if (args[i] == "NEWLINE_STYLE") - { + for (size_t i = 0; i < args.size(); i++) { + if (args[i] == "NEWLINE_STYLE") { size_t const styleIndex = i + 1; - if (args.size() > styleIndex) - { + if (args.size() > styleIndex) { const std::string eol = args[styleIndex]; - if (eol == "LF" || eol == "UNIX") - { + if (eol == "LF" || eol == "UNIX") { NewLineStyle = LF; return true; - } - else if (eol == "CRLF" || eol == "WIN32" || eol == "DOS") - { + } else if (eol == "CRLF" || eol == "WIN32" || eol == "DOS") { NewLineStyle = CRLF; return true; - } - else - { + } else { errorString = "NEWLINE_STYLE sets an unknown style, only LF, " "CRLF, UNIX, DOS, and WIN32 are supported"; return false; - } } - else - { + } else { errorString = "NEWLINE_STYLE must set a style: " "LF, CRLF, UNIX, DOS, or WIN32"; return false; - } } } + } return true; } - const std::string cmNewLineStyle::GetCharacters() const { - switch (NewLineStyle) - { + switch (NewLineStyle) { case Invalid: return ""; case LF: return "\n"; case CRLF: return "\r\n"; - } + } return ""; } - void cmNewLineStyle::SetStyle(Style style) { NewLineStyle = style; } - cmNewLineStyle::Style cmNewLineStyle::GetStyle() const { return NewLineStyle; |