summaryrefslogtreecommitdiff
path: root/src/gui/theme.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/theme.cpp')
-rw-r--r--src/gui/theme.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 2d3b0beea..85fd215ac 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -317,7 +317,7 @@ Skin *Theme::readSkin(const std::string &filename)
XML::Document doc(resolveThemePath(filename));
XmlNodePtr rootNode = doc.rootNode();
- if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "skinset"))
+ if (!rootNode || !xmlNameEqual(rootNode, "skinset"))
return nullptr;
const std::string skinSetImage = XML::getProperty(rootNode, "image", "");
@@ -339,7 +339,7 @@ Skin *Theme::readSkin(const std::string &filename)
// iterate <widget>'s
for_each_xml_child_node(widgetNode, rootNode)
{
- if (!xmlStrEqual(widgetNode->name, BAD_CAST "widget"))
+ if (!xmlNameEqual(widgetNode, "widget"))
continue;
const std::string widgetType =
@@ -348,7 +348,7 @@ Skin *Theme::readSkin(const std::string &filename)
{
for_each_xml_child_node(partNode, widgetNode)
{
- if (xmlStrEqual(partNode->name, BAD_CAST "part"))
+ if (xmlNameEqual(partNode, "part"))
{
const std::string partType =
XML::getProperty(partNode, "type", "unknown");
@@ -477,7 +477,7 @@ Skin *Theme::readSkin(const std::string &filename)
"'%s'", partType.c_str());
}
}
- else if (xmlStrEqual(partNode->name, BAD_CAST "option"))
+ else if (xmlNameEqual(partNode, "option"))
{
const std::string name = XML::getProperty(
partNode, "name", "");
@@ -820,7 +820,7 @@ void Theme::loadColors(std::string file)
XML::Document doc(resolveThemePath(file));
XmlNodePtr root = doc.rootNode();
- if (!root || !xmlStrEqual(root->name, BAD_CAST "colors"))
+ if (!root || !xmlNameEqual(root, "colors"))
{
logger->log("Error loading colors file: %s", file.c_str());
return;
@@ -835,7 +835,7 @@ void Theme::loadColors(std::string file)
for_each_xml_child_node(node, root)
{
- if (xmlStrEqual(node->name, BAD_CAST "color"))
+ if (xmlNameEqual(node, "color"))
{
type = readColorType(XML::getProperty(node, "id", ""));
if (type < 0) // invalid or no type given
@@ -850,7 +850,7 @@ void Theme::loadColors(std::string file)
mColors[type].set(type, color, grad, 10);
}
- else if (xmlStrEqual(node->name, BAD_CAST "progressbar"))
+ else if (xmlNameEqual(node, "progressbar"))
{
type = readProgressType(XML::getProperty(node, "id", ""));
if (type < 0) // invalid or no type given