From 14d9efc39635dab2c6c0f791d6b0a63c92d941ee Mon Sep 17 00:00:00 2001 From: crupest Date: Sat, 22 Jan 2022 22:22:45 +0800 Subject: ... --- src/ui/mapper/PointMapper.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/ui/mapper/PointMapper.cpp') diff --git a/src/ui/mapper/PointMapper.cpp b/src/ui/mapper/PointMapper.cpp index 2be0ba01..bcf209fb 100644 --- a/src/ui/mapper/PointMapper.cpp +++ b/src/ui/mapper/PointMapper.cpp @@ -8,20 +8,20 @@ bool PointMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { return false; } -std::unique_ptr PointMapper::DoMapFromString(String str) { +Point PointMapper::DoMapFromString(String str) { std::vector values = str.ParseToFloatList(); if (values.size() == 2) { - return std::make_unique(values[0], values[1]); + return {values[0], values[1]}; } else if (values.size() == 1) { - return std::make_unique(values[0], values[0]); + return {values[0], values[0]}; } else { throw Exception(u"Invalid Point string."); } } -std::unique_ptr PointMapper::DoMapFromXml(xml::XmlElementNode* node) { +Point PointMapper::DoMapFromXml(xml::XmlElementNode* node) { auto value_attr = node->GetOptionalAttribute(u"value"); - if (!value_attr) return std::make_unique(); + if (!value_attr) return {}; return DoMapFromString(*value_attr); } } // namespace cru::ui::mapper -- cgit v1.2.3