summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-07 17:35:02 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-07 17:35:02 +0300
commit328eaa8ded37e86f2575cb2804d1aaa36cdd4a1b (patch)
tree76f605440589ba9a9da29e46f9f7a5a951016263 /src/gui
parent664131c51126d33e6e1fca7d9da09bc67016e450 (diff)
downloadmanaverse-328eaa8ded37e86f2575cb2804d1aaa36cdd4a1b.tar.gz
manaverse-328eaa8ded37e86f2575cb2804d1aaa36cdd4a1b.tar.bz2
manaverse-328eaa8ded37e86f2575cb2804d1aaa36cdd4a1b.tar.xz
manaverse-328eaa8ded37e86f2575cb2804d1aaa36cdd4a1b.zip
Remove optional parameter from xml document constructor.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/theme.cpp6
-rw-r--r--src/gui/windows/equipmentwindow.cpp3
-rw-r--r--src/gui/windows/questswindow.cpp2
-rw-r--r--src/gui/windows/skilldialog.cpp2
4 files changed, 7 insertions, 6 deletions
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;