Mercurial > octave
changeset 26554:8d2e8d5d617d stable
fixed dead assignments in libgui (bug #55440)
* documentation.cc (registerDoc): remove assignment just before return
* file-editor-tab.cc (detect_eol_mode): do not update max value after last test
* file-editor.cc (emtpy_script): do not update unused variable
* variable-editor.cc (createColumnMenu, createRowMenu): do not update
unused variables
| author | Torsten <mttl@mailbox.org> |
|---|---|
| date | Wed, 16 Jan 2019 06:23:07 +0100 |
| parents | 0447e44cd18b |
| children | 84e0e0b6493e |
| files | libgui/src/documentation.cc libgui/src/m-editor/file-editor-tab.cc libgui/src/m-editor/file-editor.cc libgui/src/variable-editor.cc |
| diffstat | 4 files changed, 1 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/documentation.cc Mon Jan 14 22:31:43 2019 +0100 +++ b/libgui/src/documentation.cc Wed Jan 16 06:23:07 2019 +0100 @@ -740,7 +740,6 @@ QMessageBox::warning (this, tr ("Octave Documentation"), tr ("Unable to register help file %1."). arg (qch)); - do_setup = false; return; }
--- a/libgui/src/m-editor/file-editor-tab.cc Mon Jan 14 22:31:43 2019 +0100 +++ b/libgui/src/m-editor/file-editor-tab.cc Wed Jan 16 06:23:07 2019 +0100 @@ -1930,7 +1930,6 @@ if (count_cr > count_max) { eol_mode = QsciScintilla::EolMac; - count_max = count_cr; } return eol_mode;
--- a/libgui/src/m-editor/file-editor.cc Mon Jan 14 22:31:43 2019 +0100 +++ b/libgui/src/m-editor/file-editor.cc Wed Jan 16 06:23:07 2019 +0100 @@ -237,9 +237,7 @@ // editor is in this tab widget in_tab = true; int top = tab->currentIndex (); - if (top > -1 && tab->tabText (top) == windowTitle ()) - real_visible = true; // and is the current tab - else + if (! (top > -1 && tab->tabText (top) == windowTitle ())) return; // not current tab -> not visible } j++;
--- a/libgui/src/variable-editor.cc Mon Jan 14 22:31:43 2019 +0100 +++ b/libgui/src/variable-editor.cc Wed Jan 16 06:23:07 2019 +0100 @@ -665,8 +665,6 @@ { selectColumn (index); column_selection_count = 1; - current_column_selected = true; - whole_columns_selected = true; } QString column_string @@ -715,8 +713,6 @@ { selectRow (index); rowselection_count = 1; - current_row_selected = true; - whole_rows_selected = true; } QString row_string = tr (rowselection_count > 1 ? " rows" : " row");