Mercurial > octave
diff libgui/src/workspace-model.cc @ 26656:ab3babe4ea25
eliminate soon-to-be obsolete symbol types from GUI variable display
* resource-manager.h (resource_manager::storage_class_chars):
Delete unused chars.
* workspace-model.cc (workspace_model::storage_class_names):
Delete unused names.
(workspace_model::update_table): Delete unused storage class types.
(workspace_model::storage_class_default_colors):
Eliminate unused colors.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 26 Jan 2019 15:21:26 +0000 |
parents | 00f796120a6d |
children | c76dd670a7a5 |
line wrap: on
line diff
--- a/libgui/src/workspace-model.cc Sat Jan 26 15:03:57 2019 +0000 +++ b/libgui/src/workspace-model.cc Sat Jan 26 15:21:26 2019 +0000 @@ -61,10 +61,7 @@ if (colors.isEmpty ()) { colors << QColor (190, 255, 255) - << QColor (220, 255, 220) - << QColor (220, 220, 255) << QColor (255, 255, 190) - << QColor (255, 220, 220) << QColor (255, 190, 255); } @@ -78,11 +75,8 @@ if (names.isEmpty ()) { - names << QObject::tr ("automatic") - << QObject::tr ("function") + names << QObject::tr ("argument") << QObject::tr ("global") - << QObject::tr ("hidden") - << QObject::tr ("inherited") << QObject::tr ("persistent"); } @@ -301,14 +295,12 @@ dv(i) = sz(i); char storage = ' '; - if (syminfo.is_global ()) + if (syminfo.is_formal ()) + storage = 'a'; + else if (syminfo.is_global ()) storage = 'g'; else if (syminfo.is_persistent ()) storage = 'p'; - else if (syminfo.is_automatic ()) - storage = 'a'; - else if (syminfo.is_formal ()) - storage = 'f'; std::ostringstream buf; val.short_disp (buf);