1 files changed, 10 insertions, 7 deletions
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<ui::style::ClickStateCondition>
 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);
     }
   }