diff options
author | Alexander Batischev <eual.jp@gmail.com> | 2021-04-23 01:52:17 +0300 |
---|---|---|
committer | Alexander Batischev <eual.jp@gmail.com> | 2021-05-17 15:23:12 +0300 |
commit | 7d860123fed2464360a8c223b2a98b4c0702ce4e (patch) | |
tree | c79a32a2a5192ce2444374a48916c9a13998f0b3 | |
parent | eff42d15fea3a2e09c396f74b2eb5b47eedec8af (diff) |
Switch ItemListFormAction's storage to Utf8String
-rw-r--r-- | include/itemlistformaction.h | 5 | ||||
-rw-r--r-- | src/itemlistformaction.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/itemlistformaction.h b/include/itemlistformaction.h index a50e04ec..37ba029f 100644 --- a/include/itemlistformaction.h +++ b/include/itemlistformaction.h @@ -9,6 +9,7 @@ #include "listformaction.h" #include "listformatter.h" #include "regexmanager.h" +#include "utf8string.h" #include "view.h" namespace newsboat { @@ -64,7 +65,7 @@ public: } void set_searchphrase(const std::string& s) { - search_phrase = s; + search_phrase = Utf8String::from_utf8(s); } void invalidate_list() @@ -131,7 +132,7 @@ private: Matcher matcher; std::vector<ItemPtrPosPair> visible_items; bool show_searchresult; - std::string search_phrase; + Utf8String search_phrase; History filterhistory; diff --git a/src/itemlistformaction.cpp b/src/itemlistformaction.cpp index 13d38f69..c0416cb6 100644 --- a/src/itemlistformaction.cpp +++ b/src/itemlistformaction.cpp @@ -71,7 +71,7 @@ bool ItemListFormAction::process_operation(Operation op, old_itempos = itempos; v->push_itemview(feed, visible_items[itempos].first->guid(), - show_searchresult ? search_phrase : ""); + show_searchresult ? search_phrase.to_utf8() : ""); invalidate(itempos); } else { v->get_statusline().show_error( |