Mercurial > octave

comparison libgui/graphics/SliderControl.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
31 31
32 #include "Container.h" 32 #include "Container.h"
33 #include "SliderControl.h" 33 #include "SliderControl.h"
34 #include "QtHandlesUtils.h" 34 #include "QtHandlesUtils.h"
35 35
36 #include "octave-qobject.h"
37
38 #include "graphics.h" 36 #include "graphics.h"
39 #include "interpreter.h" 37 #include "interpreter.h"
40 38
41 #define RANGE_INT_MAX 1000000 39 #define RANGE_INT_MAX 1000000
42 40
43 namespace octave 41 namespace octave
44 { 42 {
45 43
46 SliderControl * 44 SliderControl *
47 SliderControl::create (octave::base_qobject& oct_qobj, 45 SliderControl::create (octave::interpreter& interp,
48 octave::interpreter& interp,
49 const graphics_object& go) 46 const graphics_object& go)
50 { 47 {
51 Object *parent = parentObject (interp, go); 48 Object *parent = parentObject (interp, go);
52 49
53 if (parent) 50 if (parent)
54 { 51 {
55 Container *container = parent->innerContainer (); 52 Container *container = parent->innerContainer ();
56 53
57 if (container) 54 if (container)
58 return new SliderControl (oct_qobj, interp, go, 55 return new SliderControl (interp, go,
59 new QScrollBar (container)); 56 new QScrollBar (container));
60 } 57 }
61 58
62 return nullptr; 59 return nullptr;
63 } 60 }
64 61
65 SliderControl::SliderControl (octave::base_qobject& oct_qobj, 62 SliderControl::SliderControl (octave::interpreter& interp,
66 octave::interpreter& interp,
67 const graphics_object& go, 63 const graphics_object& go,
68 QAbstractSlider *slider) 64 QAbstractSlider *slider)
69 : BaseControl (oct_qobj, interp, go, slider), m_blockUpdates (false) 65 : BaseControl (interp, go, slider), m_blockUpdates (false)
70 { 66 {
71 uicontrol::properties& up = properties<uicontrol> (); 67 uicontrol::properties& up = properties<uicontrol> ();
72 68
73 slider->setTracking (false); 69 slider->setTracking (false);
74 Matrix bb = up.get_boundingbox (); 70 Matrix bb = up.get_boundingbox ();