diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2020-06-01 12:14:45 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2020-06-02 11:37:56 (GMT) |
| commit | ed2fe558b03e006d708c0fb210f218d9a80ffc01 (patch) | |
| tree | fa065408e1c2d5f55ccd05eb96b27cebcdbaf2f0 /Source/CursesDialog | |
| parent | 44f1744bed50e6ef47b179810a7533538b31722b (diff) | |
| download | CMake-ed2fe558b03e006d708c0fb210f218d9a80ffc01.zip CMake-ed2fe558b03e006d708c0fb210f218d9a80ffc01.tar.gz CMake-ed2fe558b03e006d708c0fb210f218d9a80ffc01.tar.bz2 | |
CursesDialog: resolve clang-tidy warnings
Fixes:
- unnecessary bool expression (cmCursesMainForm)
- removes a duplicate if/else branch (RegexExplorer)
- collapses redundant if/else branch logic (CMakeSetupDialog and
cmCursesStringWidget)
Diffstat (limited to 'Source/CursesDialog')
| -rw-r--r-- | Source/CursesDialog/cmCursesMainForm.cxx | 6 | ||||
| -rw-r--r-- | Source/CursesDialog/cmCursesStringWidget.cxx | 10 |
2 files changed, 5 insertions, 11 deletions
diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx index df34283..ce1a715 100644 --- a/Source/CursesDialog/cmCursesMainForm.cxx +++ b/Source/CursesDialog/cmCursesMainForm.cxx @@ -853,11 +853,7 @@ void cmCursesMainForm::HandleInput() } // switch advanced on/off else if (key == 't') { - if (this->AdvancedMode) { - this->AdvancedMode = false; - } else { - this->AdvancedMode = true; - } + this->AdvancedMode = !this->AdvancedMode; getmaxyx(stdscr, y, x); this->RePost(); this->Render(1, 1, x, y); diff --git a/Source/CursesDialog/cmCursesStringWidget.cxx b/Source/CursesDialog/cmCursesStringWidget.cxx index c629478..4830d63 100644 --- a/Source/CursesDialog/cmCursesStringWidget.cxx +++ b/Source/CursesDialog/cmCursesStringWidget.cxx @@ -105,12 +105,10 @@ bool cmCursesStringWidget::HandleInput(int& key, cmCursesMainForm* fm, if (!this->InEdit && (key != 10 && key != KEY_ENTER && key != 'i')) { return false; } - // enter edit with return and i (vim binding) - if (!this->InEdit && (key == 10 || key == KEY_ENTER || key == 'i')) { - this->OnReturn(fm, w); - } - // leave edit with return (but not i -- not a toggle) - else if (this->InEdit && (key == 10 || key == KEY_ENTER)) { + // toggle edit with return + if ((key == 10 || key == KEY_ENTER) + // enter edit with i (and not-edit mode) + || (!this->InEdit && key == 'i')) { this->OnReturn(fm, w); } else if (key == KEY_DOWN || key == ctrl('n') || key == KEY_UP || key == ctrl('p') || key == KEY_NPAGE || key == ctrl('d') || |