From 1ddea64a948eca27f17a99f8601d737636be872b Mon Sep 17 00:00:00 2001 From: crupest Date: Sat, 5 Mar 2022 23:24:15 +0800 Subject: ... --- src/ui/mapper/BorderStyleMapper.cpp | 5 +++-- src/ui/mapper/style/CursorStylerMapper.cpp | 2 +- src/ui/mapper/style/StyleRuleSetMapper.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/ui/mapper/BorderStyleMapper.cpp b/src/ui/mapper/BorderStyleMapper.cpp index 6bf197f6..462a07a1 100644 --- a/src/ui/mapper/BorderStyleMapper.cpp +++ b/src/ui/mapper/BorderStyleMapper.cpp @@ -27,8 +27,9 @@ ApplyBorderStyleInfo BorderStyleMapper::DoMapFromXml( MapperRegistry::GetInstance()->GetMapper(); auto corner_radius_mapper = MapperRegistry::GetInstance()->GetMapper(); - auto brush_mapper = MapperRegistry::GetInstance() - ->GetRefMapper(); + auto brush_mapper = + MapperRegistry::GetInstance() + ->GetSharedPtrMapper(); if (thickness_mapper->XmlElementIsOfThisType(c)) { result.border_thickness = thickness_mapper->MapFromXml(c); } else if (corner_radius_mapper->XmlElementIsOfThisType(c)) { diff --git a/src/ui/mapper/style/CursorStylerMapper.cpp b/src/ui/mapper/style/CursorStylerMapper.cpp index 103d9d82..6798798c 100644 --- a/src/ui/mapper/style/CursorStylerMapper.cpp +++ b/src/ui/mapper/style/CursorStylerMapper.cpp @@ -12,7 +12,7 @@ bool CursorStylerMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { ClonablePtr CursorStylerMapper::DoMapFromXml( xml::XmlElementNode* node) { auto cursor_mapper = - MapperRegistry::GetInstance()->GetRefMapper(); + MapperRegistry::GetInstance()->GetSharedPtrMapper(); std::shared_ptr cursor; for (auto child : node->GetChildren()) { diff --git a/src/ui/mapper/style/StyleRuleSetMapper.cpp b/src/ui/mapper/style/StyleRuleSetMapper.cpp index 7552e25f..d014edc7 100644 --- a/src/ui/mapper/style/StyleRuleSetMapper.cpp +++ b/src/ui/mapper/style/StyleRuleSetMapper.cpp @@ -14,7 +14,7 @@ bool StyleRuleSetMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { std::shared_ptr StyleRuleSetMapper::DoMapFromXml( xml::XmlElementNode* node) { auto style_rule_mapper = - MapperRegistry::GetInstance()->GetPtrMapper(); + MapperRegistry::GetInstance()->GetClonablePtrMapper(); auto result = std::make_shared(); -- cgit v1.2.3