comparison libgui/src/m-editor/file-editor-interface.h @ 31619:ad014fc78bd6

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 c6c4c6f04170
children 431f80aba37a
comparison
equal deleted inserted replaced
31618:cd833a9baaa7 31619:ad014fc78bd6
28 28
29 #include <QMenu> 29 #include <QMenu>
30 #include <QMenuBar> 30 #include <QMenuBar>
31 #include <QToolBar> 31 #include <QToolBar>
32 32
33 #include "gui-settings.h"
34 #include "octave-dock-widget.h" 33 #include "octave-dock-widget.h"
35 34
36 namespace octave 35 namespace octave
37 { 36 {
38 class base_qobject; 37 class base_qobject;
72 71
73 virtual bool check_closing (void) = 0; 72 virtual bool check_closing (void) = 0;
74 73
75 virtual void empty_script (bool, bool) = 0; 74 virtual void empty_script (bool, bool) = 0;
76 75
77 virtual void restore_session (gui_settings *) = 0; 76 virtual void restore_session (void) = 0;
78 77
79 virtual void enable_menu_shortcuts (bool enable) = 0; 78 virtual void enable_menu_shortcuts (bool enable) = 0;
80 79
81 signals: 80 signals:
82 81