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/style/ClickStateConditionMapper.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src/ui/mapper/style/ClickStateConditionMapper.cpp') diff --git a/src/ui/mapper/style/ClickStateConditionMapper.cpp b/src/ui/mapper/style/ClickStateConditionMapper.cpp index ca1f09c6..badaca85 100644 --- a/src/ui/mapper/style/ClickStateConditionMapper.cpp +++ b/src/ui/mapper/style/ClickStateConditionMapper.cpp @@ -1,30 +1,33 @@ #include "cru/ui/mapper/style/ClickStateConditionMapper.h" #include "cru/base/ClonablePtr.h" #include "cru/base/Exception.h" +#include "cru/base/StringUtil.h" #include "cru/ui/helper/ClickDetector.h" #include "cru/ui/style/Condition.h" namespace cru::ui::mapper::style { bool ClickStateConditionMapper::XmlElementIsOfThisType( xml::XmlElementNode *node) { - return node->GetTag().CaseInsensitiveEqual(u"ClickStateCondition"); + return cru::string::CaseInsensitiveCompare(node->GetTag(), + "ClickStateCondition") == 0; } ClonablePtr ClickStateConditionMapper::DoMapFromXml(xml::XmlElementNode *node) { auto state = helper::ClickState::None; - auto value_attr = node->GetOptionalAttributeValueCaseInsensitive(u"value"); + auto value_attr = node->GetOptionalAttributeValueCaseInsensitive("value"); if (value_attr) { - if (value_attr->CaseInsensitiveEqual(u"none")) { + if (cru::string::CaseInsensitiveCompare(*value_attr, "none") == 0) { state = helper::ClickState::None; - } else if (value_attr->CaseInsensitiveEqual(u"hover")) { + } else if (cru::string::CaseInsensitiveCompare(*value_attr, "hover") == 0) { state = helper::ClickState::Hover; - } else if (value_attr->CaseInsensitiveEqual(u"press")) { + } else if (cru::string::CaseInsensitiveCompare(*value_attr, "press") == 0) { state = helper::ClickState::Press; - } else if (value_attr->CaseInsensitiveEqual(u"pressinactive")) { + } else if (cru::string::CaseInsensitiveCompare(*value_attr, + "pressinactive") == 0) { state = helper::ClickState::PressInactive; } else { - throw Exception("Unknown click state: " + value_attr->ToUtf8()); + throw Exception("Unknown click state: " + *value_attr); } } -- cgit v1.2.3