Mercurial > octave

comparison libgui/graphics/ToggleTool.cc @ 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
29 29
30 #include "ToggleTool.h" 30 #include "ToggleTool.h"
31 31
32 #include "ToolBarButton.cc" 32 #include "ToolBarButton.cc"
33 33
34 #include "octave-qobject.h"
35
36 namespace octave 34 namespace octave
37 { 35 {
38 36
39 ToggleTool * 37 ToggleTool *
40 ToggleTool::create (octave::base_qobject& oct_qobj, 38 ToggleTool::create (octave::interpreter& interp, const graphics_object& go)
41 octave::interpreter& interp, const graphics_object& go)
42 { 39 {
43 Object *parent = parentObject (interp, go); 40 Object *parent = parentObject (interp, go);
44 41
45 if (parent) 42 if (parent)
46 { 43 {
47 QWidget *parentWidget = parent->qWidget<QWidget> (); 44 QWidget *parentWidget = parent->qWidget<QWidget> ();
48 45
49 if (parentWidget) 46 if (parentWidget)
50 return new ToggleTool (oct_qobj, interp, go, 47 return new ToggleTool (interp, go,
51 new QAction (parentWidget)); 48 new QAction (parentWidget));
52 } 49 }
53 50
54 return nullptr; 51 return nullptr;
55 } 52 }
56 53
57 ToggleTool::ToggleTool (octave::base_qobject& oct_qobj, 54 ToggleTool::ToggleTool (octave::interpreter& interp,
58 octave::interpreter& interp,
59 const graphics_object& go, QAction *action) 55 const graphics_object& go, QAction *action)
60 : ToolBarButton<uitoggletool> (oct_qobj, interp, go, action) 56 : ToolBarButton<uitoggletool> (interp, go, action)
61 { 57 {
62 uitoggletool::properties& tp = properties<uitoggletool> (); 58 uitoggletool::properties& tp = properties<uitoggletool> ();
63 59
64 action->setCheckable (true); 60 action->setCheckable (true);
65 action->setChecked (tp.is_state ()); 61 action->setChecked (tp.is_state ());