diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-01-10 21:06:33 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-01-10 21:06:33 +0300 |
commit | 5edddb1313ed0dc275e6ae70b8a1780ded3a590d (patch) | |
tree | fffa478013e8f3622c4e7f85eeb71609cb352322 /src/resources/colordb.cpp | |
parent | a057817a0983b3a3190f6773101f788f2c6278ba (diff) | |
download | plus-5edddb1313ed0dc275e6ae70b8a1780ded3a590d.tar.gz plus-5edddb1313ed0dc275e6ae70b8a1780ded3a590d.tar.bz2 plus-5edddb1313ed0dc275e6ae70b8a1780ded3a590d.tar.xz plus-5edddb1313ed0dc275e6ae70b8a1780ded3a590d.zip |
Replace xmlStrEqual to xmlNameEqual.
Diffstat (limited to 'src/resources/colordb.cpp')
-rw-r--r-- | src/resources/colordb.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp index cdbfbeba8..1ffe507b2 100644 --- a/src/resources/colordb.cpp +++ b/src/resources/colordb.cpp @@ -52,7 +52,7 @@ void ColorDB::loadHair() XmlNodePtr root = doc->rootNode(); bool hairXml = true; - if (!root || !xmlStrEqual(root->name, BAD_CAST "colors")) + if (!root || !xmlNameEqual(root, "colors")) { logger->log1("Trying to fall back on colors.xml"); @@ -62,7 +62,7 @@ void ColorDB::loadHair() doc = new XML::Document("colors.xml"); root = doc->rootNode(); - if (!root || !xmlStrEqual(root->name, BAD_CAST "colors")) + if (!root || !xmlNameEqual(root, "colors")) { logger->log1("ColorDB: Failed to find any color files."); mHairColors[0] = mFail; @@ -76,7 +76,7 @@ void ColorDB::loadHair() for_each_xml_child_node(node, root) { - if (xmlStrEqual(node->name, BAD_CAST "color")) + if (xmlNameEqual(node, "color")) { int id = XML::getProperty(node, "id", 0); @@ -106,7 +106,7 @@ void ColorDB::loadColorLists() for_each_xml_child_node(node, root) { - if (xmlStrEqual(node->name, BAD_CAST "list")) + if (xmlNameEqual(node, "list")) { std::string name = XML::getProperty(node, "name", ""); if (name.empty()) @@ -120,7 +120,7 @@ void ColorDB::loadColorLists() for_each_xml_child_node(colorNode, node) { - if (xmlStrEqual(colorNode->name, BAD_CAST "color")) + if (xmlNameEqual(colorNode, "color")) { ItemColor c(XML::getProperty(colorNode, "id", -1), XML::getProperty(colorNode, "name", ""), |