Merge remote-tracking branch 'origin/6.0' 65/20665/1
Antoine ELIAS [Mon, 17 Dec 2018 17:12:13 +0000 (18:12 +0100)]
Change-Id: If6aa7dcb990d90708d432f8ef958441a9bec86f7

12 files changed:
1  2 
scilab/modules/ast/includes/symbol/context.hxx
scilab/modules/ast/includes/symbol/variables.hxx
scilab/modules/ast/includes/types/string.hxx
scilab/modules/ast/includes/types/struct.hxx
scilab/modules/ast/src/cpp/symbol/context.cpp
scilab/modules/ast/src/cpp/symbol/variables.cpp
scilab/modules/ast/src/cpp/types/sparse.cpp
scilab/modules/ast/src/cpp/types/string.cpp
scilab/modules/ast/src/cpp/types/struct.cpp
scilab/modules/ast/src/cpp/types/types_tools.cpp
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/mexlib/src/cpp/mexlib.cpp

@@@ -85,9 -85,8 +85,9 @@@ public
      int getVarsName(std::list<std::wstring>& lst);
      int getMacrosName(std::list<std::wstring>& lst);
      int getFunctionsName(std::list<std::wstring>& lst);
-     int getVarsInfoForWho(std::list<std::pair<std::wstring,int>>& lst, bool bSorted);
-     int getGlobalInfoForWho(std::list<std::pair<std::wstring,int>>& lst, bool bSorted);
+     int getVarsNameForWho(std::list<std::wstring>& lst, bool sorted);
+     int getGlobalNameForWho(std::list<std::wstring>& lst, bool sorted);
 +    int getCurrentScope(std::list<std::wstring>& lst, bool sorted);
      int getWhereIs(std::list<std::wstring>& lst, const std::wstring& _str);
      int getLibrariesList(std::list<std::wstring>& lst);
      int getVarsToVariableBrowser(std::list<Variable*>& lst);