diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 14:34:04 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 20:05:19 (GMT) |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Source/CursesDialog/cmCursesOptionsWidget.cxx | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | CMake-d9fd2f5402eeaa345691313658e02b51038f570b.zip CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.bz2 |
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/CursesDialog/cmCursesOptionsWidget.cxx')
-rw-r--r-- | Source/CursesDialog/cmCursesOptionsWidget.cxx | 61 |
1 files changed, 24 insertions, 37 deletions
diff --git a/Source/CursesDialog/cmCursesOptionsWidget.cxx b/Source/CursesDialog/cmCursesOptionsWidget.cxx index 05aeab1..1a3a8c2 100644 --- a/Source/CursesDialog/cmCursesOptionsWidget.cxx +++ b/Source/CursesDialog/cmCursesOptionsWidget.cxx @@ -15,54 +15,47 @@ inline int ctrl(int z) { - return (z&037); + return (z & 037); } -cmCursesOptionsWidget::cmCursesOptionsWidget(int width, int height, - int left, int top) : - cmCursesWidget(width, height, left, top) +cmCursesOptionsWidget::cmCursesOptionsWidget(int width, int height, int left, + int top) + : cmCursesWidget(width, height, left, top) { this->Type = cmState::BOOL; // this is a bit of a hack // there is no option type, and string type causes ccmake to cast // the widget into a string widget at some point. BOOL is safe for // now. - set_field_fore(this->Field, A_NORMAL); - set_field_back(this->Field, A_STANDOUT); - field_opts_off(this->Field, O_STATIC); + set_field_fore(this->Field, A_NORMAL); + set_field_back(this->Field, A_STANDOUT); + field_opts_off(this->Field, O_STATIC); } bool cmCursesOptionsWidget::HandleInput(int& key, cmCursesMainForm*, WINDOW* w) { // 10 == enter - if (key == 10 || key == KEY_ENTER) - { + if (key == 10 || key == KEY_ENTER) { this->NextOption(); touchwin(w); wrefresh(w); return true; - } - else if (key == KEY_LEFT || key == ctrl('b')) - { + } else if (key == KEY_LEFT || key == ctrl('b')) { touchwin(w); wrefresh(w); this->PreviousOption(); return true; - } - else if (key == KEY_RIGHT || key == ctrl('f')) - { + } else if (key == KEY_RIGHT || key == ctrl('f')) { this->NextOption(); touchwin(w); wrefresh(w); return true; - } - else - { + } else { return false; - } + } } -void cmCursesOptionsWidget::AddOption(std::string const & option ) +void cmCursesOptionsWidget::AddOption(std::string const& option) { this->Options.push_back(option); } @@ -70,22 +63,18 @@ void cmCursesOptionsWidget::AddOption(std::string const & option ) void cmCursesOptionsWidget::NextOption() { this->CurrentOption++; - if(this->CurrentOption > this->Options.size()-1) - { + if (this->CurrentOption > this->Options.size() - 1) { this->CurrentOption = 0; - } + } this->SetValue(this->Options[this->CurrentOption]); } void cmCursesOptionsWidget::PreviousOption() { - if(this->CurrentOption == 0) - { - this->CurrentOption = this->Options.size()-1; - } - else - { + if (this->CurrentOption == 0) { + this->CurrentOption = this->Options.size() - 1; + } else { this->CurrentOption--; - } + } this->SetValue(this->Options[this->CurrentOption]); } @@ -94,13 +83,11 @@ void cmCursesOptionsWidget::SetOption(const std::string& value) this->CurrentOption = 0; // default to 0 index this->SetValue(value); int index = 0; - for(std::vector<std::string>::iterator i = this->Options.begin(); - i != this->Options.end(); ++i) - { - if(*i == value) - { + for (std::vector<std::string>::iterator i = this->Options.begin(); + i != this->Options.end(); ++i) { + if (*i == value) { this->CurrentOption = index; - } - index++; } + index++; + } } |