Mercurial > octave

diff libgui/src/qt-interpreter-events.cc @ 27629:8b6e928e0705

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
in GUI objects, store reference to base_qobject instead of resource_manager We'll need access to both the resource_manager and the shortcut_manager in many objects. The shortcut_manager will be moved to be a member of the base_qobject class instead of being a singleton, so this change will make it easier to access both of these as well as any other core GUI properties in any of the Octave-specific widgets that make up the GUI. Once again, may files are affecte but the changes are straightforward: store a reference to the base_qobject object and access the resource_manager object from that instead of storing a reference to the resource_manager directly.
author John W. Eaton <jwe@octave.org>
date Mon, 04 Nov 2019 13:34:44 -0500
parents 45bb5bbaf291
children 337132e66ec2
line wrap: on
line diff
--- a/libgui/src/qt-interpreter-events.cc	Mon Nov 04 11:18:28 2019 -0500
+++ b/libgui/src/qt-interpreter-events.cc	Mon Nov 04 13:34:44 2019 -0500
@@ -37,7 +37,6 @@
 #include "gui-preferences-ed.h"
 #include "octave-qobject.h"
 #include "qt-interpreter-events.h"
-#include "resource-manager.h"
 
 #include "oct-env.h"
 #include "str-vec.h"
@@ -105,7 +104,6 @@
 
   qt_interpreter_events::qt_interpreter_events (base_qobject& oct_qobj)
     : interpreter_events (), m_octave_qobj (oct_qobj),
-      m_resource_manager (m_octave_qobj.get_resource_manager ()),
       m_result (), m_mutex (), m_waitcondition (), m_uiwidget_creator ()
   {
     qRegisterMetaType<QIntList> ("QIntList");
@@ -275,7 +273,8 @@
 
   bool qt_interpreter_events::prompt_new_edit_file (const std::string& file)
   {
-    gui_settings *settings = m_resource_manager.get_settings ();
+    resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
+    gui_settings *settings = rmgr.get_settings ();
 
     if (! settings || settings->value ("editor/create_new_file",false).toBool ())
       return true;
@@ -389,7 +388,8 @@
   {
     QMutexLocker autolock (&m_mutex);
 
-    m_result = QVariant::fromValue (m_resource_manager.icon (name));
+    resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
+    m_result = QVariant::fromValue (rmgr.icon (name));
 
     wake_all ();
   }
@@ -578,7 +578,8 @@
   {
     QMutexLocker autolock (&m_mutex);
 
-    gui_settings *settings = m_resource_manager.get_settings ();
+    resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
+    gui_settings *settings = rmgr.get_settings ();
 
     QString read_value = settings->value (key).toString ();
 
@@ -617,7 +618,8 @@
         adjusted_value = adjusted_value.toUpper ();
 
         QStringList codecs;
-        m_resource_manager.get_codecs (&codecs);
+        resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
+        rmgr.get_codecs (&codecs);
 
         QRegExp re ("^CP(\\d+)$");