Mercurial > octave
diff libgui/src/workspace-model.h @ 26117:a6df420457ac
use symbol_info_list instead of symbol_scope to pass workspace info to gui
* syminfo.h (symbol_info_list::varval): New function.
* octave-link.h, octave-link.cc (octave_link::set_workspace,
octave_link::do_set_workspace): Pass symbol_info object instead of
symbol_scope.
* octave-qt-link.h, octave-qt-link.cc (octave_link::do_set_workspace):
Likewise. Change all uses. Register symbol_info_list instead of
symbol_scope as a Qt meta type.
* workspace-model.h, workspace-model.cc: Store symbol_info_list object
instead of symbol_scope.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 16 Nov 2018 19:35:39 -0500 |
| parents | c3cd63006870 |
| children | 00f796120a6d |
line wrap: on
line diff
--- a/libgui/src/workspace-model.h Fri Nov 16 18:40:13 2018 -0500 +++ b/libgui/src/workspace-model.h Fri Nov 16 19:35:39 2018 -0500 @@ -33,7 +33,7 @@ #include <QColor> #include <QSettings> -#include "symscope.h" +#include "syminfo.h" // Defined for purposes of sending QList<int> as part of signal. typedef QList<int> QIntList; @@ -76,12 +76,12 @@ return m_storage_class_colors.at (s_class); } - symbol_scope scope (void) const { return m_scope; } + symbol_info_list get_symbol_info (void) const { return m_syminfo_list; } public slots: void set_workspace (bool top_level, bool debug, - const symbol_scope& scope); + const symbol_info_list& syminfo); void clear_workspace (void); @@ -100,7 +100,7 @@ void update_table (void); bool m_top_level; - symbol_scope m_scope; + symbol_info_list m_syminfo_list; QString m_scopes; QStringList m_symbols; QStringList m_class_names;