Mercurial > octave
comparison libgui/src/m-editor/file-editor-tab.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 |
---|---|
34 #include <QLabel> | 34 #include <QLabel> |
35 #include <QStatusBar> | 35 #include <QStatusBar> |
36 #include <QWidget> | 36 #include <QWidget> |
37 #include <Qsci/qsciapis.h> | 37 #include <Qsci/qsciapis.h> |
38 | 38 |
39 #include "gui-settings.h" | |
40 #include "marker.h" | 39 #include "marker.h" |
41 #include "octave-qscintilla.h" | 40 #include "octave-qscintilla.h" |
42 #include "qt-interpreter-events.h" | 41 #include "qt-interpreter-events.h" |
43 | 42 |
44 class octave_value_list; | 43 class octave_value_list; |
136 void handle_copy_available (bool enableCopy); | 135 void handle_copy_available (bool enableCopy); |
137 void handle_margin_clicked (int line, int margin, | 136 void handle_margin_clicked (int line, int margin, |
138 Qt::KeyboardModifiers state); | 137 Qt::KeyboardModifiers state); |
139 | 138 |
140 // Tells the editor tab to react on changed settings. | 139 // Tells the editor tab to react on changed settings. |
141 void notice_settings (const gui_settings *settings, bool init = false); | 140 void notice_settings (bool init = false); |
142 | 141 |
143 // Change to a different editor tab by identifier tag. | 142 // Change to a different editor tab by identifier tag. |
144 void change_editor_state (const QWidget *ID); | 143 void change_editor_state (const QWidget *ID); |
145 | 144 |
146 void set_focus (const QWidget *ID); | 145 void set_focus (const QWidget *ID); |