Mercurial > octave

comparison libgui/graphics/Container.h @ 31639:ca7d58406f82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 431f80aba37a
comparison
equal deleted inserted replaced
31638:474e184321d3 31639:ca7d58406f82
33 #include "event-manager.h" 33 #include "event-manager.h"
34 #include "graphics.h" 34 #include "graphics.h"
35 35
36 namespace octave 36 namespace octave
37 { 37 {
38 class base_qobject;
39 }
40
41 namespace octave
42 {
43 38
44 DECLARE_GENERICEVENTNOTIFY_SENDER(ContainerBase, QWidget); 39 DECLARE_GENERICEVENTNOTIFY_SENDER(ContainerBase, QWidget);
45 40
46 class Canvas; 41 class Canvas;
47 42
48 class Container : public ContainerBase 43 class Container : public ContainerBase
49 { 44 {
50 Q_OBJECT 45 Q_OBJECT
51 46
52 public: 47 public:
53 Container (QWidget *parent, octave::base_qobject& oct_qobj, 48 Container (QWidget *parent, octave::interpreter& interp);
54 octave::interpreter& interp);
55 ~Container (void); 49 ~Container (void);
56 50
57 Canvas * canvas (const graphics_handle& handle, bool create = true); 51 Canvas * canvas (const graphics_handle& handle, bool create = true);
58 52
59 signals: 53 signals:
79 protected: 73 protected:
80 void childEvent (QChildEvent *event); 74 void childEvent (QChildEvent *event);
81 void resizeEvent (QResizeEvent *event); 75 void resizeEvent (QResizeEvent *event);
82 76
83 private: 77 private:
84 octave::base_qobject& m_octave_qobj;
85 octave::interpreter& m_interpreter; 78 octave::interpreter& m_interpreter;
86 Canvas *m_canvas; 79 Canvas *m_canvas;
87 }; 80 };
88 81
89 } 82 }