Mercurial > octave

diff libgui/graphics/ButtonGroup.cc @ 27645:028205a91a07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate global access to Octave resources in qt graphics classes Provide reference to base_qobject to qt graphics classes to eliminate need for accessing it through a global variable. * qt-graphics-toolkit.h, qt-graphics-toolkit.cc (qt_graphics_toolkit::m_octave_qobj): New member variable. (qt_graphics_toolkit::qt_graphics_toolkit): Accept reference to base_qobject as argument. (qt_graphics_toolkit::create_object): Pass m_octave_qobj to create functions for individual graphics objects. * __init_qt__.cc (__init__): Temporarily access base_qobject by calling octave::base_qobject::the_octave_qobject. Pass it to qt_graphics_toolkit constructor. * BaseControl.h, BaseControl.cc, ButtonControl.h, ButtonControl.cc, ButtonGroup.h, ButtonGroup.cc, Canvas.h, Canvas.cc, CheckBoxControl.h, CheckBoxControl.cc, Container.h, Container.cc, ContextMenu.h, ContextMenu.cc, EditControl.h, EditControl.cc, Figure.h, Figure.cc, GLCanvas.h, GLCanvas.cc, ListBoxControl.h, ListBoxControl.cc, Menu.h, Menu.cc, Panel.h, Panel.cc, PopupMenuControl.h, PopupMenuControl.cc, PushButtonControl.h, PushButtonControl.cc, PushTool.h, PushTool.cc, RadioButtonControl.h, RadioButtonControl.cc, SliderControl.h, SliderControl.cc, Table.h, Table.cc, TextControl.h, TextControl.cc, ToggleButtonControl.h, ToggleButtonControl.cc, ToggleTool.h, ToggleTool.cc, ToolBar.h, ToolBar.cc, ToolBarButton.h, ToolBarButton.cc, annotation-dialog.h, annotation-dialog.cc: Accept reference to base_qobject in create function and constructors for graphics objects. Eliminate global access to GUI resources.
author John W. Eaton <jwe@octave.org>
date Tue, 05 Nov 2019 13:28:45 -0500
parents 50216d7a2f6b
children 2a506bc4a7af
line wrap: on
line diff
--- a/libgui/graphics/ButtonGroup.cc	Tue Nov 05 08:31:06 2019 -0500
+++ b/libgui/graphics/ButtonGroup.cc	Tue Nov 05 13:28:45 2019 -0500
@@ -42,6 +42,8 @@
 #include "QtHandlesUtils.h"
 #include "qt-graphics-toolkit.h"
 
+#include "octave-qobject.h"
+
 #include "interpreter-private.h"
 #include "ov-struct.h"
 
@@ -94,7 +96,8 @@
   }
 
   ButtonGroup*
-  ButtonGroup::create (const graphics_object& go)
+  ButtonGroup::create (octave::base_qobject& oct_qobj,
+                       const graphics_object& go)
   {
     Object *parent = Object::parentObject (go);
 
@@ -105,15 +108,17 @@
         if (container)
           {
             QFrame *frame = new QFrame (container);
-            return new ButtonGroup (go, new QButtonGroup (frame), frame);
+            return new ButtonGroup (oct_qobj, go, new QButtonGroup (frame),
+                                    frame);
           }
       }
 
     return nullptr;
   }
 
-  ButtonGroup::ButtonGroup (const graphics_object& go, QButtonGroup *buttongroup,
-                            QFrame *frame)
+  ButtonGroup::ButtonGroup (octave::base_qobject& oct_qobj,
+                            const graphics_object& go,
+                            QButtonGroup *buttongroup, QFrame *frame)
     : Object (go, frame), m_hiddenbutton(nullptr), m_container (nullptr),
       m_title (nullptr), m_blockUpdates (false)
   {
@@ -134,7 +139,7 @@
     m_hiddenbutton->hide ();
     m_buttongroup->addButton (m_hiddenbutton);
 
-    m_container = new Container (frame);
+    m_container = new Container (frame, oct_qobj);
     m_container->canvas (m_handle);
 
     connect (m_container, SIGNAL (interpeter_event (const fcn_callback&)),