diff options
author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2025-01-19 20:29:13 +0100 |
---|---|---|
committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2025-01-20 10:46:09 +0100 |
commit | aa2613c7037bd12448d58714b4bb317ea939d892 (patch) | |
tree | 8fb57a581b439b08d95a85ad57c2b6d1d91e17c4 /src/gui/updaterwindow.cpp | |
parent | bbbc318634f3be2c4d755e71d99cdfba5c2b82f3 (diff) | |
download | mana-aa2613c7037bd12448d58714b4bb317ea939d892.tar.gz mana-aa2613c7037bd12448d58714b4bb317ea939d892.tar.bz2 mana-aa2613c7037bd12448d58714b4bb317ea939d892.tar.xz mana-aa2613c7037bd12448d58714b4bb317ea939d892.zip |
Wrapped xmlNodePtr access with a Node class
Slightly more ergonomic and this eliminates direct libxml2 usage from
many places.
Diffstat (limited to 'src/gui/updaterwindow.cpp')
-rw-r--r-- | src/gui/updaterwindow.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/updaterwindow.cpp b/src/gui/updaterwindow.cpp index 353e2b35..a92911b4 100644 --- a/src/gui/updaterwindow.cpp +++ b/src/gui/updaterwindow.cpp @@ -56,26 +56,26 @@ std::vector<UpdateFile> loadXMLFile(const std::string &fileName) { std::vector<UpdateFile> files; XML::Document doc(fileName, false); - xmlNodePtr rootNode = doc.rootNode(); + XML::Node rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "updates")) + if (!rootNode || rootNode.name() != "updates") { logger->log("Error loading update file: %s", fileName.c_str()); return files; } - for (auto fileNode : XML::Children(rootNode)) + for (auto fileNode : rootNode.children()) { // Ignore all tags except for the "update" tags - if (!xmlStrEqual(fileNode->name, BAD_CAST "update")) + if (fileNode.name() != "update") continue; UpdateFile file; - file.name = XML::getProperty(fileNode, "file", std::string()); - file.hash = XML::getProperty(fileNode, "hash", std::string()); - file.type = XML::getProperty(fileNode, "type", "data"); - file.desc = XML::getProperty(fileNode, "description", std::string()); - file.required = XML::getProperty(fileNode, "required", "yes") == "yes"; + file.name = fileNode.getProperty("file", std::string()); + file.hash = fileNode.getProperty("hash", std::string()); + file.type = fileNode.getProperty("type", "data"); + file.desc = fileNode.getProperty("description", std::string()); + file.required = fileNode.getProperty("required", "yes") == "yes"; files.push_back(file); } |