From 013c9b2cb7404a6d03443eb39f49622dcc99a7fa Mon Sep 17 00:00:00 2001 From: Treeston Date: Thu, 10 Sep 2020 15:19:17 +0200 Subject: Core/ChatCommands: make ExactSequence more readable (cherry picked from commit feaaa595cae735bb6093b24a88562c27b2723cfe) --- src/common/Utilities/Util.cpp | 5 ----- src/common/Utilities/Util.h | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'src/common') diff --git a/src/common/Utilities/Util.cpp b/src/common/Utilities/Util.cpp index 0d65f1f7f81..511e4b99684 100644 --- a/src/common/Utilities/Util.cpp +++ b/src/common/Utilities/Util.cpp @@ -840,11 +840,6 @@ bool StringEqualI(std::string_view str1, std::string_view str2) }); } -bool StringStartsWith(std::string_view haystack, std::string_view needle) -{ - return (haystack.substr(0, needle.length()) == needle); -} - bool StringContainsStringI(std::string_view haystack, std::string_view needle) { return haystack.end() != diff --git a/src/common/Utilities/Util.h b/src/common/Utilities/Util.h index 8708405882e..61f3d17acf8 100644 --- a/src/common/Utilities/Util.h +++ b/src/common/Utilities/Util.h @@ -369,7 +369,8 @@ inline std::vector HexStrToByteVector(std::string_view str, bool reverse TC_COMMON_API float DegToRad(float degrees); TC_COMMON_API bool StringEqualI(std::string_view str1, std::string_view str2); -TC_COMMON_API bool StringStartsWith(std::string_view haystack, std::string_view needle); +inline bool StringStartsWith(std::string_view haystack, std::string_view needle) { return (haystack.substr(0, needle.length()) == needle); } +inline bool StringStartsWithI(std::string_view haystack, std::string_view needle) { return StringEqualI(haystack.substr(0, needle.length()), needle); } TC_COMMON_API bool StringContainsStringI(std::string_view haystack, std::string_view needle); template inline bool ValueContainsStringI(std::pair const& haystack, std::string_view needle) -- cgit v1.2.3