Mercurial > octave

changeset 33424:fa2dfa9152c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix botched merge commit. * libgui/src/files-dock-widget.cc, libgui/src/workspace-view.cc: Remove duplicate hunks.
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 17 Apr 2024 17:45:52 +0200
parents 07f80a531690
children 321e181c6625
files libgui/src/files-dock-widget.cc libgui/src/workspace-view.cc
diffstat 2 files changed, 0 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/files-dock-widget.cc	Wed Apr 17 17:19:45 2024 +0200
+++ b/libgui/src/files-dock-widget.cc	Wed Apr 17 17:45:52 2024 +0200
@@ -484,16 +484,6 @@
 }
 
 void
-files_dock_widget::restore_header_state ()
-{
-  gui_settings settings;
-
-  if (settings.contains (fb_column_state.settings_key ()))
-    m_file_tree_view->header ()->restoreState
-      (settings.value (fb_column_state.settings_key ()).toByteArray ());
-}
-
-void
 files_dock_widget::save_settings ()
 {
   gui_settings settings;
--- a/libgui/src/workspace-view.cc	Wed Apr 17 17:19:45 2024 +0200
+++ b/libgui/src/workspace-view.cc	Wed Apr 17 17:45:52 2024 +0200
@@ -169,16 +169,6 @@
 }
 
 void
-workspace_view::restore_header_state ()
-{
-  gui_settings settings;
-
-  if (settings.contains (ws_column_state.settings_key ()))
-    m_view->horizontalHeader ()->restoreState
-      (settings.value (ws_column_state.settings_key ()).toByteArray ());
-}
-
-void
 workspace_view::setModel (workspace_model *model)
 {
   m_filter_model.setSourceModel (model);