From 4e0b7d82cd64ef8016dcb49247a8a5e4de8a0b3d Mon Sep 17 00:00:00 2001
From: Yuqian Yang <crupest@crupest.life>
Date: Sun, 16 Nov 2025 10:37:36 +0800
Subject: Rename ClonePtr, update theme.

---
 include/cru/ui/mapper/Mapper.h                          | 4 ++--
 include/cru/ui/mapper/MapperRegistry.h                  | 4 ++--
 include/cru/ui/mapper/style/AndConditionMapper.h        | 6 +++---
 include/cru/ui/mapper/style/BorderStylerMapper.h        | 8 ++++----
 include/cru/ui/mapper/style/CheckedConditionMapper.h    | 6 +++---
 include/cru/ui/mapper/style/ClickStateConditionMapper.h | 6 +++---
 include/cru/ui/mapper/style/ContentBrushStylerMapper.h  | 6 +++---
 include/cru/ui/mapper/style/CursorStylerMapper.h        | 6 +++---
 include/cru/ui/mapper/style/FocusConditionMapper.h      | 6 +++---
 include/cru/ui/mapper/style/FontStylerMapper.h          | 6 +++---
 include/cru/ui/mapper/style/HoverConditionMapper.h      | 6 +++---
 include/cru/ui/mapper/style/IConditionMapper.h          | 4 ++--
 include/cru/ui/mapper/style/IStylerMapper.h             | 4 ++--
 include/cru/ui/mapper/style/MarginStylerMapper.h        | 6 +++---
 include/cru/ui/mapper/style/NoConditionMapper.h         | 8 ++++----
 include/cru/ui/mapper/style/OrConditionMapper.h         | 6 +++---
 include/cru/ui/mapper/style/PaddingStylerMapper.h       | 6 +++---
 include/cru/ui/mapper/style/PreferredSizeStylerMapper.h | 6 +++---
 include/cru/ui/mapper/style/StyleRuleMapper.h           | 6 +++---
 19 files changed, 55 insertions(+), 55 deletions(-)

(limited to 'include/cru/ui/mapper')

diff --git a/include/cru/ui/mapper/Mapper.h b/include/cru/ui/mapper/Mapper.h
index 88081816..164329d3 100644
--- a/include/cru/ui/mapper/Mapper.h
+++ b/include/cru/ui/mapper/Mapper.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "../Base.h"
 
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/base/xml/XmlNode.h"
 
 #include <memory>
@@ -88,5 +88,5 @@ template <typename T>
 using BasicSharedPtrMapper = BasicMapper<std::shared_ptr<T>>;
 
 template <typename T>
-using BasicClonablePtrMapper = BasicMapper<ClonablePtr<T>>;
+using BasicClonePtrMapper = BasicMapper<ClonePtr<T>>;
 }  // namespace cru::ui::mapper
diff --git a/include/cru/ui/mapper/MapperRegistry.h b/include/cru/ui/mapper/MapperRegistry.h
index ca1170b5..fae90b40 100644
--- a/include/cru/ui/mapper/MapperRegistry.h
+++ b/include/cru/ui/mapper/MapperRegistry.h
@@ -35,8 +35,8 @@ class CRU_UI_API MapperRegistry {
   }
 
   template <typename T>
-  BasicClonablePtrMapper<T>* GetClonablePtrMapper() const {
-    return GetMapper<ClonablePtr<T>>();
+  BasicClonePtrMapper<T>* GetClonePtrMapper() const {
+    return GetMapper<ClonePtr<T>>();
   }
 
   template <typename T>
diff --git a/include/cru/ui/mapper/style/AndConditionMapper.h b/include/cru/ui/mapper/style/AndConditionMapper.h
index 65d0337c..5569e0fc 100644
--- a/include/cru/ui/mapper/style/AndConditionMapper.h
+++ b/include/cru/ui/mapper/style/AndConditionMapper.h
@@ -4,7 +4,7 @@
 
 namespace cru::ui::mapper::style {
 class CRU_UI_API AndConditionMapper
-    : public BasicClonablePtrMapper<ui::style::AndCondition>,
+    : public BasicClonePtrMapper<ui::style::AndCondition>,
       public virtual IConditionMapper {
  public:
   CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(AndConditionMapper)
@@ -13,13 +13,13 @@ class CRU_UI_API AndConditionMapper
   bool SupportMapFromXml() override { return true; }
   bool XmlElementIsOfThisType(xml::XmlElementNode* node) override;
 
-  ClonablePtr<ui::style::Condition> MapConditionFromXml(
+  ClonePtr<ui::style::Condition> MapConditionFromXml(
       xml::XmlElementNode* node) override {
     return MapFromXml(node);
   }
 
  protected:
-  ClonablePtr<ui::style::AndCondition> DoMapFromXml(
+  ClonePtr<ui::style::AndCondition> DoMapFromXml(
       xml::XmlElementNode* node) override;
 };
 }  // namespace cru::ui::mapper::style
diff --git a/include/cru/ui/mapper/style/BorderStylerMapper.h b/include/cru/ui/mapper/style/BorderStylerMapper.h
index 8cb4d392..c1554255 100644
--- a/include/cru/ui/mapper/style/BorderStylerMapper.h
+++ b/include/cru/ui/mapper/style/BorderStylerMapper.h
@@ -1,13 +1,13 @@
 #pragma once
 #include "../Mapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/ui/mapper/style/IStylerMapper.h"
 #include "cru/ui/style/Styler.h"
 #include "cru/base/xml/XmlNode.h"
 
 namespace cru::ui::mapper::style {
 class CRU_UI_API BorderStylerMapper
-    : public BasicClonablePtrMapper<ui::style::BorderStyler>,
+    : public BasicClonePtrMapper<ui::style::BorderStyler>,
       public virtual IStylerMapper {
  public:
   CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(BorderStylerMapper)
@@ -16,13 +16,13 @@ class CRU_UI_API BorderStylerMapper
   bool SupportMapFromXml() override { return true; }
   bool XmlElementIsOfThisType(xml::XmlElementNode* node) override;
 
-  ClonablePtr<ui::style::Styler> MapStylerFromXml(
+  ClonePtr<ui::style::Styler> MapStylerFromXml(
       xml::XmlElementNode* node) override {
     return MapFromXml(node);
   }
 
  protected:
-  ClonablePtr<ui::style::BorderStyler> DoMapFromXml(
+  ClonePtr<ui::style::BorderStyler> DoMapFromXml(
       xml::XmlElementNode* node) override;
 };
 }  // namespace cru::ui::mapper::style
diff --git a/include/cru/ui/mapper/style/CheckedConditionMapper.h b/include/cru/ui/mapper/style/CheckedConditionMapper.h
index 1bed9597..87d892a7 100644
--- a/include/cru/ui/mapper/style/CheckedConditionMapper.h
+++ b/include/cru/ui/mapper/style/CheckedConditionMapper.h
@@ -5,7 +5,7 @@
 
 namespace cru::ui::mapper::style {
 class CRU_UI_API CheckedConditionMapper
-    : public BasicClonablePtrMapper<ui::style::CheckedCondition>,
+    : public BasicClonePtrMapper<ui::style::CheckedCondition>,
       public virtual IConditionMapper {
  public:
   CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(CheckedConditionMapper)
@@ -14,13 +14,13 @@ class CRU_UI_API CheckedConditionMapper
   bool SupportMapFromXml() override { return true; }
   bool XmlElementIsOfThisType(xml::XmlElementNode* node) override;
 
-  ClonablePtr<ui::style::Condition> MapConditionFromXml(
+  ClonePtr<ui::style::Condition> MapConditionFromXml(
       xml::XmlElementNode* node) override {
     return MapFromXml(node);
   }
 
  protected:
-  ClonablePtr<ui::style::CheckedCondition> DoMapFromXml(
+  ClonePtr<ui::style::CheckedCondition> DoMapFromXml(
       xml::XmlElementNode* node) override;
 };
 }  // namespace cru::ui::mapper::style
diff --git a/include/cru/ui/mapper/style/ClickStateConditionMapper.h b/include/cru/ui/mapper/style/ClickStateConditionMapper.h
index a54a3ad4..13c72a36 100644
--- a/include/cru/ui/mapper/style/ClickStateConditionMapper.h
+++ b/include/cru/ui/mapper/style/ClickStateConditionMapper.h
@@ -5,7 +5,7 @@
 
 namespace cru::ui::mapper::style {
 class CRU_UI_API ClickStateConditionMapper
-    : public BasicClonablePtrMapper<ui::style::ClickStateCondition>,
+    : public BasicClonePtrMapper<ui::style::ClickStateCondition>,
       public virtual IConditionMapper {
  public:
   CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(ClickStateConditionMapper)
@@ -14,13 +14,13 @@ class CRU_UI_API ClickStateConditionMapper
   bool SupportMapFromXml() override { return true; }
   bool XmlElementIsOfThisType(xml::XmlElementNode* node) override;
 
-  ClonablePtr<ui::style::Condition> MapConditionFromXml(
+  ClonePtr<ui::style::Condition> MapConditionFromXml(
       xml::XmlElementNode* node) override {
     return MapFromXml(node);
   }
 
  public:
-  ClonablePtr<ui::style::ClickStateCondition> DoMapFromXml(
+  ClonePtr<ui::style::ClickStateCondition> DoMapFromXml(
       xml::XmlElementNode* node) override;
 };
 }  // namespace cru::ui::mapper::style
diff --git a/include/cru/ui/mapper/style/ContentBrushStylerMapper.h b/include/cru/ui/mapper/style/ContentBrushStylerMapper.h
index 04b19bf8..d15eb28a 100644
--- a/include/cru/ui/mapper/style/ContentBrushStylerMapper.h
+++ b/include/cru/ui/mapper/style/ContentBrushStylerMapper.h
@@ -4,7 +4,7 @@
 
 namespace cru::ui::mapper::style {
 class ContentBrushStylerMapper
-    : public BasicClonablePtrMapper<ui::style::ContentBrushStyler>,
+    : public BasicClonePtrMapper<ui::style::ContentBrushStyler>,
       public virtual IStylerMapper {
  public:
   ContentBrushStylerMapper();
@@ -13,13 +13,13 @@ class ContentBrushStylerMapper
  public:
   bool SupportMapFromXml() override { return true; }
 
-  ClonablePtr<ui::style::Styler> MapStylerFromXml(
+  ClonePtr<ui::style::Styler> MapStylerFromXml(
       xml::XmlElementNode* node) override {
     return MapFromXml(node);
   }
 
  protected:
-  ClonablePtr<ui::style::ContentBrushStyler> DoMapFromXml(
+  ClonePtr<ui::style::ContentBrushStyler> DoMapFromXml(
       xml::XmlElementNode* node) override;
 };
 }  // namespace cru::ui::mapper::style
diff --git a/include/cru/ui/mapper/style/CursorStylerMapper.h b/include/cru/ui/mapper/style/CursorStylerMapper.h
index c88a5170..54ade7f0 100644
--- a/include/cru/ui/mapper/style/CursorStylerMapper.h
+++ b/include/cru/ui/mapper/style/CursorStylerMapper.h
@@ -5,7 +5,7 @@
 
 namespace cru::ui::mapper::style {
 class CRU_UI_API CursorStylerMapper
-    : public BasicClonablePtrMapper<ui::style::CursorStyler>,
+    : public BasicClonePtrMapper<ui::style::CursorStyler>,
       public virtual IStylerMapper {
  public:
   CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(CursorStylerMapper)
@@ -14,13 +14,13 @@ class CRU_UI_API CursorStylerMapper
   bool SupportMapFromXml() override { return true; }
   bool XmlElementIsOfThisType(xml::XmlElementNode* node) override;
 
-  ClonablePtr<ui::style::Styler> MapStylerFromXml(
+  ClonePtr<ui::style::Styler> MapStylerFromXml(
       xml::XmlElementNode* node) override {
     return MapFromXml(node);
   }
 
  protected:
-  ClonablePtr<ui::style::CursorStyler> DoMapFromXml(
+  ClonePtr<ui::style::CursorStyler> DoMapFromXml(
       xml::XmlElementNode* node) override;
 };
 }  // namespace cru::ui::mapper::style
diff --git a/include/cru/ui/mapper/style/FocusConditionMapper.h b/include/cru/ui/mapper/style/FocusConditionMapper.h
index 6a7c56a2..e18150cf 100644
--- a/include/cru/ui/mapper/style/FocusConditionMapper.h
+++ b/include/cru/ui/mapper/style/FocusConditionMapper.h
@@ -5,7 +5,7 @@
 
 namespace cru::ui::mapper::style {
 class CRU_UI_API FocusConditionMapper
-    : public BasicClonablePtrMapper<ui::style::FocusCondition>,
+    : public BasicClonePtrMapper<ui::style::FocusCondition>,
       public virtual IConditionMapper {
  public:
   CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(FocusConditionMapper)
@@ -14,13 +14,13 @@ class CRU_UI_API FocusConditionMapper
   bool SupportMapFromXml() override { return true; }
   bool XmlElementIsOfThisType(xml::XmlElementNode* node) override;
 
-  ClonablePtr<ui::style::Condition> MapConditionFromXml(
+  ClonePtr<ui::style::Condition> MapConditionFromXml(
       xml::XmlElementNode* node) override {
     return MapFromXml(node);
   }
 
  protected:
-  ClonablePtr<ui::style::FocusCondition> DoMapFromXml(
+  ClonePtr<ui::style::FocusCondition> DoMapFromXml(
       xml::XmlElementNode* node) override;
 };
 }  // namespace cru::ui::mapper::style
diff --git a/include/cru/ui/mapper/style/FontStylerMapper.h b/include/cru/ui/mapper/style/FontStylerMapper.h
index 34c94b73..6a79eb99 100644
--- a/include/cru/ui/mapper/style/FontStylerMapper.h
+++ b/include/cru/ui/mapper/style/FontStylerMapper.h
@@ -3,7 +3,7 @@
 #include "IStylerMapper.h"
 
 namespace cru::ui::mapper::style {
-class FontStylerMapper : public BasicClonablePtrMapper<ui::style::FontStyler>,
+class FontStylerMapper : public BasicClonePtrMapper<ui::style::FontStyler>,
                          public virtual IStylerMapper {
  public:
   FontStylerMapper();
@@ -12,13 +12,13 @@ class FontStylerMapper : public BasicClonablePtrMapper<ui::style::FontStyler>,
  public:
   bool SupportMapFromXml() override { return true; }
 
-  ClonablePtr<ui::style::Styler> MapStylerFromXml(
+  ClonePtr<ui::style::Styler> MapStylerFromXml(
       xml::XmlElementNode* node) override {
     return MapFromXml(node);
   }
 
  protected:
-  ClonablePtr<ui::style::FontStyler> DoMapFromXml(
+  ClonePtr<ui::style::FontStyler> DoMapFromXml(
       xml::XmlElementNode* node) override;
 };
 }  // namespace cru::ui::mapper::style
diff --git a/include/cru/ui/mapper/style/HoverConditionMapper.h b/include/cru/ui/mapper/style/HoverConditionMapper.h
index d3aa0b60..faa889e7 100644
--- a/include/cru/ui/mapper/style/HoverConditionMapper.h
+++ b/include/cru/ui/mapper/style/HoverConditionMapper.h
@@ -5,7 +5,7 @@
 
 namespace cru::ui::mapper::style {
 class CRU_UI_API HoverConditionMapper
-    : public BasicClonablePtrMapper<ui::style::HoverCondition>,
+    : public BasicClonePtrMapper<ui::style::HoverCondition>,
       public virtual IConditionMapper {
  public:
   CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(HoverConditionMapper)
@@ -14,13 +14,13 @@ class CRU_UI_API HoverConditionMapper
   bool SupportMapFromXml() override { return true; }
   bool XmlElementIsOfThisType(xml::XmlElementNode* node) override;
 
-  ClonablePtr<ui::style::Condition> MapConditionFromXml(
+  ClonePtr<ui::style::Condition> MapConditionFromXml(
       xml::XmlElementNode* node) override {
     return MapFromXml(node);
   }
 
  protected:
-  ClonablePtr<ui::style::HoverCondition> DoMapFromXml(
+  ClonePtr<ui::style::HoverCondition> DoMapFromXml(
       xml::XmlElementNode* node) override;
 };
 }  // namespace cru::ui::mapper::style
diff --git a/include/cru/ui/mapper/style/IConditionMapper.h b/include/cru/ui/mapper/style/IConditionMapper.h
index 7bfd1427..27c09e82 100644
--- a/include/cru/ui/mapper/style/IConditionMapper.h
+++ b/include/cru/ui/mapper/style/IConditionMapper.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "../../Base.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/ui/mapper/Mapper.h"
 #include "cru/ui/style/Condition.h"
 #include "cru/base/xml/XmlNode.h"
@@ -11,7 +11,7 @@ struct CRU_UI_API IConditionMapper : virtual Interface {
     return dynamic_cast<MapperBase*>(this)->XmlElementIsOfThisType(node);
   }
 
-  virtual ClonablePtr<ui::style::Condition> MapConditionFromXml(
+  virtual ClonePtr<ui::style::Condition> MapConditionFromXml(
       xml::XmlElementNode* node) = 0;
 };
 }  // namespace cru::ui::mapper::style
diff --git a/include/cru/ui/mapper/style/IStylerMapper.h b/include/cru/ui/mapper/style/IStylerMapper.h
index 4aa43665..ce9c4243 100644
--- a/include/cru/ui/mapper/style/IStylerMapper.h
+++ b/include/cru/ui/mapper/style/IStylerMapper.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "../../Base.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/ui/mapper/Mapper.h"
 #include "cru/ui/style/Styler.h"
 #include "cru/base/xml/XmlNode.h"
@@ -11,7 +11,7 @@ struct CRU_UI_API IStylerMapper : virtual Interface {
     return dynamic_cast<MapperBase*>(this)->XmlElementIsOfThisType(node);
   }
 
-  virtual ClonablePtr<ui::style::Styler> MapStylerFromXml(
+  virtual ClonePtr<ui::style::Styler> MapStylerFromXml(
       xml::XmlElementNode* node) = 0;
 };
 }  // namespace cru::ui::mapper::style
diff --git a/include/cru/ui/mapper/style/MarginStylerMapper.h b/include/cru/ui/mapper/style/MarginStylerMapper.h
index 39d55fb6..b20452a9 100644
--- a/include/cru/ui/mapper/style/MarginStylerMapper.h
+++ b/include/cru/ui/mapper/style/MarginStylerMapper.h
@@ -5,7 +5,7 @@
 
 namespace cru::ui::mapper::style {
 class CRU_UI_API MarginStylerMapper
-    : public BasicClonablePtrMapper<ui::style::MarginStyler>,
+    : public BasicClonePtrMapper<ui::style::MarginStyler>,
       public virtual IStylerMapper {
  public:
   MarginStylerMapper();
@@ -14,13 +14,13 @@ class CRU_UI_API MarginStylerMapper
  public:
   bool SupportMapFromXml() override { return true; }
 
-  ClonablePtr<ui::style::Styler> MapStylerFromXml(
+  ClonePtr<ui::style::Styler> MapStylerFromXml(
       xml::XmlElementNode* node) override {
     return MapFromXml(node);
   }
 
  protected:
-  ClonablePtr<ui::style::MarginStyler> DoMapFromXml(
+  ClonePtr<ui::style::MarginStyler> DoMapFromXml(
       xml::XmlElementNode* node) override;
 };
 }  // namespace cru::ui::mapper::style
diff --git a/include/cru/ui/mapper/style/NoConditionMapper.h b/include/cru/ui/mapper/style/NoConditionMapper.h
index bd2adf14..8acb79e0 100644
--- a/include/cru/ui/mapper/style/NoConditionMapper.h
+++ b/include/cru/ui/mapper/style/NoConditionMapper.h
@@ -2,13 +2,13 @@
 #include "../Mapper.h"
 #include "IConditionMapper.h"
 #include "cru/base/Base.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/ui/style/Condition.h"
 #include "cru/base/xml/XmlNode.h"
 
 namespace cru::ui::mapper::style {
 class CRU_UI_API NoConditionMapper
-    : public BasicClonablePtrMapper<ui::style::NoCondition>,
+    : public BasicClonePtrMapper<ui::style::NoCondition>,
       public virtual IConditionMapper {
  public:
   CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(NoConditionMapper)
@@ -17,13 +17,13 @@ class CRU_UI_API NoConditionMapper
   bool SupportMapFromXml() override { return true; }
   bool XmlElementIsOfThisType(xml::XmlElementNode* node) override;
 
-  ClonablePtr<ui::style::Condition> MapConditionFromXml(
+  ClonePtr<ui::style::Condition> MapConditionFromXml(
       xml::XmlElementNode* node) override {
     return MapFromXml(node);
   }
 
  protected:
-  ClonablePtr<ui::style::NoCondition> DoMapFromXml(
+  ClonePtr<ui::style::NoCondition> DoMapFromXml(
       xml::XmlElementNode* node) override;
 };
 }  // namespace cru::ui::mapper::style
diff --git a/include/cru/ui/mapper/style/OrConditionMapper.h b/include/cru/ui/mapper/style/OrConditionMapper.h
index de8e0695..0aa5b241 100644
--- a/include/cru/ui/mapper/style/OrConditionMapper.h
+++ b/include/cru/ui/mapper/style/OrConditionMapper.h
@@ -4,7 +4,7 @@
 
 namespace cru::ui::mapper::style {
 class CRU_UI_API OrConditionMapper
-    : public BasicClonablePtrMapper<ui::style::OrCondition>,
+    : public BasicClonePtrMapper<ui::style::OrCondition>,
       public virtual IConditionMapper {
  public:
   CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(OrConditionMapper)
@@ -13,13 +13,13 @@ class CRU_UI_API OrConditionMapper
   bool SupportMapFromXml() override { return true; }
   bool XmlElementIsOfThisType(xml::XmlElementNode* node) override;
 
-  ClonablePtr<ui::style::Condition> MapConditionFromXml(
+  ClonePtr<ui::style::Condition> MapConditionFromXml(
       xml::XmlElementNode* node) override {
     return MapFromXml(node);
   }
 
  protected:
-  ClonablePtr<ui::style::OrCondition> DoMapFromXml(
+  ClonePtr<ui::style::OrCondition> DoMapFromXml(
       xml::XmlElementNode* node) override;
 };
 }  // namespace cru::ui::mapper::style
diff --git a/include/cru/ui/mapper/style/PaddingStylerMapper.h b/include/cru/ui/mapper/style/PaddingStylerMapper.h
index e7515ec1..bf0c5650 100644
--- a/include/cru/ui/mapper/style/PaddingStylerMapper.h
+++ b/include/cru/ui/mapper/style/PaddingStylerMapper.h
@@ -5,7 +5,7 @@
 
 namespace cru::ui::mapper::style {
 class CRU_UI_API PaddingStylerMapper
-    : public BasicClonablePtrMapper<ui::style::PaddingStyler>,
+    : public BasicClonePtrMapper<ui::style::PaddingStyler>,
       public virtual IStylerMapper {
  public:
   PaddingStylerMapper();
@@ -14,13 +14,13 @@ class CRU_UI_API PaddingStylerMapper
  public:
   bool SupportMapFromXml() override { return true; }
 
-  ClonablePtr<ui::style::Styler> MapStylerFromXml(
+  ClonePtr<ui::style::Styler> MapStylerFromXml(
       xml::XmlElementNode* node) override {
     return MapFromXml(node);
   }
 
  protected:
-  ClonablePtr<ui::style::PaddingStyler> DoMapFromXml(
+  ClonePtr<ui::style::PaddingStyler> DoMapFromXml(
       xml::XmlElementNode* node) override;
 };
 }  // namespace cru::ui::mapper::style
diff --git a/include/cru/ui/mapper/style/PreferredSizeStylerMapper.h b/include/cru/ui/mapper/style/PreferredSizeStylerMapper.h
index f46b70d5..ee4f5705 100644
--- a/include/cru/ui/mapper/style/PreferredSizeStylerMapper.h
+++ b/include/cru/ui/mapper/style/PreferredSizeStylerMapper.h
@@ -5,7 +5,7 @@
 
 namespace cru::ui::mapper::style {
 class CRU_UI_API PreferredSizeStylerMapper
-    : public BasicClonablePtrMapper<ui::style::PreferredSizeStyler>,
+    : public BasicClonePtrMapper<ui::style::PreferredSizeStyler>,
       public virtual IStylerMapper {
  public:
   CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(PreferredSizeStylerMapper)
@@ -14,13 +14,13 @@ class CRU_UI_API PreferredSizeStylerMapper
   bool SupportMapFromXml() override { return true; }
   bool XmlElementIsOfThisType(xml::XmlElementNode* node) override;
 
-  ClonablePtr<ui::style::Styler> MapStylerFromXml(
+  ClonePtr<ui::style::Styler> MapStylerFromXml(
       xml::XmlElementNode* node) override {
     return MapFromXml(node);
   }
 
  protected:
-  ClonablePtr<ui::style::PreferredSizeStyler> DoMapFromXml(
+  ClonePtr<ui::style::PreferredSizeStyler> DoMapFromXml(
       xml::XmlElementNode* node) override;
 };
 }  // namespace cru::ui::mapper::style
diff --git a/include/cru/ui/mapper/style/StyleRuleMapper.h b/include/cru/ui/mapper/style/StyleRuleMapper.h
index b4cb95e7..5622d0f4 100644
--- a/include/cru/ui/mapper/style/StyleRuleMapper.h
+++ b/include/cru/ui/mapper/style/StyleRuleMapper.h
@@ -1,12 +1,12 @@
 #pragma once
 #include "../Mapper.h"
 #include "cru/base/Base.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/ui/style/StyleRule.h"
 #include "cru/base/xml/XmlNode.h"
 
 namespace cru::ui::mapper::style {
-class CRU_UI_API StyleRuleMapper : public BasicClonablePtrMapper<ui::style::StyleRule> {
+class CRU_UI_API StyleRuleMapper : public BasicClonePtrMapper<ui::style::StyleRule> {
   CRU_DEFINE_CLASS_LOG_TAG("StyleRuleMapper")
  public:
   CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(StyleRuleMapper)
@@ -16,7 +16,7 @@ class CRU_UI_API StyleRuleMapper : public BasicClonablePtrMapper<ui::style::Styl
   bool XmlElementIsOfThisType(xml::XmlElementNode* node) override;
 
  protected:
-  ClonablePtr<ui::style::StyleRule> DoMapFromXml(
+  ClonePtr<ui::style::StyleRule> DoMapFromXml(
       xml::XmlElementNode* node) override;
 };
 }  // namespace cru::ui::mapper::style
-- 
cgit v1.2.3