Mercurial > octave
comparison libgui/src/qt-interpreter-events.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 | 9c0099048264 |
| children | 431f80aba37a |
comparison
equal
deleted
inserted
replaced
| 31618:cd833a9baaa7 | 31619:ad014fc78bd6 |
|---|---|
| 34 #include <QObject> | 34 #include <QObject> |
| 35 #include <QString> | 35 #include <QString> |
| 36 #include <QWaitCondition> | 36 #include <QWaitCondition> |
| 37 | 37 |
| 38 #include "dialog.h" | 38 #include "dialog.h" |
| 39 #include "gui-settings.h" | |
| 40 | 39 |
| 41 #include "event-manager.h" | 40 #include "event-manager.h" |
| 42 | 41 |
| 43 // Defined for purposes of sending QList<int> as part of signal. | 42 // Defined for purposes of sending QList<int> as part of signal. |
| 44 typedef QList<int> QIntList; | 43 typedef QList<int> QIntList; |
| 301 | 300 |
| 302 void confirm_shutdown_signal (void); | 301 void confirm_shutdown_signal (void); |
| 303 | 302 |
| 304 void get_named_icon_signal (const QString& name); | 303 void get_named_icon_signal (const QString& name); |
| 305 | 304 |
| 306 void settings_changed (const gui_settings *, bool); | 305 void settings_changed (bool); |
| 307 | 306 |
| 308 void apply_new_settings (void); | 307 void apply_new_settings (void); |
| 309 | 308 |
| 310 private: | 309 private: |
| 311 | 310 |