Mercurial > octave

diff libgui/src/m-editor/octave-qscintilla.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 38b954c0c0c1
children 431f80aba37a
line wrap: on
line diff
--- a/libgui/src/m-editor/octave-qscintilla.cc	Fri Dec 02 15:51:44 2022 -0500
+++ b/libgui/src/m-editor/octave-qscintilla.cc	Fri Dec 02 14:23:53 2022 -0500
@@ -54,6 +54,7 @@
 
 #include "file-editor-tab.h"
 #include "gui-preferences-ed.h"
+#include "gui-settings.h"
 // FIXME: hardwired marker numbers?
 #include "marker.h"
 #include "octave-qobject.h"
@@ -430,20 +431,20 @@
       case SCLEX_MATLAB:
 #endif
         {
-          resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
-          gui_settings *settings = rmgr.get_settings ();
+          gui_settings settings;
+
           int comment_string;
 
           if (comment)
             {
               // The commenting string is requested
-              if (settings->contains (ed_comment_str.key))
+              if (settings.contains (ed_comment_str.key))
                 // new version (radio buttons)
-                comment_string = settings->value (ed_comment_str).toInt ();
+                comment_string = settings.value (ed_comment_str).toInt ();
               else
                 // old version (combo box)
-                comment_string = settings->value (ed_comment_str_old.key,
-                                                  ed_comment_str.def).toInt ();
+                comment_string = settings.value (ed_comment_str_old.key,
+                                                 ed_comment_str.def).toInt ();
 
               return (QStringList (ed_comment_strings.at (comment_string)));
             }
@@ -452,7 +453,7 @@
               QStringList c_str;
 
               // The possible uncommenting string(s) are requested
-              comment_string = settings->value (ed_uncomment_str).toInt ();
+              comment_string = settings.value (ed_uncomment_str).toInt ();
 
               for (int i = 0; i < ed_comment_strings_count; i++)
                 {
@@ -908,9 +909,10 @@
         });
 
     // Disable opening a file at a breakpoint in case keyboard () is used
-    gui_settings *settings = rmgr.get_settings ();
-    bool show_dbg_file = settings->value (ed_show_dbg_file).toBool ();
-    settings->setValue (ed_show_dbg_file.key, false);
+    gui_settings settings;
+
+  bool show_dbg_file = settings.value (ed_show_dbg_file).toBool ();
+    settings.setValue (ed_show_dbg_file.key, false);
 
     // Let the interpreter execute the tmp file
     emit interpreter_event
@@ -1035,8 +1037,10 @@
     //       possible lines from commands at a debug prompt must be
     //       taken into consideration.
     resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
-    gui_settings *settings = rmgr.get_settings ();
-    settings->setValue (ed_show_dbg_file.key, show_dbg_file);
+    gui_settings settings;
+
+    settings.setValue (ed_show_dbg_file.key, show_dbg_file);
+
     rmgr.remove_tmp_file (tmp_file);
     rmgr.remove_tmp_file (tmp_hist);