diff --git a/alib2gui/src/Algorithm/Algorithm.cpp b/alib2gui/src/Algorithm/Algorithm.cpp index 6c216a3a8d067dbd0f0ccc6646409faf601ec3bf..6848cfbb9550ebd7a19bec3010b09fed8a6bff2d 100644 --- a/alib2gui/src/Algorithm/Algorithm.cpp +++ b/alib2gui/src/Algorithm/Algorithm.cpp @@ -95,7 +95,7 @@ Algorithm::execute(const std::vector<std::shared_ptr<abstraction::Value>>& param abstraction::AlgorithmCategories::AlgorithmCategory::DEFAULT); } -Algorithm::Overload::Overload(ext::string p_returnType, - std::vector<ext::string> p_parameterTypes) +Algorithm::Overload::Overload(std::string p_returnType, + std::vector<std::string> p_parameterTypes) : returnType(std::move(p_returnType)) , parameterTypes(std::move(p_parameterTypes)) {} diff --git a/alib2gui/src/Algorithm/Algorithm.hpp b/alib2gui/src/Algorithm/Algorithm.hpp index 0cba41ebc8c8c3db17792bc0803bd2e781f130ad..6742c2763a8a6599bbf8163a24b3f6ac50c31112 100644 --- a/alib2gui/src/Algorithm/Algorithm.hpp +++ b/alib2gui/src/Algorithm/Algorithm.hpp @@ -9,10 +9,10 @@ class Algorithm { public: 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::vector<ext::string> parameterTypes; + std::string returnType; + std::vector<std::string> parameterTypes; }; explicit Algorithm(std::string p_fullName); diff --git a/alib2gui/src/Algorithm/Registry.cpp b/alib2gui/src/Algorithm/Registry.cpp index 49da74e4b86c388a7b6aaada256551d65c42510f..668b9350c8ad396c1c469c29af30d9e88aa71745 100644 --- a/alib2gui/src/Algorithm/Registry.cpp +++ b/alib2gui/src/Algorithm/Registry.cpp @@ -13,11 +13,11 @@ void Registry::initialize() { auto algorithm = std::make_unique<Algorithm>(name); 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()) { - paramNames.push_back ( ext::string ( std::get<0> ( param ) ) ); + paramNames.push_back ( std::string ( std::get<0> ( param ) ) ); } Algorithm::Overload _overload { resultType, paramNames };