Mercurial > octave
changeset 29785:8ba6f4d0373c
eliminate unused reference to base_qobject in workspace_model
* workspace-model.h, workspace-model.cc
(workspace_model::m_octave_qobj): Delete unused data member.
(workspace_model::workspace_model): Eliminate base_qobject from
argument list. Change all uses.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 19 Jun 2021 01:15:34 -0400 |
| parents | 6dbb7356d83b |
| children | 63c515ff762f |
| files | libgui/src/octave-qobject.cc libgui/src/workspace-model.cc libgui/src/workspace-model.h |
| diffstat | 3 files changed, 4 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/octave-qobject.cc Sat Jun 19 11:51:04 2021 +0200 +++ b/libgui/src/octave-qobject.cc Sat Jun 19 01:15:34 2021 -0400 @@ -177,7 +177,7 @@ m_main_thread (new QThread ()), m_gui_app (gui_app), m_interpreter_ready (false), - m_workspace_model (new workspace_model (*this)), + m_workspace_model (new workspace_model ()), m_documentation_widget (), m_file_browser_widget (), m_history_widget (),
--- a/libgui/src/workspace-model.cc Sat Jun 19 11:51:04 2021 +0200 +++ b/libgui/src/workspace-model.cc Sat Jun 19 01:15:34 2021 -0400 @@ -41,8 +41,8 @@ namespace octave { - workspace_model::workspace_model (base_qobject& oct_qobj, QObject *p) - : QAbstractTableModel (p), m_octave_qobj (oct_qobj) + workspace_model::workspace_model (QObject *p) + : QAbstractTableModel (p) { m_columnNames.append (tr ("Name")); m_columnNames.append (tr ("Class"));
--- a/libgui/src/workspace-model.h Sat Jun 19 11:51:04 2021 +0200 +++ b/libgui/src/workspace-model.h Sat Jun 19 01:15:34 2021 -0400 @@ -43,15 +43,13 @@ namespace octave { - class base_qobject; - class workspace_model : public QAbstractTableModel { Q_OBJECT public: - workspace_model (base_qobject& oct_qobj, QObject *parent = nullptr); + workspace_model (QObject *parent = nullptr); ~workspace_model (void) = default; @@ -97,8 +95,6 @@ void clear_data (void); void update_table (void); - base_qobject& m_octave_qobj; - bool m_top_level; symbol_info_list m_syminfo_list; QString m_scopes;