Mercurial > octave
changeset 31622:c54cfa058df8
don't bother updating old setting names
* octave-dock-widget.cc (octave_dock_widget::set_focus_predecessor):
Don't update Dockwidgets/title_bg_color,
Dockwidgets/title_bg_color_active, Dockwidgets/title_fg_color, or
Dockwidgets/title_fg_color_active to new names.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 02 Dec 2022 19:32:48 -0500 |
parents | 0645ea65ca6b |
children | 302b260cf585 |
files | libgui/src/octave-dock-widget.cc |
diffstat | 1 files changed, 0 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/octave-dock-widget.cc Fri Dec 02 18:43:12 2022 -0500 +++ b/libgui/src/octave-dock-widget.cc Fri Dec 02 19:32:48 2022 -0500 @@ -831,26 +831,5 @@ m_predecessor_widget->setFocus (); m_predecessor_widget = nullptr; - - // FIXME: Until cset bda0c5b38bda, the wrong keys "Dockwidget/..." were used - // here. This had no effect in Qt4, but does in Qt5. In the following, the - // four incorrect keys are updated if still present in the settings files. - // The keys are also used in the settings dialog, but - // octave_dock_widget::handle_settings is already called at program start. - // These tests can be removed in a future version of Octave (version 6). - - resource_manager& rmgr = m_octave_qobj.get_resource_manager (); - - rmgr.update_settings_key ("Dockwidgets/title_bg_color", - dw_title_bg_color.key); - - rmgr.update_settings_key ("Dockwidgets/title_bg_color_active", - dw_title_bg_color_active.key); - - rmgr.update_settings_key ("Dockwidgets/title_fg_color", - dw_title_fg_color.key); - - rmgr.update_settings_key ("Dockwidgets/title_fg_color_active", - dw_title_fg_color_active.key); } }