Mercurial > octave
comparison libgui/qterminal/libqterminal/QTerminal.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 | 5154c91e0d98 |
| children | dd904ce6f53f |
comparison
equal
deleted
inserted
replaced
| 31618:cd833a9baaa7 | 31619:ad014fc78bd6 |
|---|---|
| 27 #include <QColor> | 27 #include <QColor> |
| 28 #include <QList> | 28 #include <QList> |
| 29 #include <QPoint> | 29 #include <QPoint> |
| 30 #include <QString> | 30 #include <QString> |
| 31 #include <QWidget> | 31 #include <QWidget> |
| 32 | |
| 33 // For now, we need to use the following #include and using statement | |
| 34 // for the signal/slot macros. Could maybe change later when using | |
| 35 // Qt5-style signal/slot connections. | |
| 36 #include "gui-settings.h" | |
| 37 | |
| 38 using octave::gui_settings; | |
| 39 | 32 |
| 40 namespace octave | 33 namespace octave |
| 41 { | 34 { |
| 42 class base_qobject; | 35 class base_qobject; |
| 43 } | 36 } |
| 124 | 117 |
| 125 virtual void selectAll (void) = 0; | 118 virtual void selectAll (void) = 0; |
| 126 | 119 |
| 127 virtual void handleCustomContextMenuRequested (const QPoint& at); | 120 virtual void handleCustomContextMenuRequested (const QPoint& at); |
| 128 | 121 |
| 129 void notice_settings (const gui_settings *settings); | 122 void notice_settings (void); |
| 130 | 123 |
| 131 virtual void init_terminal_size (void) { } | 124 virtual void init_terminal_size (void) { } |
| 132 | 125 |
| 133 void terminal_interrupt (void) { emit interrupt_signal (); } | 126 void terminal_interrupt (void) { emit interrupt_signal (); } |
| 134 | 127 |