Mercurial > octave
comparison libgui/graphics/ToolBar.h @ 31639:ca7d58406f82
eliminate unnecessary uses of octave_qobject in GUI classes
* BaseControl.cc, BaseControl.h, ButtonControl.cc, ButtonControl.h,
ButtonGroup.cc, ButtonGroup.h, Canvas.cc, Canvas.h,
CheckBoxControl.cc, CheckBoxControl.h, Container.cc, Container.h,
ContextMenu.cc, ContextMenu.h, EditControl.cc, EditControl.h,
Figure.cc, Figure.h, GLCanvas.cc, GLCanvas.h, ListBoxControl.cc,
ListBoxControl.h, Menu.cc, Menu.h, Object.cc, Object.h, Panel.cc,
Panel.h, PopupMenuControl.cc, PopupMenuControl.h,
PushButtonControl.cc, PushButtonControl.h, PushTool.cc, PushTool.h,
RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc,
SliderControl.h, Table.cc, Table.h, TextControl.cc, TextControl.h,
ToggleButtonControl.cc, ToggleButtonControl.h, ToggleTool.cc,
ToggleTool.h, ToolBar.cc, ToolBar.h, ToolBarButton.cc,
ToolBarButton.h, annotation-dialog.cc, annotation-dialog.h,
qt-graphics-toolkit.cc, qt-graphics-toolkit.h, command-widget.h,
community-news.cc, community-news.h, documentation-bookmarks.cc,
documentation-bookmarks.h, documentation.cc,
external-editor-interface.cc, external-editor-interface.h,
find-files-dialog.cc, find-files-dialog.h, graphics-init.cc,
graphics-init.h, interpreter-qobject.cc, file-editor.cc,
find-dialog.cc, find-dialog.h, main-window.cc, main-window.h,
news-reader.cc, news-reader.h, octave-qobject.cc, release-notes.cc,
resource-manager.cc, set-path-dialog.cc, set-path-dialog.h,
shortcut-manager.cc, shortcut-manager.h, welcome-wizard.cc,
welcome-wizard.h, workspace-model.cc:
Don't store references to octave_qobject in GUI classes where it is
no longer needed. Eliminate unnecessary octave_qobject constructor
arguments. Change all uses.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sun, 04 Dec 2022 22:57:02 -0500 |
parents | 796f54d4ddbf |
children | bd9da634f00d |
comparison
equal
deleted
inserted
replaced
31638:474e184321d3 | 31639:ca7d58406f82 |
---|---|
31 class QAction; | 31 class QAction; |
32 class QToolBar; | 32 class QToolBar; |
33 | 33 |
34 namespace octave | 34 namespace octave |
35 { | 35 { |
36 class base_qobject; | |
37 class interpreter; | 36 class interpreter; |
38 } | 37 } |
39 | 38 |
40 namespace octave | 39 namespace octave |
41 { | 40 { |
45 class ToolBar : public Object | 44 class ToolBar : public Object |
46 { | 45 { |
47 Q_OBJECT | 46 Q_OBJECT |
48 | 47 |
49 public: | 48 public: |
50 ToolBar (octave::base_qobject& oct_qobj, octave::interpreter& interp, | 49 ToolBar (octave::interpreter& interp, |
51 const graphics_object& go, QToolBar *bar); | 50 const graphics_object& go, QToolBar *bar); |
52 ~ToolBar (void); | 51 ~ToolBar (void); |
53 | 52 |
54 static ToolBar * | 53 static ToolBar * |
55 create (octave::base_qobject& oct_qobj, octave::interpreter& interp, | 54 create (octave::interpreter& interp, |
56 const graphics_object& go); | 55 const graphics_object& go); |
57 | 56 |
58 Container * innerContainer (void) { return nullptr; } | 57 Container * innerContainer (void) { return nullptr; } |
59 | 58 |
60 bool eventFilter (QObject *watched, QEvent *event); | 59 bool eventFilter (QObject *watched, QEvent *event); |