aboutsummaryrefslogtreecommitdiff
path: root/src/ui/mapper/ColorMapper.cpp
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2022-01-22 22:22:45 +0800
committercrupest <crupest@outlook.com>2022-01-22 22:22:45 +0800
commit14d9efc39635dab2c6c0f791d6b0a63c92d941ee (patch)
tree0e974083611d5725a2135928749026ac237884f4 /src/ui/mapper/ColorMapper.cpp
parent0e71e7022ee4cfec5b27e178ee1bb7d6977f6b3e (diff)
downloadcru-14d9efc39635dab2c6c0f791d6b0a63c92d941ee.tar.gz
cru-14d9efc39635dab2c6c0f791d6b0a63c92d941ee.tar.bz2
cru-14d9efc39635dab2c6c0f791d6b0a63c92d941ee.zip
...
Diffstat (limited to 'src/ui/mapper/ColorMapper.cpp')
-rw-r--r--src/ui/mapper/ColorMapper.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/mapper/ColorMapper.cpp b/src/ui/mapper/ColorMapper.cpp
index e17352e1..a5d2c5e3 100644
--- a/src/ui/mapper/ColorMapper.cpp
+++ b/src/ui/mapper/ColorMapper.cpp
@@ -5,18 +5,18 @@ bool ColorMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
return node->GetTag() == u"Color";
}
-std::unique_ptr<Color> ColorMapper::DoMapFromString(String str) {
+Color ColorMapper::DoMapFromString(String str) {
auto c = Color::Parse(str);
if (!c) {
throw Exception(u"Invalid color value.");
}
- return std::make_unique<Color>(*c);
+ return *c;
}
-std::unique_ptr<Color> ColorMapper::DoMapFromXml(xml::XmlElementNode* node) {
+Color ColorMapper::DoMapFromXml(xml::XmlElementNode* node) {
auto value_attr = node->GetOptionalAttribute(u"value");
if (!value_attr) {
- return std::make_unique<Color>(colors::transparent);
+ return colors::transparent;
}
return DoMapFromString(*value_attr);
}