XML and mapper remove String.

1 files changed, 9 insertions, 7 deletions

diff --git a/src/ui/mapper/CornerRadiusMapper.cpp b/src/ui/mapper/CornerRadiusMapper.cpp
index 60a72855..defb9d21 100644
--- a/src/ui/mapper/CornerRadiusMapper.cpp
+++ b/src/ui/mapper/CornerRadiusMapper.cpp
@@ -1,37 +1,39 @@
 #include "cru/ui/mapper/CornerRadiusMapper.h"
 #include "cru/ui/mapper/MapperRegistry.h"
-#include "cru/ui/mapper/PointMapper.h"
 
 namespace cru::ui::mapper {
 bool CornerRadiusMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
-  return node->GetTag().CaseInsensitiveCompare(u"CornerRadius") == 0;
+  return cru::string::CaseInsensitiveCompare(node->GetTag(), "CornerRadius") ==
+         0;
 }
 
 CornerRadius CornerRadiusMapper::DoMapFromXml(xml::XmlElementNode* node) {
   auto point_mapper = MapperRegistry::GetInstance()->GetMapper<Point>();
   CornerRadius result;
 
-  auto all = node->GetOptionalAttributeValueCaseInsensitive(u"all");
+  auto all = node->GetOptionalAttributeValueCaseInsensitive("all");
   if (all) {
     result.SetAll(point_mapper->MapFromString(*all));
   }
 
-  auto lefttop = node->GetOptionalAttributeValueCaseInsensitive(u"lefttop");
+  auto lefttop = node->GetOptionalAttributeValueCaseInsensitive("lefttop");
   if (lefttop) {
     result.left_top = point_mapper->MapFromString(*lefttop);
   }
 
-  auto righttop = node->GetOptionalAttributeValueCaseInsensitive(u"righttop");
+  auto righttop = node->GetOptionalAttributeValueCaseInsensitive("righttop");
   if (righttop) {
     result.right_top = point_mapper->MapFromString(*righttop);
   }
 
-  auto rightbottom = node->GetOptionalAttributeValueCaseInsensitive(u"rightbottom");
+  auto rightbottom =
+      node->GetOptionalAttributeValueCaseInsensitive("rightbottom");
   if (rightbottom) {
     result.right_bottom = point_mapper->MapFromString(*rightbottom);
   }
 
-  auto leftbottom = node->GetOptionalAttributeValueCaseInsensitive(u"leftbottom");
+  auto leftbottom =
+      node->GetOptionalAttributeValueCaseInsensitive("leftbottom");
   if (leftbottom) {
     result.left_bottom = point_mapper->MapFromString(*leftbottom);
   }