From 328eaa8ded37e86f2575cb2804d1aaa36cdd4a1b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 7 Feb 2015 17:35:02 +0300 Subject: Remove optional parameter from xml document constructor. --- src/gui/theme.cpp | 6 +++--- src/gui/windows/equipmentwindow.cpp | 3 ++- src/gui/windows/questswindow.cpp | 2 +- src/gui/windows/skilldialog.cpp | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src/gui') diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 9898aebfc..98db5dc4c 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -373,7 +373,7 @@ Skin *Theme::readSkin(const std::string &filename, const bool full) // logger->log("Loading skin '%s'.", filename.c_str()); - XML::Document doc(resolveThemePath(filename)); + XML::Document doc(resolveThemePath(filename), true); const XmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "skinset")) @@ -967,7 +967,7 @@ void Theme::loadColors(std::string file) else file.append("/colors.xml"); - XML::Document doc(resolveThemePath(file)); + XML::Document doc(resolveThemePath(file), true); const XmlNodePtrConst root = doc.rootNode(); if (!root || !xmlNameEqual(root, "colors")) @@ -1156,7 +1156,7 @@ ThemeInfo *Theme::loadInfo(const std::string &themeName) themeName).append("/info.xml"); } logger->log("loading: " + path); - XML::Document doc(path); + XML::Document doc(path, true); const XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "info")) diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp index 6bec6dfa3..f5403449f 100644 --- a/src/gui/windows/equipmentwindow.cpp +++ b/src/gui/windows/equipmentwindow.cpp @@ -571,7 +571,8 @@ void EquipmentWindow::resetBeing(const Being *const being) void EquipmentWindow::fillBoxes() { XML::Document *const doc = new XML::Document( - paths.getStringValue("equipmentWindowFile")); + paths.getStringValue("equipmentWindowFile"), + true); const XmlNodePtr root = doc->rootNode(); if (!root) { diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp index 3af243970..370d6257d 100644 --- a/src/gui/windows/questswindow.cpp +++ b/src/gui/windows/questswindow.cpp @@ -166,7 +166,7 @@ QuestsWindow::~QuestsWindow() void QuestsWindow::loadXmlFile(const std::string &fileName) { - XML::Document doc(fileName); + XML::Document doc(fileName, true); const XmlNodePtrConst root = doc.rootNode(); if (!root) return; diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index 297bc0049..14261a70a 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -264,7 +264,7 @@ void SkillDialog::loadSkills() void SkillDialog::loadXmlFile(const std::string &fileName) { - XML::Document doc(fileName); + XML::Document doc(fileName, true); XmlNodePtrConst root = doc.rootNode(); int setCount = 0; -- cgit v1.2.3-70-g09d2