Mercurial > octave

comparison libgui/graphics/Table.h @ 27647:2a506bc4a7af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
27646:2ff12b707f60 27647:2a506bc4a7af
30 class QTableWidgetItem; 30 class QTableWidgetItem;
31 31
32 namespace octave 32 namespace octave
33 { 33 {
34 class base_qobject; 34 class base_qobject;
35 class interpreter;
35 } 36 }
36 37
37 namespace QtHandles 38 namespace QtHandles
38 { 39 {
39 40
42 class Table : public Object 43 class Table : public Object
43 { 44 {
44 Q_OBJECT 45 Q_OBJECT
45 46
46 public: 47 public:
47 Table (octave::base_qobject& oct_qobj, const graphics_object& go, 48 Table (octave::base_qobject& oct_qobj, octave::interpreter& interp,
48 QTableWidget* tableWidget); 49 const graphics_object& go, QTableWidget* tableWidget);
49 ~Table (void); 50 ~Table (void);
50 51
51 Container* innerContainer (void) { return m_container; } 52 Container* innerContainer (void) { return m_container; }
52 53
53 bool eventFilter (QObject* watched, QEvent* event); 54 bool eventFilter (QObject* watched, QEvent* event);
54 55
55 static Table* create (octave::base_qobject& oct_qobj, 56 static Table *
56 const graphics_object& go); 57 create (octave::base_qobject& oct_qobj, octave::interpreter& interp,
58 const graphics_object& go);
57 59
58 protected: 60 protected:
59 void update (int pId); 61 void update (int pId);
60 void redraw (void); 62 void redraw (void);
61 void updateColumnname (void); 63 void updateColumnname (void);