From b50b4d9d0a2005a86b678fbcf887768ab4ac8bc3 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sat, 22 Feb 2025 10:40:07 +0100 Subject: [PATCH] Added support for building against ICU 76.1 and later --- es-core/src/utils/StringUtil.cpp | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/es-core/src/utils/StringUtil.cpp b/es-core/src/utils/StringUtil.cpp index 9784323c1..753ac90ec 100644 --- a/es-core/src/utils/StringUtil.cpp +++ b/es-core/src/utils/StringUtil.cpp @@ -219,20 +219,18 @@ namespace Utils icu::UnicodeString iterateString { icu::UnicodeString::fromUTF8(stringArg.c_str()).toLower()}; - if (iterateString != nullptr) { - iterator->setText(iterateString); - int32_t pos {iterator->first()}; - int32_t lastPos {pos}; - - while (pos != icu::BreakIterator::DONE) { - iterateString.replace(lastPos, 1, - icu::UnicodeString(iterateString, pos, 1).toUpper()); - pos = iterator->next(); - lastPos = pos; - } - } - else { + if (iterateString.isBogus()) return stringArg; + + iterator->setText(iterateString); + int32_t pos {iterator->first()}; + int32_t lastPos {pos}; + + while (pos != icu::BreakIterator::DONE) { + iterateString.replace(lastPos, 1, + icu::UnicodeString(iterateString, pos, 1).toUpper()); + pos = iterator->next(); + lastPos = pos; } std::string stringCapitalized;