Skip to content
Snippets Groups Projects
Commit 1ababefc authored by Jan Trávníček's avatar Jan Trávníček
Browse files

gui: replace ext::string with std::string

parent c5dab93c
No related branches found
No related tags found
1 merge request!207Merge jt
...@@ -95,7 +95,7 @@ Algorithm::execute(const std::vector<std::shared_ptr<abstraction::Value>>& param ...@@ -95,7 +95,7 @@ Algorithm::execute(const std::vector<std::shared_ptr<abstraction::Value>>& param
abstraction::AlgorithmCategories::AlgorithmCategory::DEFAULT); abstraction::AlgorithmCategories::AlgorithmCategory::DEFAULT);
} }
   
Algorithm::Overload::Overload(ext::string p_returnType, Algorithm::Overload::Overload(std::string p_returnType,
std::vector<ext::string> p_parameterTypes) std::vector<std::string> p_parameterTypes)
: returnType(std::move(p_returnType)) : returnType(std::move(p_returnType))
, parameterTypes(std::move(p_parameterTypes)) {} , parameterTypes(std::move(p_parameterTypes)) {}
...@@ -9,10 +9,10 @@ class Algorithm { ...@@ -9,10 +9,10 @@ class Algorithm {
public: public:
   
struct Overload { struct Overload {
Overload(ext::string p_returnType, std::vector<ext::string> p_parameterTypes); Overload(std::string p_returnType, std::vector<std::string> p_parameterTypes);
   
ext::string returnType; std::string returnType;
std::vector<ext::string> parameterTypes; std::vector<std::string> parameterTypes;
}; };
   
explicit Algorithm(std::string p_fullName); explicit Algorithm(std::string p_fullName);
......
...@@ -13,11 +13,11 @@ void Registry::initialize() { ...@@ -13,11 +13,11 @@ void Registry::initialize() {
auto algorithm = std::make_unique<Algorithm>(name); auto algorithm = std::make_unique<Algorithm>(name);
   
for (const auto& overload: abstraction::AlgorithmRegistry::listOverloads(name, item.second)) { for (const auto& overload: abstraction::AlgorithmRegistry::listOverloads(name, item.second)) {
ext::string resultType ( std::get<0>(overload).getResult().first ); std::string resultType ( std::get<0>(overload).getResult().first );
   
std::vector<ext::string> paramNames; std::vector<std::string> paramNames;
for (const auto& param: std::get<0>(overload).getParams()) { for (const auto& param: std::get<0>(overload).getParams()) {
paramNames.push_back ( ext::string ( std::get<0> ( param ) ) ); paramNames.push_back ( std::string ( std::get<0> ( param ) ) );
} }
   
Algorithm::Overload _overload { resultType, paramNames }; Algorithm::Overload _overload { resultType, paramNames };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment