diff --git a/src/libime/pinyin/pinyinprediction.cpp b/src/libime/pinyin/pinyinprediction.cpp index 695dda4..a1b5f96 100644 --- a/src/libime/pinyin/pinyinprediction.cpp +++ b/src/libime/pinyin/pinyinprediction.cpp @@ -104,7 +104,7 @@ PinyinPrediction::predict(const State &state, [this, &sentence, &prevState, &cmp, &intermedidateResult, &dup, maxSize](std::string_view, std::string_view hz, float cost) { if (sentence.back().size() < hz.size() && - fcitx::stringutils::startsWith(hz, sentence.back())) { + hz.starts_with(sentence.back())) { std::string newWord(hz.substr(sentence.back().size())); if (dup.contains(newWord)) { diff --git a/src/libime/table/tablebaseddictionary.cpp b/src/libime/table/tablebaseddictionary.cpp index 493a4d4..82850fd 100644 --- a/src/libime/table/tablebaseddictionary.cpp +++ b/src/libime/table/tablebaseddictionary.cpp @@ -101,8 +101,7 @@ inline std::string generateTableEntry(uint32_t pinyinKey, std::string_view key, } void maybeUnescapeValue(std::string &value) { - if (value.size() >= 2 && fcitx::stringutils::startsWith(value, '"') && - fcitx::stringutils::endsWith(value, '"')) { + if (value.size() >= 2 && value.starts_with('"') && value.ends_with('"')) { if (auto unescape = fcitx::stringutils::unescapeForValue(value)) { value = unescape.value(); } @@ -112,8 +111,7 @@ void maybeUnescapeValue(std::string &value) { std::string maybeEscapeValue(std::string_view value) { auto escaped = fcitx::stringutils::escapeForValue(value); if (escaped.size() != value.size()) { - if (fcitx::stringutils::startsWith(escaped, "\"") && - fcitx::stringutils::endsWith(escaped, "\"")) { + if (escaped.starts_with("\"") && escaped.ends_with("\"")) { return escaped; } return fcitx::stringutils::concat("\"", escaped, "\""); @@ -673,7 +671,7 @@ void TableBasedDictionary::loadText(std::istream &in) { switch (phase) { case BuildPhase::PhaseConfig: { - if (fcitx::stringutils::startsWith(line, "#")) { + if (line.starts_with("#")) { continue; } @@ -716,7 +714,7 @@ void TableBasedDictionary::loadText(std::istream &in) { break; } case BuildPhase::PhaseRule: { - if (fcitx::stringutils::startsWith(line, "#")) { + if (line.starts_with("#")) { continue; } if (consumeOptionPrefix(line, STR_DATA)) { diff --git a/tools/libime_migrate_fcitx4_table.cpp b/tools/libime_migrate_fcitx4_table.cpp index 0f9f3c4..0ff0922 100644 --- a/tools/libime_migrate_fcitx4_table.cpp +++ b/tools/libime_migrate_fcitx4_table.cpp @@ -148,7 +148,7 @@ std::optional replaceSuffix(const std::string &input, const std::string &suffix, std::string_view newSuffix) { auto name = fs::baseName(input); - if (!stringutils::endsWith(name, suffix)) { + if (!name.ends_with(suffix)) { return {}; } // Strip .mb