summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-01-16 01:47:17 +0300
committerAndrei Karas <akaras@inbox.ru>2014-01-16 01:47:17 +0300
commitb293d99a34d21d137374e46386b8669907cb3c1d (patch)
tree7e5e20e2b81e239878c13229c4d02139e8b85c2b /src/gui
parent34f943198afd1f7f342d63bd70d30cdeacd3dbad (diff)
downloadmv-b293d99a34d21d137374e46386b8669907cb3c1d.tar.gz
mv-b293d99a34d21d137374e46386b8669907cb3c1d.tar.bz2
mv-b293d99a34d21d137374e46386b8669907cb3c1d.tar.xz
mv-b293d99a34d21d137374e46386b8669907cb3c1d.zip
add missing const in xmlnode pointers.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/theme.cpp4
-rw-r--r--src/gui/windows/equipmentwindow.h2
-rw-r--r--src/gui/windows/questswindow.cpp2
-rw-r--r--src/gui/windows/skilldialog.cpp2
-rw-r--r--src/gui/windows/updaterwindow.cpp2
5 files changed, 6 insertions, 6 deletions
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<UpdateFile> loadXMLFile(const std::string &fileName)
{
std::vector<UpdateFile> files;
XML::Document doc(fileName, false);
- const XmlNodePtr rootNode = doc.rootNode();
+ const XmlNodePtrConst rootNode = doc.rootNode();
if (!rootNode || !xmlNameEqual(rootNode, "updates"))
{