Mercurial > octave

diff libgui/src/history-dock-widget.cc @ 31619:ad014fc78bd6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use individual local gui_settings objects Previously, we created a single gui_settings object (derived from QSettings) and accessed it from the resource_manager object. That design is not necessary and is not the way QSettings was designed to be used. Instead of managing a single object, we should be using individual QSettings objects where needed. Each individual QSettings object manages thread-safe access to a single global collection of settings. The Qt docs say that operations on QSettings are not thread safe, but that means that you can't create a QSettings object in one thread and use it in another without some locking. I'm not sure whether we were doing that correctly, but with this change it no longer matters. Each QSettings object does perform locking when reading or writing the underlying global data. * resource-manager.h, resource-manager.cc (resource_manager::m_settings): Delete data member. (resource_manager::get_settings): Delete. * annotation-dialog.cc, QTerminal.cc, QTerminal.h, command-widget.cc, command-widget.h, community-news.cc, dialog.cc, documentation-bookmarks.cc, documentation-bookmarks.h, documentation-dock-widget.cc, documentation-dock-widget.h, documentation.cc, documentation.h, dw-main-window.cc, dw-main-window.h, external-editor-interface.cc, files-dock-widget.cc, files-dock-widget.h, find-files-dialog.cc, history-dock-widget.cc, history-dock-widget.h, file-editor-interface.h, file-editor-tab.cc, file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc, octave-qscintilla.cc, main-window.cc, main-window.h, news-reader.cc, octave-dock-widget.cc, octave-dock-widget.h, qt-interpreter-events.cc, qt-interpreter-events.h, release-notes.cc, resource-manager.cc, resource-manager.h, set-path-dialog.cc, settings-dialog.cc, settings-dialog.h, shortcut-manager.cc, shortcut-manager.h, terminal-dock-widget.cc, terminal-dock-widget.h, variable-editor.cc, variable-editor.h, welcome-wizard.cc, workspace-model.cc, workspace-model.h, workspace-view.cc: Use local gui_settings objects instead of accessing a pointer to a single gui_settings object owned by the resource_manager object.
author John W. Eaton <jwe@octave.org>
date Fri, 02 Dec 2022 14:23:53 -0500
parents 04601f6c47f4
children 0645ea65ca6b
line wrap: on
line diff
--- a/libgui/src/history-dock-widget.cc	Fri Dec 02 15:51:44 2022 -0500
+++ b/libgui/src/history-dock-widget.cc	Fri Dec 02 14:23:53 2022 -0500
@@ -38,6 +38,7 @@
 #include "gui-preferences-cs.h"
 #include "gui-preferences-global.h"
 #include "gui-preferences-hw.h"
+#include "gui-settings.h"
 #include "history-dock-widget.h"
 #include "octave-qobject.h"
 
@@ -87,21 +88,17 @@
 
   void history_dock_widget::save_settings (void)
   {
-    resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
-    gui_settings *settings = rmgr.get_settings ();
+    gui_settings settings;
 
-    if (! settings)
-      return;
-
-    settings->setValue (hw_filter_active.key, m_filter_checkbox->isChecked ());
-    settings->setValue (hw_filter_shown.key, m_filter_shown);
+    settings.setValue (hw_filter_active.key, m_filter_checkbox->isChecked ());
+    settings.setValue (hw_filter_shown.key, m_filter_shown);
 
     QStringList mru;
     for (int i = 0; i < m_filter->count (); i++)
       mru.append (m_filter->itemText (i));
-    settings->setValue (hw_mru_list.key, mru);
+    settings.setValue (hw_mru_list.key, mru);
 
-    settings->sync ();
+    settings.sync ();
 
     octave_dock_widget::save_settings ();
   }
@@ -330,17 +327,15 @@
     widget ()->setLayout (hist_layout);
 
     // Init state of the filter
-    resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
-    gui_settings *settings = rmgr.get_settings ();
 
-    m_filter_shown
-      = settings->value (hw_filter_shown).toBool ();
+    gui_settings settings;
+
+    m_filter_shown = settings.value (hw_filter_shown).toBool ();
     m_filter_widget->setVisible (m_filter_shown);
 
-    m_filter->addItems (settings->value (hw_mru_list).toStringList ());
+    m_filter->addItems (settings.value (hw_mru_list).toStringList ());
 
-    bool filter_state
-      = settings->value (hw_filter_active).toBool ();
+    bool filter_state = settings.value (hw_filter_active).toBool ();
     m_filter_checkbox->setChecked (filter_state);
     filter_activate (filter_state);
 
@@ -359,15 +354,17 @@
     m_history_list_view->setTextElideMode (Qt::ElideRight);
   }
 
-  void history_dock_widget::notice_settings (const gui_settings *settings)
+  void history_dock_widget::notice_settings (void)
   {
+    gui_settings settings;
+
     QFont font = QFont ();
 
     font.setStyleHint (QFont::TypeWriter);
-    QString default_font = settings->value (global_mono_font).toString ();
+    QString default_font = settings.value (global_mono_font).toString ();
 
-    font.setFamily (settings->value (cs_font.key, default_font).toString ());
-    font.setPointSize (settings->value (cs_font_size).toInt ());
+    font.setFamily (settings.value (cs_font.key, default_font).toString ());
+    font.setPointSize (settings.value (cs_font_size).toInt ());
 
     m_history_list_view->setFont (font);
   }