From b293d99a34d21d137374e46386b8669907cb3c1d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 16 Jan 2014 01:47:17 +0300 Subject: add missing const in xmlnode pointers. --- src/gui/theme.cpp | 4 ++-- src/gui/windows/equipmentwindow.h | 2 +- src/gui/windows/questswindow.cpp | 2 +- src/gui/windows/skilldialog.cpp | 2 +- src/gui/windows/updaterwindow.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/gui') diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index d78a5d5f5..44f2ca24e 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -1072,7 +1072,7 @@ void Theme::loadColors(std::string file) file.append("/colors.xml"); XML::Document doc(resolveThemePath(file)); - const XmlNodePtr root = doc.rootNode(); + const XmlNodePtrConst root = doc.rootNode(); if (!root || !xmlNameEqual(root, "colors")) { @@ -1260,7 +1260,7 @@ ThemeInfo *Theme::loadInfo(const std::string &themeName) } logger->log("loading: " + path); XML::Document doc(path); - const XmlNodePtr rootNode = doc.rootNode(); + const XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "info")) return nullptr; diff --git a/src/gui/windows/equipmentwindow.h b/src/gui/windows/equipmentwindow.h index 1877d1309..d291a5f81 100644 --- a/src/gui/windows/equipmentwindow.h +++ b/src/gui/windows/equipmentwindow.h @@ -115,7 +115,7 @@ class EquipmentWindow final : public Window, public gcn::ActionListener void addBox(const int idx, int x, int y, const int imageIndex); - void loadWindow(const XmlNodePtr windowNode); + void loadWindow(const XmlNodePtrConst windowNode); void loadPlayerBox(const XmlNodePtr playerBoxNode); diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp index fff6f352a..e5f599f0f 100644 --- a/src/gui/windows/questswindow.cpp +++ b/src/gui/windows/questswindow.cpp @@ -225,7 +225,7 @@ QuestsWindow::~QuestsWindow() void QuestsWindow::loadXmlFile(const std::string &fileName) { XML::Document doc(fileName); - const XmlNodePtr root = doc.rootNode(); + const XmlNodePtrConst root = doc.rootNode(); if (!root) return; diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index aabe02e1c..197c60a90 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -441,7 +441,7 @@ void SkillDialog::loadSkills() void SkillDialog::loadXmlFile(const std::string &fileName) { XML::Document doc(fileName); - XmlNodePtr root = doc.rootNode(); + XmlNodePtrConst root = doc.rootNode(); int setCount = 0; diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index fcb26cc36..5eebbaf13 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -64,7 +64,7 @@ static std::vector loadXMLFile(const std::string &fileName) { std::vector files; XML::Document doc(fileName, false); - const XmlNodePtr rootNode = doc.rootNode(); + const XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "updates")) { -- cgit v1.2.3-70-g09d2