aboutsummaryrefslogtreecommitdiff
path: root/src/ui/mapper/ThicknessMapper.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui/mapper/ThicknessMapper.cpp')
-rw-r--r--src/ui/mapper/ThicknessMapper.cpp16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/ui/mapper/ThicknessMapper.cpp b/src/ui/mapper/ThicknessMapper.cpp
index 11f0be0d..1829d64b 100644
--- a/src/ui/mapper/ThicknessMapper.cpp
+++ b/src/ui/mapper/ThicknessMapper.cpp
@@ -9,26 +9,22 @@ bool ThicknessMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
return false;
}
-std::unique_ptr<Thickness> ThicknessMapper::DoMapFromString(String str) {
+Thickness ThicknessMapper::DoMapFromString(String str) {
std::vector<float> values = str.ParseToFloatList();
if (values.size() == 4) {
- return std::make_unique<Thickness>(values[0], values[1], values[2],
- values[3]);
+ return Thickness(values[0], values[1], values[2], values[3]);
} else if (values.size() == 2) {
- return std::make_unique<Thickness>(values[0], values[1], values[0],
- values[1]);
+ return Thickness(values[0], values[1], values[0], values[1]);
} else if (values.size() == 1) {
- return std::make_unique<Thickness>(values[0], values[0], values[0],
- values[0]);
+ return Thickness(values[0], values[0], values[0], values[0]);
} else {
throw Exception(u"Invalid Thickness string.");
}
}
-std::unique_ptr<Thickness> ThicknessMapper::DoMapFromXml(
- xml::XmlElementNode* node) {
+Thickness ThicknessMapper::DoMapFromXml(xml::XmlElementNode* node) {
auto value_attr = node->GetOptionalAttribute(u"value");
- if (!value_attr) return std::make_unique<Thickness>();
+ if (!value_attr) return {};
return DoMapFromString(*value_attr);
}
} // namespace cru::ui::mapper