Mercurial > octave

comparison libgui/src/dw-main-window.h @ 31619:ad014fc78bd6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 796f54d4ddbf
children 431f80aba37a
comparison
equal deleted inserted replaced
31618:cd833a9baaa7 31619:ad014fc78bd6
26 #if ! defined (octave_dw_main_window_h) 26 #if ! defined (octave_dw_main_window_h)
27 #define octave_dw_main_window_h 1 27 #define octave_dw_main_window_h 1
28 28
29 #include <QMainWindow> 29 #include <QMainWindow>
30 30
31 #include "gui-settings.h"
32
33 namespace octave 31 namespace octave
34 { 32 {
35 class base_qobject; 33 class base_qobject;
36 34
37 class dw_main_window : public QMainWindow 35 class dw_main_window : public QMainWindow
50 48
51 dw_main_window& operator = (const dw_main_window&) = delete; 49 dw_main_window& operator = (const dw_main_window&) = delete;
52 50
53 public slots: 51 public slots:
54 52
55 void notice_settings (const gui_settings *); 53 void notice_settings (void);
56 54
57 protected slots: 55 protected slots:
58 56
59 virtual QMenu * createPopupMenu (); 57 virtual QMenu * createPopupMenu ();
60 58