aboutsummaryrefslogtreecommitdiff
path: root/src/ui/mapper/style
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui/mapper/style')
-rw-r--r--src/ui/mapper/style/AndConditionMapper.cpp2
-rw-r--r--src/ui/mapper/style/BorderStylerMapper.cpp2
-rw-r--r--src/ui/mapper/style/CheckedConditionMapper.cpp14
-rw-r--r--src/ui/mapper/style/ClickStateConditionMapper.cpp17
-rw-r--r--src/ui/mapper/style/CursorStylerMapper.cpp2
-rw-r--r--src/ui/mapper/style/FocusConditionMapper.cpp12
-rw-r--r--src/ui/mapper/style/HoverConditionMapper.cpp12
-rw-r--r--src/ui/mapper/style/MarginStylerMapper.cpp2
-rw-r--r--src/ui/mapper/style/NoConditionMapper.cpp2
-rw-r--r--src/ui/mapper/style/OrConditionMapper.cpp2
-rw-r--r--src/ui/mapper/style/PaddingStylerMapper.cpp3
-rw-r--r--src/ui/mapper/style/PreferredSizeStylerMapper.cpp6
-rw-r--r--src/ui/mapper/style/StyleRuleMapper.cpp4
-rw-r--r--src/ui/mapper/style/StyleRuleSetMapper.cpp2
14 files changed, 46 insertions, 36 deletions
diff --git a/src/ui/mapper/style/AndConditionMapper.cpp b/src/ui/mapper/style/AndConditionMapper.cpp
index d57c4927..c1b7e5e5 100644
--- a/src/ui/mapper/style/AndConditionMapper.cpp
+++ b/src/ui/mapper/style/AndConditionMapper.cpp
@@ -7,7 +7,7 @@
namespace cru::ui::mapper::style {
bool AndConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode *node) {
- return node->GetTag().CaseInsensitiveEqual(u"AndCondition");
+ return cru::string::CaseInsensitiveCompare(node->GetTag(), "AndCondition") == 0;
}
ClonablePtr<ui::style::AndCondition> AndConditionMapper::DoMapFromXml(
diff --git a/src/ui/mapper/style/BorderStylerMapper.cpp b/src/ui/mapper/style/BorderStylerMapper.cpp
index e6e33053..e93a0af8 100644
--- a/src/ui/mapper/style/BorderStylerMapper.cpp
+++ b/src/ui/mapper/style/BorderStylerMapper.cpp
@@ -10,7 +10,7 @@ using cru::ui::style::ApplyBorderStyleInfo;
using cru::ui::style::BorderStyler;
bool BorderStylerMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
- return node->GetTag().CaseInsensitiveEqual(u"BorderStyler");
+ return cru::string::CaseInsensitiveCompare(node->GetTag(), "BorderStyler") == 0;
}
ClonablePtr<BorderStyler> BorderStylerMapper::DoMapFromXml(
diff --git a/src/ui/mapper/style/CheckedConditionMapper.cpp b/src/ui/mapper/style/CheckedConditionMapper.cpp
index e33c1113..aafc97a4 100644
--- a/src/ui/mapper/style/CheckedConditionMapper.cpp
+++ b/src/ui/mapper/style/CheckedConditionMapper.cpp
@@ -1,22 +1,24 @@
-#include "cru/base/ClonablePtr.h"
#include "cru/ui/mapper/style/CheckedConditionMapper.h"
+#include "cru/base/ClonablePtr.h"
+#include "cru/base/StringUtil.h"
#include "cru/ui/style/Condition.h"
#include "cru/xml/XmlNode.h"
namespace cru::ui::mapper::style {
bool CheckedConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
- return node->GetTag().CaseInsensitiveEqual(u"CheckedCondition");
+ return cru::string::CaseInsensitiveCompare(node->GetTag(),
+ "CheckedCondition") == 0;
}
ClonablePtr<ui::style::CheckedCondition> CheckedConditionMapper::DoMapFromXml(
xml::XmlElementNode* node) {
- auto value = node->GetAttributeValueCaseInsensitive(u"value");
- if (value.CaseInsensitiveEqual(u"true")) {
+ auto value = node->GetAttributeValueCaseInsensitive("value");
+ if (cru::string::CaseInsensitiveCompare(value, "true") == 0) {
return ui::style::CheckedCondition::Create(true);
- } else if (value.CaseInsensitiveEqual(u"false")) {
+ } else if (cru::string::CaseInsensitiveCompare(value, "false") == 0) {
return ui::style::CheckedCondition::Create(false);
} else {
- throw Exception("Invalid value for CheckedCondition: " + value.ToUtf8());
+ throw Exception("Invalid value for CheckedCondition: " + value);
}
}
} // namespace cru::ui::mapper::style
diff --git a/src/ui/mapper/style/ClickStateConditionMapper.cpp b/src/ui/mapper/style/ClickStateConditionMapper.cpp
index ca1f09c6..badaca85 100644
--- a/src/ui/mapper/style/ClickStateConditionMapper.cpp
+++ b/src/ui/mapper/style/ClickStateConditionMapper.cpp
@@ -1,30 +1,33 @@
#include "cru/ui/mapper/style/ClickStateConditionMapper.h"
#include "cru/base/ClonablePtr.h"
#include "cru/base/Exception.h"
+#include "cru/base/StringUtil.h"
#include "cru/ui/helper/ClickDetector.h"
#include "cru/ui/style/Condition.h"
namespace cru::ui::mapper::style {
bool ClickStateConditionMapper::XmlElementIsOfThisType(
xml::XmlElementNode *node) {
- return node->GetTag().CaseInsensitiveEqual(u"ClickStateCondition");
+ return cru::string::CaseInsensitiveCompare(node->GetTag(),
+ "ClickStateCondition") == 0;
}
ClonablePtr<ui::style::ClickStateCondition>
ClickStateConditionMapper::DoMapFromXml(xml::XmlElementNode *node) {
auto state = helper::ClickState::None;
- auto value_attr = node->GetOptionalAttributeValueCaseInsensitive(u"value");
+ auto value_attr = node->GetOptionalAttributeValueCaseInsensitive("value");
if (value_attr) {
- if (value_attr->CaseInsensitiveEqual(u"none")) {
+ if (cru::string::CaseInsensitiveCompare(*value_attr, "none") == 0) {
state = helper::ClickState::None;
- } else if (value_attr->CaseInsensitiveEqual(u"hover")) {
+ } else if (cru::string::CaseInsensitiveCompare(*value_attr, "hover") == 0) {
state = helper::ClickState::Hover;
- } else if (value_attr->CaseInsensitiveEqual(u"press")) {
+ } else if (cru::string::CaseInsensitiveCompare(*value_attr, "press") == 0) {
state = helper::ClickState::Press;
- } else if (value_attr->CaseInsensitiveEqual(u"pressinactive")) {
+ } else if (cru::string::CaseInsensitiveCompare(*value_attr,
+ "pressinactive") == 0) {
state = helper::ClickState::PressInactive;
} else {
- throw Exception("Unknown click state: " + value_attr->ToUtf8());
+ throw Exception("Unknown click state: " + *value_attr);
}
}
diff --git a/src/ui/mapper/style/CursorStylerMapper.cpp b/src/ui/mapper/style/CursorStylerMapper.cpp
index 3b060c25..c9a75329 100644
--- a/src/ui/mapper/style/CursorStylerMapper.cpp
+++ b/src/ui/mapper/style/CursorStylerMapper.cpp
@@ -6,7 +6,7 @@
namespace cru::ui::mapper::style {
bool CursorStylerMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
- return node->GetTag().CaseInsensitiveEqual(u"CursorStyler");
+ return cru::string::CaseInsensitiveCompare(node->GetTag(), "CursorStyler") == 0;
}
ClonablePtr<ui::style::CursorStyler> CursorStylerMapper::DoMapFromXml(
diff --git a/src/ui/mapper/style/FocusConditionMapper.cpp b/src/ui/mapper/style/FocusConditionMapper.cpp
index 9aa1d6ce..b21ac250 100644
--- a/src/ui/mapper/style/FocusConditionMapper.cpp
+++ b/src/ui/mapper/style/FocusConditionMapper.cpp
@@ -1,22 +1,24 @@
#include "cru/ui/mapper/style/FocusConditionMapper.h"
#include "cru/base/ClonablePtr.h"
+#include "cru/base/StringUtil.h"
#include "cru/ui/style/Condition.h"
#include "cru/xml/XmlNode.h"
namespace cru::ui::mapper::style {
bool FocusConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
- return node->GetTag().CaseInsensitiveEqual(u"FocusCondition");
+ return cru::string::CaseInsensitiveCompare(node->GetTag(),
+ "FocusCondition") == 0;
}
ClonablePtr<ui::style::FocusCondition> FocusConditionMapper::DoMapFromXml(
xml::XmlElementNode* node) {
- auto value = node->GetAttributeValueCaseInsensitive(u"value");
- if (value.CaseInsensitiveEqual(u"true")) {
+ auto value = node->GetAttributeValueCaseInsensitive("value");
+ if (cru::string::CaseInsensitiveCompare(value, "true") == 0) {
return ui::style::FocusCondition::Create(true);
- } else if (value.CaseInsensitiveEqual(u"false")) {
+ } else if (cru::string::CaseInsensitiveCompare(value, "false") == 0) {
return ui::style::FocusCondition::Create(false);
} else {
- throw Exception("Invalid value for FocusCondition: " + value.ToUtf8());
+ throw Exception("Invalid value for FocusCondition: " + value);
}
}
} // namespace cru::ui::mapper::style
diff --git a/src/ui/mapper/style/HoverConditionMapper.cpp b/src/ui/mapper/style/HoverConditionMapper.cpp
index 27565192..1a7ffd95 100644
--- a/src/ui/mapper/style/HoverConditionMapper.cpp
+++ b/src/ui/mapper/style/HoverConditionMapper.cpp
@@ -1,23 +1,25 @@
#include "cru/ui/mapper/style/HoverConditionMapper.h"
#include "cru/base/ClonablePtr.h"
+#include "cru/base/StringUtil.h"
#include "cru/ui/style/Condition.h"
namespace cru::ui::mapper::style {
using namespace cru::ui::style;
bool HoverConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
- return node->GetTag().CaseInsensitiveEqual(u"HoverCondition");
+ return cru::string::CaseInsensitiveCompare(node->GetTag(),
+ "HoverCondition") == 0;
}
ClonablePtr<HoverCondition> HoverConditionMapper::DoMapFromXml(
xml::XmlElementNode* node) {
- auto value = node->GetAttributeValueCaseInsensitive(u"value");
- if (value.CaseInsensitiveEqual(u"true")) {
+ auto value = node->GetAttributeValueCaseInsensitive("value");
+ if (cru::string::CaseInsensitiveCompare(value, "true") == 0) {
return ui::style::HoverCondition::Create(true);
- } else if (value.CaseInsensitiveEqual(u"false")) {
+ } else if (cru::string::CaseInsensitiveCompare(value, "false") == 0) {
return ui::style::HoverCondition::Create(false);
} else {
- throw Exception("Invalid value for HoverCondition: " + value.ToUtf8());
+ throw Exception("Invalid value for HoverCondition: " + value);
}
}
} // namespace cru::ui::mapper::style
diff --git a/src/ui/mapper/style/MarginStylerMapper.cpp b/src/ui/mapper/style/MarginStylerMapper.cpp
index 4c5952bd..0968b53e 100644
--- a/src/ui/mapper/style/MarginStylerMapper.cpp
+++ b/src/ui/mapper/style/MarginStylerMapper.cpp
@@ -14,7 +14,7 @@ ClonablePtr<ui::style::MarginStyler> MarginStylerMapper::DoMapFromXml(
auto thickness_mapper = MapperRegistry::GetInstance()->GetMapper<Thickness>();
- auto value_attribute = node->GetOptionalAttributeValueCaseInsensitive(u"value");
+ auto value_attribute = node->GetOptionalAttributeValueCaseInsensitive("value");
if (value_attribute) {
thickness = thickness_mapper->MapFromString(*value_attribute);
}
diff --git a/src/ui/mapper/style/NoConditionMapper.cpp b/src/ui/mapper/style/NoConditionMapper.cpp
index a36e70d2..d38e187b 100644
--- a/src/ui/mapper/style/NoConditionMapper.cpp
+++ b/src/ui/mapper/style/NoConditionMapper.cpp
@@ -4,7 +4,7 @@
namespace cru::ui::mapper::style {
bool NoConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
- return node->GetTag().CaseInsensitiveEqual(u"NoCondition");
+ return cru::string::CaseInsensitiveCompare(node->GetTag(), "NoCondition") == 0;
}
ClonablePtr<ui::style::NoCondition> NoConditionMapper::DoMapFromXml(
diff --git a/src/ui/mapper/style/OrConditionMapper.cpp b/src/ui/mapper/style/OrConditionMapper.cpp
index 521c57ae..9c983d83 100644
--- a/src/ui/mapper/style/OrConditionMapper.cpp
+++ b/src/ui/mapper/style/OrConditionMapper.cpp
@@ -7,7 +7,7 @@
namespace cru::ui::mapper::style {
bool OrConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode *node) {
- return node->GetTag().CaseInsensitiveEqual(u"OrCondition");
+ return cru::string::CaseInsensitiveCompare(node->GetTag(), "OrCondition") == 0;
}
ClonablePtr<ui::style::OrCondition> OrConditionMapper::DoMapFromXml(
diff --git a/src/ui/mapper/style/PaddingStylerMapper.cpp b/src/ui/mapper/style/PaddingStylerMapper.cpp
index 919669b7..0f0f87d7 100644
--- a/src/ui/mapper/style/PaddingStylerMapper.cpp
+++ b/src/ui/mapper/style/PaddingStylerMapper.cpp
@@ -16,7 +16,8 @@ ClonablePtr<ui::style::PaddingStyler> PaddingStylerMapper::DoMapFromXml(
auto thickness_mapper = MapperRegistry::GetInstance()->GetMapper<Thickness>();
- auto value_attribute = node->GetOptionalAttributeValueCaseInsensitive(u"value");
+ auto value_attribute =
+ node->GetOptionalAttributeValueCaseInsensitive("value");
if (value_attribute) {
thickness = thickness_mapper->MapFromString(*value_attribute);
}
diff --git a/src/ui/mapper/style/PreferredSizeStylerMapper.cpp b/src/ui/mapper/style/PreferredSizeStylerMapper.cpp
index e7cfc35b..2fe71025 100644
--- a/src/ui/mapper/style/PreferredSizeStylerMapper.cpp
+++ b/src/ui/mapper/style/PreferredSizeStylerMapper.cpp
@@ -6,7 +6,7 @@
namespace cru::ui::mapper::style {
bool PreferredSizeStylerMapper::XmlElementIsOfThisType(
xml::XmlElementNode* node) {
- return node->GetTag().CaseInsensitiveEqual(u"PreferredSizeStyler");
+ return cru::string::CaseInsensitiveCompare(node->GetTag(), "PreferredSizeStyler") == 0;
}
ClonablePtr<ui::style::PreferredSizeStyler>
@@ -16,12 +16,12 @@ PreferredSizeStylerMapper::DoMapFromXml(xml::XmlElementNode* node) {
auto measure_length_mapper =
MapperRegistry::GetInstance()->GetMapper<render::MeasureLength>();
- auto width_attribute = node->GetOptionalAttributeValueCaseInsensitive(u"width");
+ auto width_attribute = node->GetOptionalAttributeValueCaseInsensitive("width");
if (width_attribute) {
size.width = measure_length_mapper->MapFromString(*width_attribute);
}
- auto height_attribute = node->GetOptionalAttributeValueCaseInsensitive(u"height");
+ auto height_attribute = node->GetOptionalAttributeValueCaseInsensitive("height");
if (height_attribute) {
size.height = measure_length_mapper->MapFromString(*height_attribute);
}
diff --git a/src/ui/mapper/style/StyleRuleMapper.cpp b/src/ui/mapper/style/StyleRuleMapper.cpp
index f80d27db..345728d2 100644
--- a/src/ui/mapper/style/StyleRuleMapper.cpp
+++ b/src/ui/mapper/style/StyleRuleMapper.cpp
@@ -12,7 +12,7 @@
namespace cru::ui::mapper::style {
using namespace ui::style;
bool StyleRuleMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
- return node->GetTag().CaseInsensitiveEqual(u"StyleRule");
+ return cru::string::CaseInsensitiveCompare(node->GetTag(), "StyleRule") == 0;
}
ClonablePtr<ui::style::StyleRule> StyleRuleMapper::DoMapFromXml(
@@ -49,7 +49,7 @@ ClonablePtr<ui::style::StyleRule> StyleRuleMapper::DoMapFromXml(
}
if (!resolved) {
- throw Exception("Unknown element in StyleRule: " + c->GetTag().ToUtf8());
+ throw Exception("Unknown element in StyleRule: " + c->GetTag());
}
}
}
diff --git a/src/ui/mapper/style/StyleRuleSetMapper.cpp b/src/ui/mapper/style/StyleRuleSetMapper.cpp
index 1067f8f8..d4bc7c37 100644
--- a/src/ui/mapper/style/StyleRuleSetMapper.cpp
+++ b/src/ui/mapper/style/StyleRuleSetMapper.cpp
@@ -8,7 +8,7 @@ namespace cru::ui::mapper::style {
using namespace cru::ui::style;
bool StyleRuleSetMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
- return node->GetTag().CaseInsensitiveEqual(u"StyleRuleSet");
+ return cru::string::CaseInsensitiveCompare(node->GetTag(), "StyleRuleSet") == 0;
}
std::shared_ptr<ui::style::StyleRuleSet> StyleRuleSetMapper::DoMapFromXml(
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-23 17:12:27 +0000