diff -r 20ca0a6be175 -r 9b6a0daedfc0 sources/mystring.cpp --- a/sources/mystring.cpp Wed Jan 27 14:04:53 2021 +0200 +++ b/sources/mystring.cpp Wed Jan 27 14:05:39 2021 +0200 @@ -39,7 +39,7 @@ */ std::string to_lowercase(const std::string& string) { - String result = string; + std::string result = string; for (char& ch : result) { @@ -55,7 +55,7 @@ * \param delimeter The delimeter to place between the element strings. * \returns the catenated string. */ -std::string join_string_list(const StringList& strings, const std::string& delimeter) +std::string join_string_list(const std::vector& strings, const std::string& delimeter) { std::string result; @@ -173,7 +173,7 @@ * \param other Sub-string to find from the beginning of this string. * \returns whether or not this string begins with the provided sub-string. */ -bool starts_with(const std::string& str, const String& other) +bool starts_with(const std::string& str, const std::string& other) { if (str.length() < other.length()) return false; @@ -200,16 +200,16 @@ * \param delimeter Delimeter to use for splitting. * \returns a string list containing the split strings. */ -StringList split(const std::string& string, const String& delimeter) +std::vector split(const std::string& string, const std::string& delimeter) { - StringList result; + std::vector result; int a = 0; int b; // Find all separators and store the text left to them. while ((b = string.find(delimeter, a)) != -1) { - String sub = mid(string, a, b); + std::string sub = mid(string, a, b); if (sub.length() > 0) result.push_back(sub);