diff libgui/graphics/PopupMenuControl.cc @ 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 431f80aba37a
line wrap: on
line diff
--- a/libgui/graphics/PopupMenuControl.cc	Sun Dec 04 22:56:23 2022 -0500
+++ b/libgui/graphics/PopupMenuControl.cc	Sun Dec 04 22:57:02 2022 -0500
@@ -33,15 +33,13 @@
 #include "PopupMenuControl.h"
 #include "QtHandlesUtils.h"
 
-#include "octave-qobject.h"
 #include "octave-qtutils.h"
 
 namespace octave
 {
 
   PopupMenuControl *
-  PopupMenuControl::create (octave::base_qobject& oct_qobj,
-                            octave::interpreter& interp,
+  PopupMenuControl::create (octave::interpreter& interp,
                             const graphics_object& go)
   {
     Object *parent = parentObject (interp, go);
@@ -51,18 +49,17 @@
         Container *container = parent->innerContainer ();
 
         if (container)
-          return new PopupMenuControl (oct_qobj, interp, go,
+          return new PopupMenuControl (interp, go,
                                        new QComboBox (container));
       }
 
     return nullptr;
   }
 
-  PopupMenuControl::PopupMenuControl (octave::base_qobject& oct_qobj,
-                                      octave::interpreter& interp,
+  PopupMenuControl::PopupMenuControl (octave::interpreter& interp,
                                       const graphics_object& go,
                                       QComboBox *box)
-    : BaseControl (oct_qobj, interp, go, box), m_blockUpdate (false)
+    : BaseControl (interp, go, box), m_blockUpdate (false)
   {
     uicontrol::properties& up = properties<uicontrol> ();