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

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 3fcc650de22f
children 2a506bc4a7af
line wrap: on
line diff
--- a/libgui/graphics/ToolBar.cc	Tue Nov 05 08:31:06 2019 -0500
+++ b/libgui/graphics/ToolBar.cc	Tue Nov 05 13:28:45 2019 -0500
@@ -34,12 +34,13 @@
 #include <QTimer>
 #include <QToolBar>
 
-#include "gui-preferences-global.h"
-
 #include "Figure.h"
 #include "ToolBar.h"
 #include "QtHandlesUtils.h"
 
+#include "gui-preferences-global.h"
+#include "octave-qobject.h"
+
 namespace QtHandles
 {
   static QIcon makeEmptyIcon (void)
@@ -65,7 +66,7 @@
   }
 
   ToolBar*
-  ToolBar::create (const graphics_object& go)
+  ToolBar::create (octave::base_qobject& oct_qobj, const graphics_object& go)
   {
     Object *parent = Object::parentObject (go);
 
@@ -74,13 +75,14 @@
         QWidget *parentWidget = parent->qWidget<QWidget> ();
 
         if (parentWidget)
-          return new ToolBar (go, new QToolBar (parentWidget));
+          return new ToolBar (oct_qobj, go, new QToolBar (parentWidget));
       }
 
     return nullptr;
   }
 
-  ToolBar::ToolBar (const graphics_object& go, QToolBar *bar)
+  ToolBar::ToolBar (octave::base_qobject&, const graphics_object& go,
+                    QToolBar *bar)
     : Object (go, bar), m_empty (nullptr), m_figure (nullptr)
   {
     uitoolbar::properties& tp = properties<uitoolbar> ();