Use more utf8::MakeStringViewRange instead of utf8_string_substr.

Author: wengxt

src/kana.cpp

@@ -154,7 +154,7 @@ bool KanaConvertor::append(const fcitx::KeyEvent &key, std::string &result,
     return append(raw, result, pending);
 }
 
-bool KanaConvertor::append(const std::string &raw, std::string &result,
+bool KanaConvertor::append(std::string_view raw, std::string &result,
                            std::string & /*pending*/) {
     result = raw;
     pending_ = std::string();

src/kana.h

@@ -11,6 +11,7 @@
 #include "key2kana_base.h"
 #include <fcitx/event.h>
 #include <string>
+#include <string_view>
 
 class AnthyState;
 
@@ -23,7 +24,7 @@ class KanaConvertor : public Key2KanaConvertorBase {
                    bool ignore_space = false) override;
     bool append(const fcitx::KeyEvent &key, std::string &result,
                 std::string &pending, std::string &raw) override;
-    bool append(const std::string &raw, std::string &result,
+    bool append(std::string_view raw, std::string &result,
                 std::string &pending) override;
     void clear() override;
 

src/key2kana.cpp

@@ -16,11 +16,13 @@
 #include <fcitx-utils/charutils.h>
 #include <fcitx-utils/key.h>
 #include <fcitx-utils/keysym.h>
+#include <fcitx-utils/stringutils.h>
 #include <fcitx-utils/utf8.h>
 #include <fcitx/event.h>
 #include <fcitx/inputmethodmanager.h>
 #include <fcitx/instance.h>
 #include <string>
+#include <string_view>
 #include <vector>
 
 Key2KanaConvertor::Key2KanaConvertor(AnthyState &anthy,
@@ -150,9 +152,9 @@ bool CheckLayout(fcitx::Instance *instance) {
     return layout == "jp" || layout.starts_with("jp-");
 }
 
-bool Key2KanaConvertor::append(const std::string &str, std::string &result,
+bool Key2KanaConvertor::append(std::string_view str, std::string &result,
                                std::string &pending) {
-    std::string matching_str = pending_ + str;
+    std::string matching_str = fcitx::stringutils::concat(pending_, str);
     Key2KanaRule exact_match;
     bool has_partial_match = false;
     bool retval = false;
@@ -293,19 +295,18 @@ void Key2KanaConvertor::resetPending(const std::string & /*result*/,
                                      const std::string &raw) {
     lastKey_ = fcitx::Key();
 
-    for (unsigned int i = 0; i < fcitx::utf8::length(raw); i++) {
+    for (auto chr : fcitx::utf8::MakeUTF8StringViewRange(raw)) {
         std::string res;
         std::string pend;
-        append(util::utf8_string_substr(raw, i, 1), res, pend);
+        append(chr, res, pend);
     }
 }
 
-bool Key2KanaConvertor::processPseudoAsciiMode(const std::string &wstr) {
-    for (unsigned int i = 0; i < wstr.length(); i++) {
-        if (fcitx::charutils::isupper(wstr[i]) ||
-            fcitx::charutils::isspace(wstr[i])) {
+bool Key2KanaConvertor::processPseudoAsciiMode(std::string_view wstr) {
+    for (auto chr : wstr) {
+        if (fcitx::charutils::isupper(chr) || fcitx::charutils::isspace(chr)) {
             isInPseudoAsciiMode_ = true;
-        } else if (wstr[i] & 0x80) {
+        } else if (chr & 0x80) {
             isInPseudoAsciiMode_ = false;
         }
     }

src/key2kana.h

@@ -14,6 +14,7 @@
 #include <fcitx-utils/key.h>
 #include <fcitx/event.h>
 #include <string>
+#include <string_view>
 
 class AnthyState;
 
@@ -26,6 +27,8 @@ class Key2KanaConvertor : public Key2KanaConvertorBase {
                    bool ignore_space = false) override;
     bool append(const fcitx::KeyEvent &key, std::string &result,
                 std::string &pending, std::string &raw) override;
+    bool append(std::string_view str, std::string &result,
+                std::string &pending) override;
     void clear() override;
 
     bool isPending() const override;
@@ -35,13 +38,10 @@ class Key2KanaConvertor : public Key2KanaConvertorBase {
                       const std::string &raw) override;
     void setPseudoAsciiMode(int mode) { pseudoAsciiMode_ = mode; }
     bool isPseudoAsciiMode() const { return isInPseudoAsciiMode_; }
-    bool processPseudoAsciiMode(const std::string &wstr) override;
+    bool processPseudoAsciiMode(std::string_view wstr) override;
     void resetPseudoAsciiMode() override;
 
 private:
-    bool append(const std::string &str, std::string &result,
-                std::string &pending) override;
-
     Key2KanaTableSet &tables_;
 
     // state

src/key2kana_base.h

@@ -11,6 +11,7 @@
 
 #include <fcitx/event.h>
 #include <string>
+#include <string_view>
 
 class AnthyState;
 class AnthyConfig;
@@ -25,7 +26,7 @@ class Key2KanaConvertorBase {
                            bool ignore_space = false) = 0;
     virtual bool append(const fcitx::KeyEvent &key, std::string &result,
                         std::string &pending, std::string &raw) = 0;
-    virtual bool append(const std::string &raw, std::string &result,
+    virtual bool append(std::string_view raw, std::string &result,
                         std::string &pending) = 0;
     virtual void clear() = 0;
 
@@ -36,7 +37,7 @@ class Key2KanaConvertorBase {
                               const std::string &raw) = 0;
 
     virtual void resetPseudoAsciiMode() {}
-    virtual bool processPseudoAsciiMode(const std::string & /*unused*/) {
+    virtual bool processPseudoAsciiMode(std::string_view /*unused*/) {
         return false;
     }
 

src/nicola.cpp

@@ -24,6 +24,7 @@
 #include <fcitx-utils/log.h>
 #include <fcitx/event.h>
 #include <string>
+#include <string_view>
 #include <vector>
 
 void NicolaTimeoutFunc(void *arg) {
@@ -381,7 +382,7 @@ bool NicolaConvertor::append(const fcitx::KeyEvent &key, std::string &result,
     return handleVoicedConsonant(result, pending);
 }
 
-bool NicolaConvertor::append(const std::string &raw, std::string &result,
+bool NicolaConvertor::append(std::string_view raw, std::string &result,
                              std::string & /*pending*/) {
     result = raw;
     pending_ = std::string();

src/nicola.h

@@ -10,10 +10,13 @@
 #define __FCITX_ANTHY_NICOLA_H__
 
 #include <fcitx-utils/event.h>
+#include <fcitx-utils/eventloopinterface.h>
 #include <fcitx-utils/key.h>
 #include <fcitx/event.h>
+#include <memory>
 #include <stdint.h>
 #include <string>
+#include <string_view>
 #include <sys/time.h>
 
 #include "key2kana_base.h"
@@ -36,7 +39,7 @@ class NicolaConvertor : public Key2KanaConvertorBase {
                    bool ignore_space = false) override;
     bool append(const fcitx::KeyEvent &key, std::string &result,
                 std::string &pending, std::string &raw) override;
-    bool append(const std::string &raw, std::string &result,
+    bool append(std::string_view raw, std::string &result,
                 std::string &pending) override;
     void clear() override;
 
@@ -62,7 +65,6 @@ class NicolaConvertor : public Key2KanaConvertorBase {
     bool stop();
     int thumbKey(const fcitx::KeyEvent &key);
 
-private:
     Key2KanaTableSet &tables_;
 
     // state

src/reading.cpp

@@ -33,12 +33,11 @@ static std::string_view find_romaji(std::string_view c) {
     return {};
 }
 
-static void to_half(std::string &dest, std::string &src) {
+static void to_half(std::string &dest, std::string_view src) {
     const auto &table = fcitx_anthy_wide_table;
 
-    for (unsigned int i = 0; i < fcitx::utf8::length(src); i++) {
+    for (auto kana : fcitx::utf8::MakeUTF8StringViewRange(src)) {
         bool found = false;
-        std::string kana = util::utf8_string_substr(src, i, 1);
         for (const auto &item : table) {
             if (kana == item.wide) {
                 dest += item.code;
@@ -63,8 +62,7 @@ void ReadingSegment::split(ReadingSegments &segments) {
     to_half(half, kana);
     bool same_with_raw = half == raw;
 
-    for (unsigned int i = 0; i < fcitx::utf8::length(kana); i++) {
-        std::string c = util::utf8_string_substr(kana, i, 1);
+    for (auto c : fcitx::utf8::MakeUTF8StringViewRange(kana)) {
         ReadingSegment seg;
         seg.kana = c;
         if (same_with_raw) {