diff options
author | crupest <crupest@outlook.com> | 2022-01-22 22:22:45 +0800 |
---|---|---|
committer | crupest <crupest@outlook.com> | 2022-01-22 22:22:45 +0800 |
commit | 14d9efc39635dab2c6c0f791d6b0a63c92d941ee (patch) | |
tree | 0e974083611d5725a2135928749026ac237884f4 /src/ui/mapper/SizeMapper.cpp | |
parent | 0e71e7022ee4cfec5b27e178ee1bb7d6977f6b3e (diff) | |
download | cru-14d9efc39635dab2c6c0f791d6b0a63c92d941ee.tar.gz cru-14d9efc39635dab2c6c0f791d6b0a63c92d941ee.tar.bz2 cru-14d9efc39635dab2c6c0f791d6b0a63c92d941ee.zip |
...
Diffstat (limited to 'src/ui/mapper/SizeMapper.cpp')
-rw-r--r-- | src/ui/mapper/SizeMapper.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ui/mapper/SizeMapper.cpp b/src/ui/mapper/SizeMapper.cpp index 4f9dc208..3e3355cd 100644 --- a/src/ui/mapper/SizeMapper.cpp +++ b/src/ui/mapper/SizeMapper.cpp @@ -8,20 +8,20 @@ bool SizeMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { return false; } -std::unique_ptr<Size> SizeMapper::DoMapFromString(String str) { +Size SizeMapper::DoMapFromString(String str) { std::vector<float> values = str.ParseToFloatList(); if (values.size() == 2) { - return std::make_unique<Size>(values[0], values[1]); + return {values[0], values[1]}; } else if (values.size() == 1) { - return std::make_unique<Size>(values[0], values[0]); + return {values[0], values[0]}; } else { throw Exception(u"Invalid Point string."); } } -std::unique_ptr<Size> SizeMapper::DoMapFromXml(xml::XmlElementNode* node) { +Size SizeMapper::DoMapFromXml(xml::XmlElementNode* node) { auto value_attr = node->GetOptionalAttribute(u"value"); - if (!value_attr) return std::make_unique<Size>(); + if (!value_attr) return {}; return DoMapFromString(*value_attr); } } // namespace cru::ui::mapper |