Mercurial > octave
changeset 29599:2b5bc8367135
avoid connecting to parent slots in workspace view
* main-window.cc (main_window::main_window): Make connections from
workspace view widget signals to main window slots here.
* workspace-view (workspace_view::workspace_view): Not here.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 03 May 2021 16:40:37 -0400 |
| parents | c7b104ebed4d |
| children | b909a8915a72 |
| files | libgui/src/main-window.cc libgui/src/workspace-view.cc |
| diffstat | 2 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/main-window.cc Mon May 03 13:48:26 2021 -0400 +++ b/libgui/src/main-window.cc Mon May 03 16:40:37 2021 -0400 @@ -217,6 +217,12 @@ m_workspace_window = new workspace_view (this, m_octave_qobj); + connect (m_workspace_window, &workspace_view::command_requested, + this, &main_window::execute_command_in_terminal); + + connect (m_workspace_window, &workspace_view::edit_variable_signal, + this, &main_window::edit_variable); + m_previous_dock = m_command_window; // Set active editor depending on editor window. If the latter is
--- a/libgui/src/workspace-view.cc Mon May 03 13:48:26 2021 -0400 +++ b/libgui/src/workspace-view.cc Mon May 03 16:40:37 2021 -0400 @@ -159,13 +159,6 @@ connect (m_view, &QTableView::activated, this, &workspace_view::handle_contextmenu_edit); - - connect (this, SIGNAL (command_requested (const QString&)), - p, SLOT (execute_command_in_terminal (const QString&))); - - connect (this, - SIGNAL (edit_variable_signal (const QString&, const octave_value&)), - p, SLOT (edit_variable (const QString&, const octave_value&))); } void workspace_view::setModel (workspace_model *model)