XML and mapper remove String.

1 files changed, 8 insertions, 6 deletions

diff --git a/src/ui/mapper/style/CheckedConditionMapper.cpp b/src/ui/mapper/style/CheckedConditionMapper.cpp
index e33c1113..aafc97a4 100644
--- a/src/ui/mapper/style/CheckedConditionMapper.cpp
+++ b/src/ui/mapper/style/CheckedConditionMapper.cpp
@@ -1,22 +1,24 @@
-#include "cru/base/ClonablePtr.h"
 #include "cru/ui/mapper/style/CheckedConditionMapper.h"
+#include "cru/base/ClonablePtr.h"
+#include "cru/base/StringUtil.h"
 #include "cru/ui/style/Condition.h"
 #include "cru/xml/XmlNode.h"
 
 namespace cru::ui::mapper::style {
 bool CheckedConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
-  return node->GetTag().CaseInsensitiveEqual(u"CheckedCondition");
+  return cru::string::CaseInsensitiveCompare(node->GetTag(),
+                                             "CheckedCondition") == 0;
 }
 
 ClonablePtr<ui::style::CheckedCondition> CheckedConditionMapper::DoMapFromXml(
     xml::XmlElementNode* node) {
-  auto value = node->GetAttributeValueCaseInsensitive(u"value");
-  if (value.CaseInsensitiveEqual(u"true")) {
+  auto value = node->GetAttributeValueCaseInsensitive("value");
+  if (cru::string::CaseInsensitiveCompare(value, "true") == 0) {
     return ui::style::CheckedCondition::Create(true);
-  } else if (value.CaseInsensitiveEqual(u"false")) {
+  } else if (cru::string::CaseInsensitiveCompare(value, "false") == 0) {
     return ui::style::CheckedCondition::Create(false);
   } else {
-    throw Exception("Invalid value for CheckedCondition: " + value.ToUtf8());
+    throw Exception("Invalid value for CheckedCondition: " + value);
   }
 }
 }  // namespace cru::ui::mapper::style