Mercurial > octave
changeset 31701:286306a9a393
eliminate base_qobject from octave_dock_widget and other classes
* octave-dock-widget.h, octave-dock-widget.cc
(octave_dock_widget::m_octave_qobj): Delete data member.
(octave_dock_widget::octave_dock_widget): Delete base_qobject
construtor argument. Change all uses.
* documentation-dock-widget.h, documentation-dock-widget.cc
(documentation_dock_widget::documentation_dock_widget):
Delete base_qobject construtor argument. Change all uses.
* files-dock-widget.h, files-dock-widget.cc
(files_dock_widget::files_dock_widget):
Delete base_qobject construtor argument. Change all uses.
* history-dock-widget.h, history-dock-widget.cc
(history_dock_widget::history_dock_widget):
Delete base_qobject construtor argument. Change all uses.
* file-editor-interface.h
(file_editor_interface::file_editor_interface):
Delete base_qobject construtor argument. Change all uses.
* file-editor-tab.h, file-editor-tab.cc
(file_editor_tab::file_editor_tab):
Delete base_qobject construtor argument. Change all uses.
* file-editor.h, file-editor.cc (file_editor::file_editor):
Delete base_qobject construtor argument. Change all uses.
* octave-qscintilla.h, octave-qscintilla.cc
(octave_qscintilla::octave_qscintilla):
Delete base_qobject construtor argument. Change all uses.
* terminal-dock-widget.h, terminal-dock-widget.cc
(terminal_dock_widget::terminal_dock_widget): Pass bool to control use
of experimental terminal widget instead of base_qobject. Change all uses.
* variable-editor.h, variable-editor.cc
(variable_editor::variable_editor):
Delete base_qobject construtor argument. Change all uses.
* workspace-view.h, workspace-view.cc
(workspace_view::workspace_view):
Delete base_qobject construtor argument. Change all uses.
line wrap: on
line diff
--- a/libgui/src/documentation-dock-widget.cc Mon Jan 02 12:27:33 2023 -0500 +++ b/libgui/src/documentation-dock-widget.cc Mon Jan 02 12:38:44 2023 -0500 @@ -33,9 +33,8 @@ OCTAVE_BEGIN_NAMESPACE(octave) - documentation_dock_widget::documentation_dock_widget (QWidget *p, - base_qobject& oct_qobj) - : octave_dock_widget ("DocumentationDockWidget", p, oct_qobj), + documentation_dock_widget::documentation_dock_widget (QWidget *p) + : octave_dock_widget ("DocumentationDockWidget", p), m_docs (new documentation (this)) { set_title (tr ("Documentation"));
--- a/libgui/src/documentation-dock-widget.h Mon Jan 02 12:27:33 2023 -0500 +++ b/libgui/src/documentation-dock-widget.h Mon Jan 02 12:38:44 2023 -0500 @@ -31,15 +31,13 @@ OCTAVE_BEGIN_NAMESPACE(octave) - class base_qobject; - class documentation_dock_widget : public octave_dock_widget { Q_OBJECT public: - documentation_dock_widget (QWidget *parent, base_qobject& oct_qobj); + documentation_dock_widget (QWidget *parent); ~documentation_dock_widget (void) = default;
--- a/libgui/src/files-dock-widget.cc Mon Jan 02 12:27:33 2023 -0500 +++ b/libgui/src/files-dock-widget.cc Mon Jan 02 12:38:44 2023 -0500 @@ -178,8 +178,8 @@ } }; - files_dock_widget::files_dock_widget (QWidget *p, base_qobject& oct_qobj) - : octave_dock_widget ("FilesDockWidget", p, oct_qobj) + files_dock_widget::files_dock_widget (QWidget *p) + : octave_dock_widget ("FilesDockWidget", p) { set_title (tr ("File Browser")); setToolTip (tr ("Browse your files"));
--- a/libgui/src/files-dock-widget.h Mon Jan 02 12:27:33 2023 -0500 +++ b/libgui/src/files-dock-widget.h Mon Jan 02 12:38:44 2023 -0500 @@ -46,8 +46,6 @@ OCTAVE_BEGIN_NAMESPACE(octave) - class base_qobject; - //! Dock widget to display files in the current directory. class files_dock_widget : public octave_dock_widget @@ -56,7 +54,7 @@ public: - files_dock_widget (QWidget *parent, base_qobject& oct_qobj); + files_dock_widget (QWidget *parent); ~files_dock_widget (void) = default;
--- a/libgui/src/graphics-init.cc Mon Jan 02 12:27:33 2023 -0500 +++ b/libgui/src/graphics-init.cc Mon Jan 02 12:38:44 2023 -0500 @@ -70,7 +70,6 @@ #else octave_unused_parameter (interp); - octave_unused_parameter (oct_qobj); #endif }
--- a/libgui/src/history-dock-widget.cc Mon Jan 02 12:27:33 2023 -0500 +++ b/libgui/src/history-dock-widget.cc Mon Jan 02 12:38:44 2023 -0500 @@ -47,8 +47,8 @@ OCTAVE_BEGIN_NAMESPACE(octave) - history_dock_widget::history_dock_widget (QWidget *p, base_qobject& oct_qobj) - : octave_dock_widget ("HistoryDockWidget", p, oct_qobj) + history_dock_widget::history_dock_widget (QWidget *p) + : octave_dock_widget ("HistoryDockWidget", p) { setStatusTip (tr ("Browse and search the command history."));
--- a/libgui/src/history-dock-widget.h Mon Jan 02 12:27:33 2023 -0500 +++ b/libgui/src/history-dock-widget.h Mon Jan 02 12:38:44 2023 -0500 @@ -37,15 +37,13 @@ OCTAVE_BEGIN_NAMESPACE(octave) - class base_qobject; - class history_dock_widget : public octave_dock_widget { Q_OBJECT public: - history_dock_widget (QWidget *parent, base_qobject& oct_qobj); + history_dock_widget (QWidget *parent); ~history_dock_widget (void) = default;
--- a/libgui/src/m-editor/file-editor-interface.h Mon Jan 02 12:27:33 2023 -0500 +++ b/libgui/src/m-editor/file-editor-interface.h Mon Jan 02 12:38:44 2023 -0500 @@ -34,16 +34,14 @@ OCTAVE_BEGIN_NAMESPACE(octave) - class base_qobject; - class file_editor_interface : public octave_dock_widget { Q_OBJECT public: - file_editor_interface (QWidget *p, base_qobject& oct_qobj) - : octave_dock_widget ("FileEditor", p, oct_qobj) + file_editor_interface (QWidget *p) + : octave_dock_widget ("FileEditor", p) { } virtual ~file_editor_interface (void) = default;
--- a/libgui/src/m-editor/file-editor-tab.cc Mon Jan 02 12:27:33 2023 -0500 +++ b/libgui/src/m-editor/file-editor-tab.cc Mon Jan 02 12:38:44 2023 -0500 @@ -104,8 +104,7 @@ // Make parent null for the file editor tab so that warning WindowModal // messages don't affect grandparents. - file_editor_tab::file_editor_tab (base_qobject& oct_qobj, - const QString& directory_arg) + file_editor_tab::file_editor_tab (const QString& directory_arg) { m_lexer_apis = nullptr; m_is_octave_file = true; @@ -117,7 +116,7 @@ m_file_name = ""; m_file_system_watcher.setObjectName ("_qt_autotest_force_engine_poller"); - m_edit_area = new octave_qscintilla (this, oct_qobj); + m_edit_area = new octave_qscintilla (this); m_line = 0; m_col = 0;
--- a/libgui/src/m-editor/file-editor-tab.h Mon Jan 02 12:27:33 2023 -0500 +++ b/libgui/src/m-editor/file-editor-tab.h Mon Jan 02 12:38:44 2023 -0500 @@ -44,7 +44,6 @@ OCTAVE_BEGIN_NAMESPACE(octave) - class base_qobject; class file_editor; class file_editor_tab : public QWidget @@ -53,7 +52,7 @@ public: - file_editor_tab (base_qobject& oct_qobj, const QString& directory = ""); + file_editor_tab (const QString& directory = ""); ~file_editor_tab (void);
--- a/libgui/src/m-editor/file-editor.cc Mon Jan 02 12:27:33 2023 -0500 +++ b/libgui/src/m-editor/file-editor.cc Mon Jan 02 12:38:44 2023 -0500 @@ -97,8 +97,8 @@ // File editor - file_editor::file_editor (QWidget *p, base_qobject& oct_qobj) - : file_editor_interface (p, oct_qobj) + file_editor::file_editor (QWidget *p) + : file_editor_interface (p) { // Set current editing directory before construction because loaded // files will change ced accordingly. @@ -2441,7 +2441,7 @@ file_editor_tab * file_editor::make_file_editor_tab (const QString& directory) { - file_editor_tab *f = new file_editor_tab (m_octave_qobj, directory); + file_editor_tab *f = new file_editor_tab (directory); // signals from the qscintilla edit area connect (f->qsci_edit_area (), &octave_qscintilla::show_symbol_tooltip_signal,
--- a/libgui/src/m-editor/file-editor.h Mon Jan 02 12:27:33 2023 -0500 +++ b/libgui/src/m-editor/file-editor.h Mon Jan 02 12:38:44 2023 -0500 @@ -96,7 +96,7 @@ QString new_file_name; }; - file_editor (QWidget *p, base_qobject& oct_qobj); + file_editor (QWidget *p); ~file_editor (void) = default;
--- a/libgui/src/m-editor/octave-qscintilla.cc Mon Jan 02 12:27:33 2023 -0500 +++ b/libgui/src/m-editor/octave-qscintilla.cc Mon Jan 02 12:38:44 2023 -0500 @@ -58,7 +58,6 @@ #include "gui-settings.h" // FIXME: hardwired marker numbers? #include "marker.h" -#include "octave-qobject.h" #include "octave-qscintilla.h" #include "workspace-model.h" @@ -112,10 +111,10 @@ return retval; } - octave_qscintilla::octave_qscintilla (QWidget *p, base_qobject& oct_qobj) - : QsciScintilla (p), m_octave_qobj (oct_qobj), m_debug_mode (false), - m_word_at_cursor (), m_selection (), m_selection_replacement (), - m_selection_line (-1), m_selection_col (-1), m_indicator_id (1) + octave_qscintilla::octave_qscintilla (QWidget *p) + : QsciScintilla (p), m_debug_mode (false), m_word_at_cursor (), + m_selection (), m_selection_replacement (), m_selection_line (-1), + m_selection_col (-1), m_indicator_id (1) { connect (this, SIGNAL (textChanged (void)), this, SLOT (text_changed (void)));
--- a/libgui/src/m-editor/octave-qscintilla.h Mon Jan 02 12:27:33 2023 -0500 +++ b/libgui/src/m-editor/octave-qscintilla.h Mon Jan 02 12:38:44 2023 -0500 @@ -39,15 +39,13 @@ OCTAVE_BEGIN_NAMESPACE(octave) -class base_qobject; - class octave_qscintilla : public QsciScintilla { Q_OBJECT public: - octave_qscintilla (QWidget *p, base_qobject& oct_qobj); + octave_qscintilla (QWidget *p); ~octave_qscintilla (void) = default; @@ -148,8 +146,6 @@ QPointer<QTemporaryFile> create_tmp_file (const QString& extension, const QString& contents); - base_qobject& m_octave_qobj; - bool m_debug_mode; QString m_word_at_cursor;
--- a/libgui/src/main-window.cc Mon Jan 02 12:27:33 2023 -0500 +++ b/libgui/src/main-window.cc Mon Jan 02 12:38:44 2023 -0500 @@ -339,7 +339,7 @@ qt_interpreter_events *qt_link = interp_qobj->qt_link (); #if defined (HAVE_QSCINTILLA) - file_editor *editor = new file_editor (this, m_octave_qobj); + file_editor *editor = new file_editor (this); make_dock_widget_connections (editor);
--- a/libgui/src/octave-dock-widget.cc Mon Jan 02 12:27:33 2023 -0500 +++ b/libgui/src/octave-dock-widget.cc Mon Jan 02 12:38:44 2023 -0500 @@ -45,7 +45,6 @@ #include "gui-utils.h" #include "main-window.h" #include "octave-dock-widget.h" -#include "octave-qobject.h" OCTAVE_BEGIN_NAMESPACE(octave) @@ -189,10 +188,8 @@ .arg ((icon_size*2)/3).arg((icon_size*7)/3); } - octave_dock_widget::octave_dock_widget (const QString& obj_name, QWidget *p, - base_qobject& oct_qobj) - : label_dock_widget (p), m_octave_qobj (oct_qobj), - m_main_window (nullptr), m_adopted (false), + octave_dock_widget::octave_dock_widget (const QString& obj_name, QWidget *p) + : label_dock_widget (p), m_main_window (nullptr), m_adopted (false), m_custom_style (false), m_focus_follows_mouse (false), m_recent_float_geom (), m_recent_dock_geom (), m_waiting_for_mouse_button_release (false)
--- a/libgui/src/octave-dock-widget.h Mon Jan 02 12:27:33 2023 -0500 +++ b/libgui/src/octave-dock-widget.h Mon Jan 02 12:38:44 2023 -0500 @@ -35,7 +35,6 @@ OCTAVE_BEGIN_NAMESPACE(octave) - class base_qobject; class main_window; // The few decoration items common to both main window and variable editor. @@ -86,8 +85,7 @@ public: - octave_dock_widget (const QString& obj_name, QWidget *p, - base_qobject& oct_qobj); + octave_dock_widget (const QString& obj_name, QWidget *p); ~octave_dock_widget (void) = default; @@ -161,10 +159,6 @@ void set_focus_predecessor (void); void store_geometry (void); - protected: - - base_qobject& m_octave_qobj; - private: //! Stores the parent, since we are reparenting to 0.
--- a/libgui/src/octave-qobject.cc Mon Jan 02 12:27:33 2023 -0500 +++ b/libgui/src/octave-qobject.cc Mon Jan 02 12:38:44 2023 -0500 @@ -454,7 +454,7 @@ else if (! m_terminal_widget) { m_terminal_widget - = QPointer<terminal_dock_widget> (new terminal_dock_widget (mw, *this)); + = QPointer<terminal_dock_widget> (new terminal_dock_widget (mw)); if (experimental_terminal_widget ()) { #if defined (HAVE_QSCINTILLA) @@ -508,7 +508,7 @@ else if (! m_documentation_widget) { m_documentation_widget - = QPointer<documentation_dock_widget> (new documentation_dock_widget (mw, *this)); + = QPointer<documentation_dock_widget> (new documentation_dock_widget (mw)); connect (qt_link (), &qt_interpreter_events::register_documentation_signal, @@ -534,7 +534,7 @@ } else if (! m_file_browser_widget) m_file_browser_widget - = QPointer<files_dock_widget> (new files_dock_widget (mw, *this)); + = QPointer<files_dock_widget> (new files_dock_widget (mw)); connect (qt_link (), &qt_interpreter_events::directory_changed_signal, m_file_browser_widget, &files_dock_widget::update_octave_directory); @@ -553,7 +553,7 @@ else if (! m_history_widget) { m_history_widget - = QPointer<history_dock_widget> (new history_dock_widget (mw, *this)); + = QPointer<history_dock_widget> (new history_dock_widget (mw)); connect (qt_link (), &qt_interpreter_events::set_history_signal, m_history_widget, &history_dock_widget::set_history); @@ -588,7 +588,7 @@ else if (! m_workspace_widget) { m_workspace_widget - = QPointer<workspace_view> (new workspace_view (mw, *this)); + = QPointer<workspace_view> (new workspace_view (mw)); m_workspace_widget->setModel (m_workspace_model); @@ -688,7 +688,7 @@ m_editor_widget->set_adopted (true); } else if (! m_editor_widget) - m_editor_widget = new file_editor (mw, *this); + m_editor_widget = new file_editor (mw); #endif return m_editor_widget; @@ -705,7 +705,7 @@ else if (! m_variable_editor_widget) { m_variable_editor_widget - = QPointer<variable_editor> (new variable_editor (mw, *this)); + = QPointer<variable_editor> (new variable_editor (mw)); connect (m_variable_editor_widget, &variable_editor::updated, this, &base_qobject::handle_variable_editor_update);
--- a/libgui/src/terminal-dock-widget.cc Mon Jan 02 12:27:33 2023 -0500 +++ b/libgui/src/terminal-dock-widget.cc Mon Jan 02 12:38:44 2023 -0500 @@ -27,6 +27,7 @@ # include "config.h" #endif +#include <QGuiApplication> #include <QScreen> // This header is only needed for the new terminal widget. @@ -42,15 +43,14 @@ #include "gui-preferences-sc.h" #include "gui-settings.h" -#include "octave-qobject.h" #include "terminal-dock-widget.h" OCTAVE_BEGIN_NAMESPACE(octave) terminal_dock_widget::terminal_dock_widget (QWidget *p, - base_qobject& oct_qobj) - : octave_dock_widget ("TerminalDockWidget", p, oct_qobj), - m_experimental_terminal_widget (oct_qobj.experimental_terminal_widget ()) + bool experimental_terminal_widget) + : octave_dock_widget ("TerminalDockWidget", p), + m_experimental_terminal_widget (experimental_terminal_widget) { init_control_d_shortcut_behavior ();
--- a/libgui/src/terminal-dock-widget.h Mon Jan 02 12:27:33 2023 -0500 +++ b/libgui/src/terminal-dock-widget.h Mon Jan 02 12:38:44 2023 -0500 @@ -35,7 +35,6 @@ OCTAVE_BEGIN_NAMESPACE(octave) class command_widget; - class base_qobject; class terminal_dock_widget : public octave_dock_widget { @@ -43,7 +42,8 @@ public: - terminal_dock_widget (QWidget *parent, base_qobject& oct_qobj); + terminal_dock_widget (QWidget *parent, + bool experimental_terminal_widget = false); ~terminal_dock_widget (void) = default;
--- a/libgui/src/variable-editor.cc Mon Jan 02 12:27:33 2023 -0500 +++ b/libgui/src/variable-editor.cc Mon Jan 02 12:38:44 2023 -0500 @@ -1089,8 +1089,8 @@ // Variable editor. - variable_editor::variable_editor (QWidget *p, base_qobject& oct_qobj) - : octave_dock_widget ("VariableEditor", p, oct_qobj), + variable_editor::variable_editor (QWidget *p) + : octave_dock_widget ("VariableEditor", p), m_main (new dw_main_window ()), m_tool_bar (new QToolBar (m_main)), m_default_width (30),
--- a/libgui/src/variable-editor.h Mon Jan 02 12:27:33 2023 -0500 +++ b/libgui/src/variable-editor.h Mon Jan 02 12:38:44 2023 -0500 @@ -44,8 +44,6 @@ OCTAVE_BEGIN_NAMESPACE(octave) - class base_qobject; - class variable_editor_model; class variable_editor_view; @@ -291,7 +289,7 @@ public: - variable_editor (QWidget *parent, base_qobject& oct_qobj); + variable_editor (QWidget *parent); ~variable_editor (void);
--- a/libgui/src/workspace-view.cc Mon Jan 02 12:27:33 2023 -0500 +++ b/libgui/src/workspace-view.cc Mon Jan 02 12:38:44 2023 -0500 @@ -48,8 +48,8 @@ OCTAVE_BEGIN_NAMESPACE(octave) - workspace_view::workspace_view (QWidget *p, base_qobject& oct_qobj) - : octave_dock_widget ("WorkspaceView", p, oct_qobj), + workspace_view::workspace_view (QWidget *p) + : octave_dock_widget ("WorkspaceView", p), m_view (new QTableView (this)), m_filter_checkbox (new QCheckBox ()), m_filter (new QComboBox (this)),
--- a/libgui/src/workspace-view.h Mon Jan 02 12:27:33 2023 -0500 +++ b/libgui/src/workspace-view.h Mon Jan 02 12:38:44 2023 -0500 @@ -39,15 +39,13 @@ OCTAVE_BEGIN_NAMESPACE(octave) - class base_qobject; - class workspace_view : public octave_dock_widget { Q_OBJECT public: - workspace_view (QWidget *parent, base_qobject& oct_qobj); + workspace_view (QWidget *parent); ~workspace_view (void) = default;