Mercurial > octave

diff libgui/src/octave-dock-widget.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 465ac679e976
line wrap: on
line diff
--- a/libgui/src/octave-dock-widget.h	Mon Nov 04 11:18:28 2019 -0500
+++ b/libgui/src/octave-dock-widget.h	Mon Nov 04 13:34:44 2019 -0500
@@ -34,7 +34,7 @@
 
 namespace octave
 {
-  class resource_manager;
+  class base_qobject;
 
   // The few decoration items common to both main window and variable editor.
 
@@ -44,7 +44,7 @@
 
   public:
 
-    label_dock_widget (QWidget *p, resource_manager& rmgr);
+    label_dock_widget (QWidget *p, base_qobject& oct_qobj);
 
     // set_title() uses the custom title bar while setWindowTitle() uses
     // the default title bar (with style sheets)
@@ -65,7 +65,7 @@
 
   protected:
 
-    resource_manager& m_resource_manager;
+    base_qobject& m_octave_qobj;
 
     int m_icon_size;
     QWidget *m_title_widget;
@@ -85,7 +85,7 @@
   public:
 
     octave_dock_widget (const QString& obj_name, QWidget *p,
-                        resource_manager& rmgr);
+                        base_qobject& oct_qobj);
 
     virtual ~octave_dock_widget (void) = default;