...

17 files changed, 24 insertions, 24 deletions

diff --git a/src/ui/mapper/BorderStyleMapper.cpp b/src/ui/mapper/BorderStyleMapper.cpp
index 3dea0776..6bf197f6 100644
--- a/src/ui/mapper/BorderStyleMapper.cpp
+++ b/src/ui/mapper/BorderStyleMapper.cpp
@@ -35,7 +35,7 @@ ApplyBorderStyleInfo BorderStyleMapper::DoMapFromXml(
         result.border_radius = corner_radius_mapper->MapFromXml(c);
       } else if (brush_mapper->XmlElementIsOfThisType(c)) {
         auto brush = brush_mapper->MapFromXml(c);
-        auto name = c->GetOptionalAttributeCaseInsensitive(u"name");
+        auto name = c->GetOptionalAttributeValueCaseInsensitive(u"name");
         if (name) {
           if (name->CaseInsensitiveCompare(u"foreground") == 0) {
             result.foreground_brush = std::move(brush);
diff --git a/src/ui/mapper/ColorMapper.cpp b/src/ui/mapper/ColorMapper.cpp
index 54359727..6f7de7fb 100644
--- a/src/ui/mapper/ColorMapper.cpp
+++ b/src/ui/mapper/ColorMapper.cpp
@@ -14,13 +14,13 @@ Color ColorMapper::DoMapFromString(String str) {
 }
 
 Color ColorMapper::DoMapFromXml(xml::XmlElementNode* node) {
-  auto value_attr = node->GetOptionalAttributeCaseInsensitive(u"value");
+  auto value_attr = node->GetOptionalAttributeValueCaseInsensitive(u"value");
   Color result = colors::transparent;
   if (value_attr) {
     result = DoMapFromString(*value_attr);
   }
 
-  auto alpha_value_attr = node->GetOptionalAttributeCaseInsensitive(u"alpha");
+  auto alpha_value_attr = node->GetOptionalAttributeValueCaseInsensitive(u"alpha");
   if (alpha_value_attr) {
     result.alpha = alpha_value_attr->ParseToDouble() * 255;
   }
diff --git a/src/ui/mapper/CornerRadiusMapper.cpp b/src/ui/mapper/CornerRadiusMapper.cpp
index 673432e1..60a72855 100644
--- a/src/ui/mapper/CornerRadiusMapper.cpp
+++ b/src/ui/mapper/CornerRadiusMapper.cpp
@@ -11,27 +11,27 @@ CornerRadius CornerRadiusMapper::DoMapFromXml(xml::XmlElementNode* node) {
   auto point_mapper = MapperRegistry::GetInstance()->GetMapper<Point>();
   CornerRadius result;
 
-  auto all = node->GetOptionalAttributeCaseInsensitive(u"all");
+  auto all = node->GetOptionalAttributeValueCaseInsensitive(u"all");
   if (all) {
     result.SetAll(point_mapper->MapFromString(*all));
   }
 
-  auto lefttop = node->GetOptionalAttributeCaseInsensitive(u"lefttop");
+  auto lefttop = node->GetOptionalAttributeValueCaseInsensitive(u"lefttop");
   if (lefttop) {
     result.left_top = point_mapper->MapFromString(*lefttop);
   }
 
-  auto righttop = node->GetOptionalAttributeCaseInsensitive(u"righttop");
+  auto righttop = node->GetOptionalAttributeValueCaseInsensitive(u"righttop");
   if (righttop) {
     result.right_top = point_mapper->MapFromString(*righttop);
   }
 
-  auto rightbottom = node->GetOptionalAttributeCaseInsensitive(u"rightbottom");
+  auto rightbottom = node->GetOptionalAttributeValueCaseInsensitive(u"rightbottom");
   if (rightbottom) {
     result.right_bottom = point_mapper->MapFromString(*rightbottom);
   }
 
-  auto leftbottom = node->GetOptionalAttributeCaseInsensitive(u"leftbottom");
+  auto leftbottom = node->GetOptionalAttributeValueCaseInsensitive(u"leftbottom");
   if (leftbottom) {
     result.left_bottom = point_mapper->MapFromString(*leftbottom);
   }
diff --git a/src/ui/mapper/CursorMapper.cpp b/src/ui/mapper/CursorMapper.cpp
index 3a916fd1..7de422e8 100644
--- a/src/ui/mapper/CursorMapper.cpp
+++ b/src/ui/mapper/CursorMapper.cpp
@@ -29,7 +29,7 @@ std::shared_ptr<ICursor> CursorMapper::DoMapFromString(String str) {
 }
 
 std::shared_ptr<ICursor> CursorMapper::DoMapFromXml(xml::XmlElementNode *node) {
-  auto value_attr = node->GetOptionalAttributeCaseInsensitive(u"value");
+  auto value_attr = node->GetOptionalAttributeValueCaseInsensitive(u"value");
   if (!value_attr) return nullptr;
   return DoMapFromString(*value_attr);
 }
diff --git a/src/ui/mapper/FontMapper.cpp b/src/ui/mapper/FontMapper.cpp
index 8f64d5aa..13a2bc75 100644
--- a/src/ui/mapper/FontMapper.cpp
+++ b/src/ui/mapper/FontMapper.cpp
@@ -9,8 +9,8 @@ bool FontMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
 
 std::shared_ptr<platform::graphics::IFont> FontMapper::DoMapFromXml(
     xml::XmlElementNode* node) {
-  auto font_family_attr = node->GetOptionalAttribute(u"family");
-  auto font_size_attr = node->GetOptionalAttribute(u"size");
+  auto font_family_attr = node->GetOptionalAttributeValue(u"family");
+  auto font_size_attr = node->GetOptionalAttributeValue(u"size");
 
   auto font_family = font_family_attr.value_or(u"");
   auto font_size = font_size_attr ? font_size_attr->ParseToFloat() : 24.0f;
diff --git a/src/ui/mapper/MeasureLengthMapper.cpp b/src/ui/mapper/MeasureLengthMapper.cpp
index 6a0f95e3..0dfcd033 100644
--- a/src/ui/mapper/MeasureLengthMapper.cpp
+++ b/src/ui/mapper/MeasureLengthMapper.cpp
@@ -22,7 +22,7 @@ render::MeasureLength MeasureLengthMapper::DoMapFromString(String str) {
 
 render::MeasureLength MeasureLengthMapper::DoMapFromXml(
     xml::XmlElementNode* node) {
-  auto value_attr = node->GetOptionalAttributeCaseInsensitive(u"value");
+  auto value_attr = node->GetOptionalAttributeValueCaseInsensitive(u"value");
   if (!value_attr) return {};
   return DoMapFromString(*value_attr);
 }
diff --git a/src/ui/mapper/PointMapper.cpp b/src/ui/mapper/PointMapper.cpp
index ca7729b4..4b0104d0 100644
--- a/src/ui/mapper/PointMapper.cpp
+++ b/src/ui/mapper/PointMapper.cpp
@@ -17,7 +17,7 @@ Point PointMapper::DoMapFromString(String str) {
 }
 
 Point PointMapper::DoMapFromXml(xml::XmlElementNode* node) {
-  auto value_attr = node->GetOptionalAttributeCaseInsensitive(u"value");
+  auto value_attr = node->GetOptionalAttributeValueCaseInsensitive(u"value");
   if (!value_attr) return {};
   return DoMapFromString(*value_attr);
 }
diff --git a/src/ui/mapper/SizeMapper.cpp b/src/ui/mapper/SizeMapper.cpp
index 0fcf1c53..4cbe2d38 100644
--- a/src/ui/mapper/SizeMapper.cpp
+++ b/src/ui/mapper/SizeMapper.cpp
@@ -17,7 +17,7 @@ Size SizeMapper::DoMapFromString(String str) {
 }
 
 Size SizeMapper::DoMapFromXml(xml::XmlElementNode* node) {
-  auto value_attr = node->GetOptionalAttributeCaseInsensitive(u"value");
+  auto value_attr = node->GetOptionalAttributeValueCaseInsensitive(u"value");
   if (!value_attr) return {};
   return DoMapFromString(*value_attr);
 }
diff --git a/src/ui/mapper/StringMapper.cpp b/src/ui/mapper/StringMapper.cpp
index 9e73b7f1..89893ce1 100644
--- a/src/ui/mapper/StringMapper.cpp
+++ b/src/ui/mapper/StringMapper.cpp
@@ -9,7 +9,7 @@ StringMapper::~StringMapper() {}
 String StringMapper::DoMapFromString(String str) { return std::move(str); }
 
 String StringMapper::DoMapFromXml(xml::XmlElementNode* node) {
-  auto value_attr = node->GetOptionalAttributeCaseInsensitive(u"value");
+  auto value_attr = node->GetOptionalAttributeValueCaseInsensitive(u"value");
   if (value_attr) return *value_attr;
   return {};
 }
diff --git a/src/ui/mapper/ThicknessMapper.cpp b/src/ui/mapper/ThicknessMapper.cpp
index 6ddd52ea..23be89b4 100644
--- a/src/ui/mapper/ThicknessMapper.cpp
+++ b/src/ui/mapper/ThicknessMapper.cpp
@@ -20,7 +20,7 @@ Thickness ThicknessMapper::DoMapFromString(String str) {
 }
 
 Thickness ThicknessMapper::DoMapFromXml(xml::XmlElementNode* node) {
-  auto value_attr = node->GetOptionalAttributeCaseInsensitive(u"value");
+  auto value_attr = node->GetOptionalAttributeValueCaseInsensitive(u"value");
   if (!value_attr) return {};
   return DoMapFromString(*value_attr);
 }
diff --git a/src/ui/mapper/style/CheckedConditionMapper.cpp b/src/ui/mapper/style/CheckedConditionMapper.cpp
index c4c8ad38..f61a3d44 100644
--- a/src/ui/mapper/style/CheckedConditionMapper.cpp
+++ b/src/ui/mapper/style/CheckedConditionMapper.cpp
@@ -10,7 +10,7 @@ bool CheckedConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
 
 ClonablePtr<ui::style::CheckedCondition> CheckedConditionMapper::DoMapFromXml(
     xml::XmlElementNode* node) {
-  auto value = node->GetAttributeCaseInsensitive(u"value");
+  auto value = node->GetAttributeValueCaseInsensitive(u"value");
   if (value.CaseInsensitiveEqual(u"true")) {
     return ui::style::CheckedCondition::Create(true);
   } else if (value.CaseInsensitiveEqual(u"false")) {
diff --git a/src/ui/mapper/style/ClickStateConditionMapper.cpp b/src/ui/mapper/style/ClickStateConditionMapper.cpp
index 7c1200ef..5b25de2c 100644
--- a/src/ui/mapper/style/ClickStateConditionMapper.cpp
+++ b/src/ui/mapper/style/ClickStateConditionMapper.cpp
@@ -13,7 +13,7 @@ bool ClickStateConditionMapper::XmlElementIsOfThisType(
 ClonablePtr<ui::style::ClickStateCondition>
 ClickStateConditionMapper::DoMapFromXml(xml::XmlElementNode *node) {
   auto state = helper::ClickState::None;
-  auto value_attr = node->GetOptionalAttributeCaseInsensitive(u"value");
+  auto value_attr = node->GetOptionalAttributeValueCaseInsensitive(u"value");
   if (value_attr) {
     if (value_attr->CaseInsensitiveEqual(u"none")) {
       state = helper::ClickState::None;
diff --git a/src/ui/mapper/style/FocusConditionMapper.cpp b/src/ui/mapper/style/FocusConditionMapper.cpp
index 5df4443d..b9e89e2e 100644
--- a/src/ui/mapper/style/FocusConditionMapper.cpp
+++ b/src/ui/mapper/style/FocusConditionMapper.cpp
@@ -10,7 +10,7 @@ bool FocusConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
 
 ClonablePtr<ui::style::FocusCondition> FocusConditionMapper::DoMapFromXml(
     xml::XmlElementNode* node) {
-  auto value = node->GetAttributeCaseInsensitive(u"value");
+  auto value = node->GetAttributeValueCaseInsensitive(u"value");
   if (value.CaseInsensitiveEqual(u"true")) {
     return ui::style::FocusCondition::Create(true);
   } else if (value.CaseInsensitiveEqual(u"false")) {
diff --git a/src/ui/mapper/style/HoverConditionMapper.cpp b/src/ui/mapper/style/HoverConditionMapper.cpp
index 4f92e9f6..97767b14 100644
--- a/src/ui/mapper/style/HoverConditionMapper.cpp
+++ b/src/ui/mapper/style/HoverConditionMapper.cpp
@@ -11,7 +11,7 @@ bool HoverConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
 
 ClonablePtr<HoverCondition> HoverConditionMapper::DoMapFromXml(
     xml::XmlElementNode* node) {
-  auto value = node->GetAttributeCaseInsensitive(u"value");
+  auto value = node->GetAttributeValueCaseInsensitive(u"value");
   if (value.CaseInsensitiveEqual(u"true")) {
     return ui::style::HoverCondition::Create(true);
   } else if (value.CaseInsensitiveEqual(u"false")) {
diff --git a/src/ui/mapper/style/MarginStylerMapper.cpp b/src/ui/mapper/style/MarginStylerMapper.cpp
index cb2fd7ee..4c5952bd 100644
--- a/src/ui/mapper/style/MarginStylerMapper.cpp
+++ b/src/ui/mapper/style/MarginStylerMapper.cpp
@@ -14,7 +14,7 @@ ClonablePtr<ui::style::MarginStyler> MarginStylerMapper::DoMapFromXml(
 
   auto thickness_mapper = MapperRegistry::GetInstance()->GetMapper<Thickness>();
 
-  auto value_attribute = node->GetOptionalAttributeCaseInsensitive(u"value");
+  auto value_attribute = node->GetOptionalAttributeValueCaseInsensitive(u"value");
   if (value_attribute) {
     thickness = thickness_mapper->MapFromString(*value_attribute);
   }
diff --git a/src/ui/mapper/style/PaddingStylerMapper.cpp b/src/ui/mapper/style/PaddingStylerMapper.cpp
index cd316cd2..919669b7 100644
--- a/src/ui/mapper/style/PaddingStylerMapper.cpp
+++ b/src/ui/mapper/style/PaddingStylerMapper.cpp
@@ -16,7 +16,7 @@ ClonablePtr<ui::style::PaddingStyler> PaddingStylerMapper::DoMapFromXml(
 
   auto thickness_mapper = MapperRegistry::GetInstance()->GetMapper<Thickness>();
 
-  auto value_attribute = node->GetOptionalAttributeCaseInsensitive(u"value");
+  auto value_attribute = node->GetOptionalAttributeValueCaseInsensitive(u"value");
   if (value_attribute) {
     thickness = thickness_mapper->MapFromString(*value_attribute);
   }
diff --git a/src/ui/mapper/style/PreferredSizeStylerMapper.cpp b/src/ui/mapper/style/PreferredSizeStylerMapper.cpp
index 9e03dfeb..e7cfc35b 100644
--- a/src/ui/mapper/style/PreferredSizeStylerMapper.cpp
+++ b/src/ui/mapper/style/PreferredSizeStylerMapper.cpp
@@ -16,12 +16,12 @@ PreferredSizeStylerMapper::DoMapFromXml(xml::XmlElementNode* node) {
   auto measure_length_mapper =
       MapperRegistry::GetInstance()->GetMapper<render::MeasureLength>();
 
-  auto width_attribute = node->GetOptionalAttributeCaseInsensitive(u"width");
+  auto width_attribute = node->GetOptionalAttributeValueCaseInsensitive(u"width");
   if (width_attribute) {
     size.width = measure_length_mapper->MapFromString(*width_attribute);
   }
 
-  auto height_attribute = node->GetOptionalAttributeCaseInsensitive(u"height");
+  auto height_attribute = node->GetOptionalAttributeValueCaseInsensitive(u"height");
   if (height_attribute) {
     size.height = measure_length_mapper->MapFromString(*height_attribute);
   }