summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-07 17:51:56 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-07 17:51:56 +0300
commitbd2b67c0d1511a0068dfa3caf90a784fdf6fd3f2 (patch)
tree34749cc1679dc9a4d81652e77ed8aaf775f89882 /src/gui
parent328eaa8ded37e86f2575cb2804d1aaa36cdd4a1b (diff)
downloadmanaplus-bd2b67c0d1511a0068dfa3caf90a784fdf6fd3f2.tar.gz
manaplus-bd2b67c0d1511a0068dfa3caf90a784fdf6fd3f2.tar.bz2
manaplus-bd2b67c0d1511a0068dfa3caf90a784fdf6fd3f2.tar.xz
manaplus-bd2b67c0d1511a0068dfa3caf90a784fdf6fd3f2.zip
Dont show some useless errors while loading themes.
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/serverdialog.cpp2
-rw-r--r--src/gui/windows/skilldialog.cpp2
-rw-r--r--src/gui/windows/updaterwindow.cpp2
6 files changed, 9 insertions, 8 deletions
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 98db5dc4c..f2cfc4c09 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), true);
+ XML::Document doc(resolveThemePath(filename), true, 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), true);
+ XML::Document doc(resolveThemePath(file), true, false);
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, true);
+ XML::Document doc(path, true, false);
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 f5403449f..24bda1f0d 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -572,7 +572,8 @@ void EquipmentWindow::fillBoxes()
{
XML::Document *const doc = new XML::Document(
paths.getStringValue("equipmentWindowFile"),
- true);
+ true,
+ false);
const XmlNodePtr root = doc->rootNode();
if (!root)
{
diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp
index 370d6257d..fed9e36c6 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, true);
+ XML::Document doc(fileName, true, false);
const XmlNodePtrConst root = doc.rootNode();
if (!root)
return;
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index fab444050..a9542e74c 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -461,7 +461,7 @@ void ServerDialog::downloadServerList()
void ServerDialog::loadServers(const bool addNew)
{
XML::Document doc(std::string(mDir).append("/").append(
- branding.getStringValue("onlineServerFile")), false);
+ branding.getStringValue("onlineServerFile")), false, false);
const XmlNodePtr rootNode = doc.rootNode();
if (!rootNode || !xmlNameEqual(rootNode, "serverlist"))
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index 14261a70a..9a2f37d12 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, true);
+ XML::Document doc(fileName, true, false);
XmlNodePtrConst root = doc.rootNode();
int setCount = 0;
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 30477821e..fb3c55e4a 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -79,7 +79,7 @@ static std::vector<UpdateFile> loadXMLFile(const std::string &fileName,
const bool loadMods)
{
std::vector<UpdateFile> files;
- XML::Document doc(fileName, false);
+ XML::Document doc(fileName, false, false);
const XmlNodePtrConst rootNode = doc.rootNode();
if (!rootNode || !xmlNameEqual(rootNode, "updates"))