Mercurial > octave
diff libgui/graphics/ToggleTool.cc @ 27647:2a506bc4a7af
eliminate global access to Octave interpreter in qt graphics classes
Provide reference to interprerter to qt graphics classes to
eliminate need for accessing it through a global variable.
* qt-graphics-toolkit.cc (qt_graphics_toolkit::create_object): Pass
m_interpreter to create functions for individual graphics objects.
* 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, Object.h, Object.cc, Panel.h, Panel.cc, PopupMenuControl.h,
PopupMenuControl.cc, PushButtonControl.h, PushButtonControl.cc,
PushTool.h, PushTool.cc, QtHandlesUtils.h, 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:
Accept reference to interpreter in create function and constructors
for graphics objects. Eliminate global access to interpreter object
and graphics_handle manager.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 06 Nov 2019 12:42:12 -0500 |
parents | 028205a91a07 |
children | b442ec6dda5c |
line wrap: on
line diff
--- a/libgui/graphics/ToggleTool.cc Tue Nov 05 18:23:20 2019 -0500 +++ b/libgui/graphics/ToggleTool.cc Wed Nov 06 12:42:12 2019 -0500 @@ -34,24 +34,27 @@ { ToggleTool* - ToggleTool::create (octave::base_qobject& oct_qobj, const graphics_object& go) + ToggleTool::create (octave::base_qobject& oct_qobj, + octave::interpreter& interp, const graphics_object& go) { - Object *parent = Object::parentObject (go); + Object *parent = parentObject (interp, go); if (parent) { QWidget *parentWidget = parent->qWidget<QWidget> (); if (parentWidget) - return new ToggleTool (oct_qobj, go, new QAction (parentWidget)); + return new ToggleTool (oct_qobj, interp, go, + new QAction (parentWidget)); } return nullptr; } ToggleTool::ToggleTool (octave::base_qobject& oct_qobj, + octave::interpreter& interp, const graphics_object& go, QAction *action) - : ToolBarButton<uitoggletool> (oct_qobj, go, action) + : ToolBarButton<uitoggletool> (oct_qobj, interp, go, action) { uitoggletool::properties& tp = properties<uitoggletool> ();