Mercurial > octave

changeset 29610:a46084c73b6d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate more connections from variable editor signals to parent slots * main-window.cc (main_window::main_window): Connect variable_editor command_signal to main_window execute_command_in_terminal signal here. * variable-editor.cc (variable_editor::variable_editor): Not here. * variable-editor.cc (variable_editor::edit_variable): Connect variable_editor::visibilityChanged signal to variable_dock_widget setVisible slot here. (variable_dock_widget::variable_dock_widget): Not here.
author John W. Eaton <jwe@octave.org>
date Tue, 04 May 2021 11:56:47 -0400
parents 5f46f2aacb82
children d64ad3b93372
files libgui/src/main-window.cc libgui/src/variable-editor.cc
diffstat 2 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/main-window.cc	Wed May 05 18:40:58 2021 +0200
+++ b/libgui/src/main-window.cc	Tue May 04 11:56:47 2021 -0400
@@ -224,6 +224,9 @@
 
     m_variable_editor_window = new variable_editor (this, m_octave_qobj);
 
+    connect (m_variable_editor_window, &variable_editor::command_signal,
+             this, &main_window::execute_command_in_terminal);
+
     m_workspace_window = new workspace_view (this, m_octave_qobj);
 
     connect (m_workspace_window, &workspace_view::command_requested,
--- a/libgui/src/variable-editor.cc	Wed May 05 18:40:58 2021 +0200
+++ b/libgui/src/variable-editor.cc	Tue May 04 11:56:47 2021 -0400
@@ -101,8 +101,6 @@
              this, &variable_dock_widget::change_existence);
     connect (this, &variable_dock_widget::topLevelChanged,
              this, &variable_dock_widget::toplevel_change);
-    connect (p, SIGNAL (visibilityChanged (bool)),
-             this, SLOT (setVisible (bool)));
 
 #define DOCKED_FULLSCREEN_BUTTON_TOOLTIP "Fullscreen undock"
 #define UNDOCKED_FULLSCREEN_BUTTON_TOOLTIP "Fullscreen"
@@ -1149,9 +1147,6 @@
     m_main->setCentralWidget (central_mdiarea);
 
     setWidget (m_main);
-
-    connect (this, SIGNAL (command_signal (const QString&)),
-             p, SLOT (execute_command_in_terminal (const QString&)));
   }
 
   void variable_editor::focusInEvent (QFocusEvent *ev)
@@ -1233,6 +1228,9 @@
     connect (qApp, SIGNAL (focusChanged (QWidget*, QWidget*)),
              page, SLOT (handle_focus_change (QWidget*, QWidget*)));
 
+    connect (this, &variable_editor::visibilityChanged,
+             page, &variable_dock_widget::setVisible);
+
     connect (page, &variable_dock_widget::destroyed,
              this, &variable_editor::variable_destroyed);
     connect (page, &variable_dock_widget::variable_focused_signal,