Mercurial > octave

comparison libgui/graphics/ToolBar.h @ 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 00f796120a6d
children 2a506bc4a7af
comparison
equal deleted inserted replaced
27644:cca325162ed7 27645:028205a91a07
26 #include "Object.h" 26 #include "Object.h"
27 27
28 class QAction; 28 class QAction;
29 class QToolBar; 29 class QToolBar;
30 30
31 namespace octave
32 {
33 class base_qobject;
34 }
35
31 namespace QtHandles 36 namespace QtHandles
32 { 37 {
33 38
34 class Figure; 39 class Figure;
35 40
36 class ToolBar : public Object 41 class ToolBar : public Object
37 { 42 {
38 Q_OBJECT 43 Q_OBJECT
39 44
40 public: 45 public:
41 ToolBar (const graphics_object& go, QToolBar *bar); 46 ToolBar (octave::base_qobject& oct_qobj, const graphics_object& go,
47 QToolBar *bar);
42 ~ToolBar (void); 48 ~ToolBar (void);
43 49
44 static ToolBar * create (const graphics_object& go); 50 static ToolBar * create (octave::base_qobject& oct_qobj,
51 const graphics_object& go);
45 52
46 Container * innerContainer (void) { return nullptr; } 53 Container * innerContainer (void) { return nullptr; }
47 54
48 bool eventFilter (QObject *watched, QEvent *event); 55 bool eventFilter (QObject *watched, QEvent *event);
49 56