diff libinterp/corefcn/octave-link.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 700b3f415ebe
children 00f796120a6d
line wrap: on
line diff
--- a/libinterp/corefcn/octave-link.h	Fri Nov 16 18:40:13 2018 -0500
+++ b/libinterp/corefcn/octave-link.h	Fri Nov 16 19:35:39 2018 -0500
@@ -40,7 +40,7 @@
 
 namespace octave
 {
-  class symbol_scope;
+  class symbol_info_list;
 }
 
 //! Provides threadsafe access to octave.
@@ -246,11 +246,11 @@
   static void set_workspace (void);
 
   static void set_workspace (bool top_level,
-                             const octave::symbol_scope& scope,
+                             const octave::symbol_info_list& syminfo,
                              bool update_variable_editor = true)
   {
     if (enabled ())
-      instance->do_set_workspace (top_level, instance->debugging, scope,
+      instance->do_set_workspace (top_level, instance->debugging, syminfo,
                                   update_variable_editor);
   }
 
@@ -537,7 +537,7 @@
 
   virtual void
   do_set_workspace (bool top_level, bool debug,
-                    const octave::symbol_scope& scope,
+                    const octave::symbol_info_list& syminfo,
                     bool update_variable_editor) = 0;
 
   virtual void do_clear_workspace (void) = 0;