8 files changed, 9 insertions, 9 deletions
diff --git a/include/cru/ui/mapper/ColorMapper.h b/include/cru/ui/mapper/ColorMapper.h
index 785f1ca9..e3846712 100644
--- a/include/cru/ui/mapper/ColorMapper.h
+++ b/include/cru/ui/mapper/ColorMapper.h
@@ -13,7 +13,7 @@ class CRU_UI_API ColorMapper : public BasicMapper<Color> {
   bool XmlElementIsOfThisType(xml::XmlElementNode* node) override;
 
  protected:
-  Color DoMapFromString(String str) override;
+  Color DoMapFromString(std::string str) override;
   Color DoMapFromXml(xml::XmlElementNode* node) override;
 };
 }  // namespace cru::ui::mapper
diff --git a/include/cru/ui/mapper/CursorMapper.h b/include/cru/ui/mapper/CursorMapper.h
index 8cce53c4..951291c1 100644
--- a/include/cru/ui/mapper/CursorMapper.h
+++ b/include/cru/ui/mapper/CursorMapper.h
@@ -14,7 +14,7 @@ class CRU_UI_API CursorMapper : public BasicSharedPtrMapper<platform::gui::ICurs
   bool XmlElementIsOfThisType(xml::XmlElementNode* node) override;
 
  protected:
-  std::shared_ptr<platform::gui::ICursor> DoMapFromString(String str) override;
+  std::shared_ptr<platform::gui::ICursor> DoMapFromString(std::string str) override;
   std::shared_ptr<platform::gui::ICursor> DoMapFromXml(
       xml::XmlElementNode* node) override;
 };
diff --git a/include/cru/ui/mapper/Mapper.h b/include/cru/ui/mapper/Mapper.h
index d391fac3..f7467120 100644
--- a/include/cru/ui/mapper/Mapper.h
+++ b/include/cru/ui/mapper/Mapper.h
@@ -64,7 +64,7 @@ class CRU_UI_API BasicMapper : public MapperBase {
 
   ~BasicMapper() override = default;
 
-  virtual T MapFromString(String str) {
+  virtual T MapFromString(std::string str) {
     if (!SupportMapFromString()) {
       throw Exception("This mapper does not support map from string.");
     }
@@ -85,7 +85,7 @@ class CRU_UI_API BasicMapper : public MapperBase {
   }
 
  protected:
-  virtual T DoMapFromString(String str) { return {}; }
+  virtual T DoMapFromString(std::string str) { return {}; }
   virtual T DoMapFromXml(xml::XmlElementNode* node) { return {}; }
 };
 
diff --git a/include/cru/ui/mapper/MeasureLengthMapper.h b/include/cru/ui/mapper/MeasureLengthMapper.h
index 9b7ecfd8..347d69ae 100644
--- a/include/cru/ui/mapper/MeasureLengthMapper.h
+++ b/include/cru/ui/mapper/MeasureLengthMapper.h
@@ -14,7 +14,7 @@ class CRU_UI_API MeasureLengthMapper
   bool XmlElementIsOfThisType(xml::XmlElementNode* node) override;
 
  protected:
-  render::MeasureLength DoMapFromString(String str) override;
+  render::MeasureLength DoMapFromString(std::string str) override;
   render::MeasureLength DoMapFromXml(xml::XmlElementNode* node) override;
 };
 }  // namespace cru::ui::mapper
diff --git a/include/cru/ui/mapper/PointMapper.h b/include/cru/ui/mapper/PointMapper.h
index 83dd135b..b3c97df0 100644
--- a/include/cru/ui/mapper/PointMapper.h
+++ b/include/cru/ui/mapper/PointMapper.h
@@ -12,7 +12,7 @@ class CRU_UI_API PointMapper : public BasicMapper<Point> {
   bool XmlElementIsOfThisType(xml::XmlElementNode* node) override;
 
  protected:
-  Point DoMapFromString(String str) override;
+  Point DoMapFromString(std::string str) override;
   Point DoMapFromXml(xml::XmlElementNode* node) override;
 };
 }  // namespace cru::ui::mapper
diff --git a/include/cru/ui/mapper/SizeMapper.h b/include/cru/ui/mapper/SizeMapper.h
index 6cf3eb9a..4d781ee3 100644
--- a/include/cru/ui/mapper/SizeMapper.h
+++ b/include/cru/ui/mapper/SizeMapper.h
@@ -12,7 +12,7 @@ class CRU_UI_API SizeMapper : public BasicMapper<Size> {
   bool XmlElementIsOfThisType(xml::XmlElementNode* node) override;
 
  protected:
-  Size DoMapFromString(String str) override;
+  Size DoMapFromString(std::string str) override;
   Size DoMapFromXml(xml::XmlElementNode* node) override;
 };
 }  // namespace cru::ui::mapper
diff --git a/include/cru/ui/mapper/StringMapper.h b/include/cru/ui/mapper/StringMapper.h
index 8a907591..bfb7314b 100644
--- a/include/cru/ui/mapper/StringMapper.h
+++ b/include/cru/ui/mapper/StringMapper.h
@@ -12,7 +12,7 @@ class CRU_UI_API StringMapper : public BasicMapper<String> {
   bool SupportMapFromXml() override { return true; }
 
  protected:
-  String DoMapFromString(String str) override;
+  String DoMapFromString(std::string str) override;
   String DoMapFromXml(xml::XmlElementNode* node) override;
 };
 }  // namespace cru::ui::mapper
diff --git a/include/cru/ui/mapper/ThicknessMapper.h b/include/cru/ui/mapper/ThicknessMapper.h
index fab1e5d3..84b6b036 100644
--- a/include/cru/ui/mapper/ThicknessMapper.h
+++ b/include/cru/ui/mapper/ThicknessMapper.h
@@ -16,7 +16,7 @@ class CRU_UI_API ThicknessMapper : public BasicMapper<Thickness> {
   bool XmlElementIsOfThisType(xml::XmlElementNode* node) override;
 
  protected:
-  Thickness DoMapFromString(String str) override;
+  Thickness DoMapFromString(std::string str) override;
   Thickness DoMapFromXml(xml::XmlElementNode* node) override;
 };
 }  // namespace cru::ui::mapper