From a6b5b8b879a9a587ec0ad605722d5d6428d5e68c Mon Sep 17 00:00:00 2001 From: Yuqian Yang Date: Fri, 17 Oct 2025 09:26:58 +0800 Subject: XML and mapper remove String. --- src/ui/mapper/StringMapper.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/ui/mapper/StringMapper.cpp') diff --git a/src/ui/mapper/StringMapper.cpp b/src/ui/mapper/StringMapper.cpp index 89893ce1..6e224d3f 100644 --- a/src/ui/mapper/StringMapper.cpp +++ b/src/ui/mapper/StringMapper.cpp @@ -6,11 +6,13 @@ StringMapper::StringMapper() { SetAllowedTags({u"String"}); } StringMapper::~StringMapper() {} -String StringMapper::DoMapFromString(String str) { return std::move(str); } +String StringMapper::DoMapFromString(std::string str) { + return String::FromUtf8(str); +} String StringMapper::DoMapFromXml(xml::XmlElementNode* node) { - auto value_attr = node->GetOptionalAttributeValueCaseInsensitive(u"value"); - if (value_attr) return *value_attr; + auto value_attr = node->GetOptionalAttributeValueCaseInsensitive("value"); + if (value_attr) return String::FromUtf8(*value_attr); return {}; } } // namespace cru::ui::mapper -- cgit v1.2.3