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.

--- a/libgui/graphics/Canvas.cc	Tue Nov 05 08:31:06 2019 -0500
+++ b/libgui/graphics/Canvas.cc	Tue Nov 05 13:28:45 2019 -0500
@@ -72,11 +72,10 @@
     m_redrawBlocked = block;
   }
 
-  static QCursor
-  make_cursor (const QString& name, int hot_x  = -1, int hot_y = -1)
+  QCursor
+  Canvas::make_cursor (const QString& name, int hot_x, int hot_y)
   {
-    octave::resource_manager& rmgr
-      = octave::__get_resource_manager__ ("make_cursor");
+    octave::resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
 
     QIcon icon = rmgr.icon (name);
 
@@ -873,7 +872,7 @@
 
                 octave_value_list props = ovl ("textbox", bb);
 
-                annotation_dialog anno_dlg (w, props);
+                annotation_dialog anno_dlg (m_octave_qobj, w, props);
 
                 if (anno_dlg.exec () == QDialog::Accepted)
                   {
@@ -1077,11 +1076,12 @@
   }
 
   Canvas*
-  Canvas::create (const std::string& /* name */, QWidget *parent,
-                  const graphics_handle& handle)
+  Canvas::create (octave::base_qobject& oct_qobj,
+                  const graphics_handle& handle, QWidget *parent,
+                  const std::string& /* name */)
   {
     // Only OpenGL
-    return new GLCanvas (parent, handle);
+    return new GLCanvas (oct_qobj, handle, parent);
   }
 
 }