Mercurial > octave
changeset 29709:3f61913fdee4
Backed out changeset b16748c8aa4d
Revert changes intended to save dock widget settings that are opened
from the command line since they caused no dock widgets except the
command window to be present when starting Octave in GUI mode.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 26 May 2021 13:45:14 -0400 |
| parents | fbcc3a680826 |
| children | 97e12df28ee6 |
| files | libgui/src/octave-dock-widget.cc libgui/src/octave-dock-widget.h |
| diffstat | 2 files changed, 1 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/octave-dock-widget.cc Wed May 26 07:51:34 2021 -0700 +++ b/libgui/src/octave-dock-widget.cc Wed May 26 13:45:14 2021 -0400 @@ -255,15 +255,6 @@ handle_settings (rmgr.get_settings ()); } - octave_dock_widget::~octave_dock_widget (void) - { - // Also save settings here because closeEvent will not be called for - // dock widgets that may be opened from the command line and that - // are not children of the main window. - - save_settings (); - } - void octave_dock_widget::init_window_menu_entry (void) {
--- a/libgui/src/octave-dock-widget.h Wed May 26 07:51:34 2021 -0700 +++ b/libgui/src/octave-dock-widget.h Wed May 26 13:45:14 2021 -0400 @@ -92,7 +92,7 @@ octave_dock_widget (const QString& obj_name, QWidget *p, base_qobject& oct_qobj); - ~octave_dock_widget (void); + ~octave_dock_widget (void) = default; void set_predecessor_widget (octave_dock_widget *prev_widget);