Mercurial > octave
comparison libgui/src/m-editor/file-editor.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 |
---|---|
122 SELECTALL_ACTION | 122 SELECTALL_ACTION |
123 }; | 123 }; |
124 | 124 |
125 void check_actions (void); | 125 void check_actions (void); |
126 void empty_script (bool startup, bool visible); | 126 void empty_script (bool startup, bool visible); |
127 void restore_session (gui_settings *settings); | 127 void restore_session (void); |
128 | 128 |
129 signals: | 129 signals: |
130 | 130 |
131 void fetab_settings_changed (const gui_settings *settings); | 131 void fetab_settings_changed (void); |
132 void fetab_change_request (const QWidget *ID); | 132 void fetab_change_request (const QWidget *ID); |
133 // Save is a ping-pong type of communication | 133 // Save is a ping-pong type of communication |
134 void fetab_save_file (const QWidget *ID, const QString& fileName, | 134 void fetab_save_file (const QWidget *ID, const QString& fileName, |
135 bool remove_on_success); | 135 bool remove_on_success); |
136 // No fetab_open, functionality in editor | 136 // No fetab_open, functionality in editor |
285 | 285 |
286 void handle_file_remove (const QString&, const QString&); | 286 void handle_file_remove (const QString&, const QString&); |
287 void handle_file_renamed (bool load_new = true); | 287 void handle_file_renamed (bool load_new = true); |
288 | 288 |
289 // Tells the editor to react on changed settings. | 289 // Tells the editor to react on changed settings. |
290 void notice_settings (const gui_settings *settings); | 290 void notice_settings (void); |
291 | 291 |
292 void set_shortcuts (void); | 292 void set_shortcuts (void); |
293 | 293 |
294 void handle_visibility (bool visible); | 294 void handle_visibility (bool visible); |
295 | 295 |