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.

--- a/libgui/src/m-editor/file-editor.h	Mon Nov 04 11:18:28 2019 -0500
+++ b/libgui/src/m-editor/file-editor.h	Mon Nov 04 13:34:44 2019 -0500
@@ -41,6 +41,8 @@
 
 namespace octave
 {
+  class base_qobject;
+
   // subclassed QTabWidget for using custom tabbar
 
   class file_editor_tab_widget : public QTabWidget
@@ -88,7 +90,7 @@
       }
     };
 
-    file_editor (QWidget *p, resource_manager& rmgr);
+    file_editor (QWidget *p, base_qobject& oct_qobj);
 
     ~file_editor (void);