Mercurial > octave
diff libgui/src/terminal-dock-widget.cc @ 27620:45bb5bbaf291
don't use singleton pattern for resource manager in GUI
Move ownership of the resource_manager object to the base_qobject
class. Store reference to resource_manager object as a member
variable in most objects that need to access it. Eliminate static
member functions in resource_managar class. Provide a
get_resource_manager method in the base_qboject class and a
global __get_resource_manager__ function for those instances where we
can't easily provide local access to the resource_manager object.
There are many changes to many files, but most are straightforward.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 01 Nov 2019 18:16:49 -0400 |
| parents | 0495b64288f7 |
| children | 8b6e928e0705 |
line wrap: on
line diff
--- a/libgui/src/terminal-dock-widget.cc Sat Nov 02 15:24:14 2019 -0400 +++ b/libgui/src/terminal-dock-widget.cc Fri Nov 01 18:16:49 2019 -0400 @@ -39,8 +39,9 @@ namespace octave { - terminal_dock_widget::terminal_dock_widget (QWidget *p) - : octave_dock_widget ("TerminalDockWidget", p), + terminal_dock_widget::terminal_dock_widget (QWidget *p, + resource_manager& rmgr) + : octave_dock_widget ("TerminalDockWidget", p, rmgr), m_terminal (QTerminal::create (p)) { m_terminal->setObjectName ("OctaveTerminal"); @@ -61,7 +62,7 @@ // Chose a reasonable size at startup in order to avoid truncated // startup messages - gui_settings *settings = resource_manager::get_settings (); + gui_settings *settings = m_resource_manager.get_settings (); QFont font = QFont (); font.setStyleHint (QFont::TypeWriter);