# HG changeset patch # User John W. Eaton # Date 1621895970 14400 # Node ID 3a684b0e7406980613cae72a38ea7e888b96d74c # Parent b16748c8aa4df5f25479f239bf8fef1315064034 only connect dock widget signals in base_qobject when creating dock widgets * octave-qobject.cc (base_qobject::documentation_widget, base_qobject::history_widget, base_qobject::workspace_widget): Only connect links when initially creating dock widget object. diff -r b16748c8aa4d -r 3a684b0e7406 libgui/src/octave-qobject.cc --- a/libgui/src/octave-qobject.cc Mon May 24 17:25:31 2021 -0400 +++ b/libgui/src/octave-qobject.cc Mon May 24 18:39:30 2021 -0400 @@ -389,14 +389,20 @@ if (m_documentation_widget) m_documentation_widget->set_main_window (mw); else - m_documentation_widget - = QPointer (new documentation_dock_widget (mw, *this)); + { + m_documentation_widget + = QPointer (new documentation_dock_widget (mw, *this)); - connect (qt_link (), &qt_interpreter_events::register_documentation_signal, - m_documentation_widget, &documentation_dock_widget::registerDoc); + connect (qt_link (), + &qt_interpreter_events::register_documentation_signal, + m_documentation_widget, + &documentation_dock_widget::registerDoc); - connect (qt_link (), &qt_interpreter_events::unregister_documentation_signal, - m_documentation_widget, &documentation_dock_widget::unregisterDoc); + connect (qt_link (), + &qt_interpreter_events::unregister_documentation_signal, + m_documentation_widget, + &documentation_dock_widget::unregisterDoc); + } return m_documentation_widget; } @@ -419,19 +425,21 @@ if (m_history_widget) m_history_widget->set_main_window (mw); else - m_history_widget - = QPointer (new history_dock_widget (mw, *this)); + { + m_history_widget + = QPointer (new history_dock_widget (mw, *this)); - connect (qt_link (), &qt_interpreter_events::set_history_signal, - m_history_widget, &history_dock_widget::set_history); + connect (qt_link (), &qt_interpreter_events::set_history_signal, + m_history_widget, &history_dock_widget::set_history); - connect (qt_link (), &qt_interpreter_events::append_history_signal, - m_history_widget, &history_dock_widget::append_history); + connect (qt_link (), &qt_interpreter_events::append_history_signal, + m_history_widget, &history_dock_widget::append_history); - connect (qt_link (), &qt_interpreter_events::clear_history_signal, - m_history_widget, &history_dock_widget::clear_history); + connect (qt_link (), &qt_interpreter_events::clear_history_signal, + m_history_widget, &history_dock_widget::clear_history); - qt_link()->set_history (octave::command_history::list ()); + qt_link()->set_history (octave::command_history::list ()); + } return m_history_widget; } @@ -442,19 +450,21 @@ if (m_workspace_widget) m_workspace_widget->set_main_window (mw); else - m_workspace_widget - = QPointer (new workspace_view (mw, *this)); + { + m_workspace_widget + = QPointer (new workspace_view (mw, *this)); - m_workspace_widget->setModel (m_workspace_model); + m_workspace_widget->setModel (m_workspace_model); - connect (m_workspace_model, &workspace_model::model_changed, - m_workspace_widget, &workspace_view::handle_model_changed); + connect (m_workspace_model, &workspace_model::model_changed, + m_workspace_widget, &workspace_view::handle_model_changed); - connect (qt_link (), &qt_interpreter_events::set_workspace_signal, - m_workspace_model, &workspace_model::set_workspace); + connect (qt_link (), &qt_interpreter_events::set_workspace_signal, + m_workspace_model, &workspace_model::set_workspace); - connect (qt_link (), &qt_interpreter_events::clear_workspace_signal, - m_workspace_model, &workspace_model::clear_workspace); + connect (qt_link (), &qt_interpreter_events::clear_workspace_signal, + m_workspace_model, &workspace_model::clear_workspace); + } return m_workspace_widget; }