Mercurial > octave
comparison libgui/src/shortcut-manager.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 | ad014fc78bd6 |
children | 431f80aba37a |
comparison
equal
deleted
inserted
replaced
31638:474e184321d3 | 31639:ca7d58406f82 |
---|---|
40 #include <QMessageBox> | 40 #include <QMessageBox> |
41 #include <QPushButton> | 41 #include <QPushButton> |
42 #include <QVBoxLayout> | 42 #include <QVBoxLayout> |
43 #include <QtCore> | 43 #include <QtCore> |
44 | 44 |
45 #include "octave-qobject.h" | |
46 #include "shortcut-manager.h" | 45 #include "shortcut-manager.h" |
47 #include "gui-preferences-global.h" | 46 #include "gui-preferences-global.h" |
48 #include "gui-preferences-sc.h" | 47 #include "gui-preferences-sc.h" |
49 #include "gui-settings.h" | 48 #include "gui-settings.h" |
50 #include "error.h" | 49 #include "error.h" |
108 else | 107 else |
109 m_shift_modifier = false; // the shortcut has to be written as text | 108 m_shift_modifier = false; // the shortcut has to be written as text |
110 } | 109 } |
111 | 110 |
112 | 111 |
113 shortcut_manager::shortcut_manager (base_qobject& oct_qobj) | 112 shortcut_manager::shortcut_manager (void) |
114 : m_octave_qobj (oct_qobj) | |
115 { | 113 { |
116 setObjectName ("Shortcut_Manager"); | 114 setObjectName ("Shortcut_Manager"); |
117 | 115 |
118 // Mac: don't let Qt interpret CMD key ("Meta" in Qt terminology) as Ctrl | 116 // Mac: don't let Qt interpret CMD key ("Meta" in Qt terminology) as Ctrl |
119 #if defined (Q_OS_MAC) | 117 #if defined (Q_OS_MAC) |