diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-06-26 01:37:48 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-09-27 18:38:28 +0200 |
| commit | 51f0c23ac190c83bebeace8a49cd2ecd1143fa8c (patch) | |
| tree | e45ceab35b6cc419f80be6c86753b6ccd1cd22f0 /src/gui | |
| parent | 632da15234851f3decdbb29cbeb15e1950e41a0d (diff) | |
| download | mana-51f0c23ac190c83bebeace8a49cd2ecd1143fa8c.tar.gz mana-51f0c23ac190c83bebeace8a49cd2ecd1143fa8c.tar.bz2 mana-51f0c23ac190c83bebeace8a49cd2ecd1143fa8c.tar.xz mana-51f0c23ac190c83bebeace8a49cd2ecd1143fa8c.zip | |
Replaced for_each_xml_child_node macro with helper class
The new XML::Children class enables using a C++11 range-based for loop
to iterate over the children of an xmlNodePtr.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/serverdialog.cpp | 4 | ||||
| -rw-r--r-- | src/gui/skilldialog.cpp | 4 | ||||
| -rw-r--r-- | src/gui/updaterwindow.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index 5b8372ee..62437bab 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -443,7 +443,7 @@ void ServerDialog::loadServers() return; } - for_each_xml_child_node(serverNode, rootNode) + for (auto serverNode : XML::Children(rootNode)) { if (!xmlStrEqual(serverNode->name, BAD_CAST "server")) continue; @@ -481,7 +481,7 @@ void ServerDialog::loadServers() else version = strprintf(_("requires v%s"), version.c_str()); - for_each_xml_child_node(subNode, serverNode) + for (auto subNode : XML::Children(serverNode)) { if (xmlStrEqual(subNode->name, BAD_CAST "connection")) { diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp index 7639f1d6..5b1676e2 100644 --- a/src/gui/skilldialog.cpp +++ b/src/gui/skilldialog.cpp @@ -357,7 +357,7 @@ void SkillDialog::loadSkills() return; } - for_each_xml_child_node(set, root) + for (auto set : XML::Children(root)) { if (xmlStrEqual(set->name, BAD_CAST "set") || xmlStrEqual(set->name, BAD_CAST "skill-set")) @@ -367,7 +367,7 @@ void SkillDialog::loadSkills() auto *model = new SkillModel(); - for_each_xml_child_node(node, set) + for (auto node : XML::Children(set)) { if (xmlStrEqual(node->name, BAD_CAST "skill")) { diff --git a/src/gui/updaterwindow.cpp b/src/gui/updaterwindow.cpp index 387b11ef..353e2b35 100644 --- a/src/gui/updaterwindow.cpp +++ b/src/gui/updaterwindow.cpp @@ -64,7 +64,7 @@ std::vector<UpdateFile> loadXMLFile(const std::string &fileName) return files; } - for_each_xml_child_node(fileNode, rootNode) + for (auto fileNode : XML::Children(rootNode)) { // Ignore all tags except for the "update" tags if (!xmlStrEqual(fileNode->name, BAD_CAST "update")) |