Mercurial > octave

diff libgui/src/dw-main-window.h @ 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 b442ec6dda5c
line wrap: on
line diff
--- a/libgui/src/dw-main-window.h	Mon Nov 04 11:18:28 2019 -0500
+++ b/libgui/src/dw-main-window.h	Mon Nov 04 13:34:44 2019 -0500
@@ -29,7 +29,7 @@
 
 namespace octave
 {
-  class resource_manager;
+  class base_qobject;
 
   class dw_main_window : public QMainWindow
   {
@@ -37,7 +37,7 @@
 
   public:
 
-    dw_main_window (resource_manager& rmgr, QWidget *parent = nullptr);
+    dw_main_window (base_qobject& oct_qboj, QWidget *parent = nullptr);
 
     ~dw_main_window (void) = default;
 
@@ -73,7 +73,7 @@
     QAction *add_action (QMenu *menu, const QIcon& icon, const QString& text,
                          const char *member, QWidget *receiver);
 
-    resource_manager& m_resource_manager;
+    base_qobject& m_octave_qobj;
 
     QList<QDockWidget *> m_dw_list;