From 1ababefc613ce0dd3477939422c22a9358307ee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Tr=C3=A1vn=C3=AD=C4=8Dek?= <jan.travnicek@fit.cvut.cz>
Date: Wed, 12 Jan 2022 21:39:39 +0100
Subject: [PATCH] gui: replace ext::string with std::string
---
alib2gui/src/Algorithm/Algorithm.cpp | 4 ++--
alib2gui/src/Algorithm/Algorithm.hpp | 6 +++---
alib2gui/src/Algorithm/Registry.cpp | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/alib2gui/src/Algorithm/Algorithm.cpp b/alib2gui/src/Algorithm/Algorithm.cpp
index 6c216a3a8d..6848cfbb95 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 0cba41ebc8..6742c2763a 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 49da74e4b8..668b9350c8 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 };
--
GitLab