diff options
Diffstat (limited to 'include/cru/ui/mapper')
19 files changed, 21 insertions, 21 deletions
diff --git a/include/cru/ui/mapper/BrushMapper.h b/include/cru/ui/mapper/BrushMapper.h index be70e89e..0748c037 100644 --- a/include/cru/ui/mapper/BrushMapper.h +++ b/include/cru/ui/mapper/BrushMapper.h @@ -5,7 +5,7 @@ #include "cru/xml/XmlNode.h" namespace cru::ui::mapper { -class BrushMapper : public BasicRefMapper<platform::graphics::IBrush> { +class BrushMapper : public BasicSharedPtrMapper<platform::graphics::IBrush> { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(BrushMapper) diff --git a/include/cru/ui/mapper/CursorMapper.h b/include/cru/ui/mapper/CursorMapper.h index d98a798c..8cce53c4 100644 --- a/include/cru/ui/mapper/CursorMapper.h +++ b/include/cru/ui/mapper/CursorMapper.h @@ -4,7 +4,7 @@ #include "cru/xml/XmlNode.h" namespace cru::ui::mapper { -class CRU_UI_API CursorMapper : public BasicRefMapper<platform::gui::ICursor> { +class CRU_UI_API CursorMapper : public BasicSharedPtrMapper<platform::gui::ICursor> { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(CursorMapper); diff --git a/include/cru/ui/mapper/FontMapper.h b/include/cru/ui/mapper/FontMapper.h index 545b94d8..f6dbf56a 100644 --- a/include/cru/ui/mapper/FontMapper.h +++ b/include/cru/ui/mapper/FontMapper.h @@ -4,7 +4,7 @@ #include "cru/platform/graphics/Font.h" namespace cru::ui::mapper { -class FontMapper : public BasicRefMapper<platform::graphics::IFont> { +class FontMapper : public BasicSharedPtrMapper<platform::graphics::IFont> { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(FontMapper) diff --git a/include/cru/ui/mapper/Mapper.h b/include/cru/ui/mapper/Mapper.h index 5bf140cd..e059f9c0 100644 --- a/include/cru/ui/mapper/Mapper.h +++ b/include/cru/ui/mapper/Mapper.h @@ -90,8 +90,8 @@ class CRU_UI_API BasicMapper : public MapperBase { }; template <typename T> -using BasicRefMapper = BasicMapper<std::shared_ptr<T>>; +using BasicSharedPtrMapper = BasicMapper<std::shared_ptr<T>>; template <typename T> -using BasicPtrMapper = BasicMapper<ClonablePtr<T>>; +using BasicClonablePtrMapper = BasicMapper<ClonablePtr<T>>; } // namespace cru::ui::mapper diff --git a/include/cru/ui/mapper/MapperRegistry.h b/include/cru/ui/mapper/MapperRegistry.h index 29d26156..ca1170b5 100644 --- a/include/cru/ui/mapper/MapperRegistry.h +++ b/include/cru/ui/mapper/MapperRegistry.h @@ -30,12 +30,12 @@ class CRU_UI_API MapperRegistry { } template <typename T> - BasicRefMapper<T>* GetRefMapper() const { + BasicSharedPtrMapper<T>* GetSharedPtrMapper() const { return GetMapper<std::shared_ptr<T>>(); } template <typename T> - BasicPtrMapper<T>* GetPtrMapper() const { + BasicClonablePtrMapper<T>* GetClonablePtrMapper() const { return GetMapper<ClonablePtr<T>>(); } diff --git a/include/cru/ui/mapper/style/AndConditionMapper.h b/include/cru/ui/mapper/style/AndConditionMapper.h index 142637a7..65d0337c 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 BasicPtrMapper<ui::style::AndCondition>, + : public BasicClonablePtrMapper<ui::style::AndCondition>, public virtual IConditionMapper { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(AndConditionMapper) diff --git a/include/cru/ui/mapper/style/BorderStylerMapper.h b/include/cru/ui/mapper/style/BorderStylerMapper.h index da09989b..3cf78faa 100644 --- a/include/cru/ui/mapper/style/BorderStylerMapper.h +++ b/include/cru/ui/mapper/style/BorderStylerMapper.h @@ -7,7 +7,7 @@ namespace cru::ui::mapper::style { class CRU_UI_API BorderStylerMapper - : public BasicPtrMapper<ui::style::BorderStyler>, + : public BasicClonablePtrMapper<ui::style::BorderStyler>, public virtual IStylerMapper { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(BorderStylerMapper) diff --git a/include/cru/ui/mapper/style/CheckedConditionMapper.h b/include/cru/ui/mapper/style/CheckedConditionMapper.h index d62aba60..1bed9597 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 BasicPtrMapper<ui::style::CheckedCondition>, + : public BasicClonablePtrMapper<ui::style::CheckedCondition>, public virtual IConditionMapper { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(CheckedConditionMapper) diff --git a/include/cru/ui/mapper/style/ClickStateConditionMapper.h b/include/cru/ui/mapper/style/ClickStateConditionMapper.h index 0c25646c..a54a3ad4 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 BasicPtrMapper<ui::style::ClickStateCondition>, + : public BasicClonablePtrMapper<ui::style::ClickStateCondition>, public virtual IConditionMapper { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(ClickStateConditionMapper) diff --git a/include/cru/ui/mapper/style/CursorStylerMapper.h b/include/cru/ui/mapper/style/CursorStylerMapper.h index 37c3ade9..c88a5170 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 BasicPtrMapper<ui::style::CursorStyler>, + : public BasicClonablePtrMapper<ui::style::CursorStyler>, public virtual IStylerMapper { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(CursorStylerMapper) diff --git a/include/cru/ui/mapper/style/FocusConditionMapper.h b/include/cru/ui/mapper/style/FocusConditionMapper.h index bc7264d1..6a7c56a2 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 BasicPtrMapper<ui::style::FocusCondition>, + : public BasicClonablePtrMapper<ui::style::FocusCondition>, public virtual IConditionMapper { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(FocusConditionMapper) diff --git a/include/cru/ui/mapper/style/HoverConditionMapper.h b/include/cru/ui/mapper/style/HoverConditionMapper.h index c897f672..d3aa0b60 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 BasicPtrMapper<ui::style::HoverCondition>, + : public BasicClonablePtrMapper<ui::style::HoverCondition>, public virtual IConditionMapper { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(HoverConditionMapper) diff --git a/include/cru/ui/mapper/style/MarginStylerMapper.h b/include/cru/ui/mapper/style/MarginStylerMapper.h index 99e292b2..39d55fb6 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 BasicPtrMapper<ui::style::MarginStyler>, + : public BasicClonablePtrMapper<ui::style::MarginStyler>, public virtual IStylerMapper { public: MarginStylerMapper(); diff --git a/include/cru/ui/mapper/style/NoConditionMapper.h b/include/cru/ui/mapper/style/NoConditionMapper.h index bc7ce623..2103a268 100644 --- a/include/cru/ui/mapper/style/NoConditionMapper.h +++ b/include/cru/ui/mapper/style/NoConditionMapper.h @@ -8,7 +8,7 @@ namespace cru::ui::mapper::style { class CRU_UI_API NoConditionMapper - : public BasicPtrMapper<ui::style::NoCondition>, + : public BasicClonablePtrMapper<ui::style::NoCondition>, public virtual IConditionMapper { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(NoConditionMapper) diff --git a/include/cru/ui/mapper/style/OrConditionMapper.h b/include/cru/ui/mapper/style/OrConditionMapper.h index e93484b4..de8e0695 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 BasicPtrMapper<ui::style::OrCondition>, + : public BasicClonablePtrMapper<ui::style::OrCondition>, public virtual IConditionMapper { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(OrConditionMapper) diff --git a/include/cru/ui/mapper/style/PaddingStylerMapper.h b/include/cru/ui/mapper/style/PaddingStylerMapper.h index 2c0b4340..e7515ec1 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 BasicPtrMapper<ui::style::PaddingStyler>, + : public BasicClonablePtrMapper<ui::style::PaddingStyler>, public virtual IStylerMapper { public: PaddingStylerMapper(); diff --git a/include/cru/ui/mapper/style/PreferredSizeStylerMapper.h b/include/cru/ui/mapper/style/PreferredSizeStylerMapper.h index ac52240d..f46b70d5 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 BasicPtrMapper<ui::style::PreferredSizeStyler>, + : public BasicClonablePtrMapper<ui::style::PreferredSizeStyler>, public virtual IStylerMapper { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(PreferredSizeStylerMapper) diff --git a/include/cru/ui/mapper/style/StyleRuleMapper.h b/include/cru/ui/mapper/style/StyleRuleMapper.h index 2d6d8d94..21bf3176 100644 --- a/include/cru/ui/mapper/style/StyleRuleMapper.h +++ b/include/cru/ui/mapper/style/StyleRuleMapper.h @@ -6,7 +6,7 @@ #include "cru/xml/XmlNode.h" namespace cru::ui::mapper::style { -class CRU_UI_API StyleRuleMapper : public BasicPtrMapper<ui::style::StyleRule> { +class CRU_UI_API StyleRuleMapper : public BasicClonablePtrMapper<ui::style::StyleRule> { CRU_DEFINE_CLASS_LOG_TAG(u"StyleRuleMapper") public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(StyleRuleMapper) diff --git a/include/cru/ui/mapper/style/StyleRuleSetMapper.h b/include/cru/ui/mapper/style/StyleRuleSetMapper.h index 95f745e5..6b848458 100644 --- a/include/cru/ui/mapper/style/StyleRuleSetMapper.h +++ b/include/cru/ui/mapper/style/StyleRuleSetMapper.h @@ -5,7 +5,7 @@ namespace cru::ui::mapper::style { class CRU_UI_API StyleRuleSetMapper - : public BasicRefMapper<ui::style::StyleRuleSet> { + : public BasicSharedPtrMapper<ui::style::StyleRuleSet> { public: CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(StyleRuleSetMapper) |