summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-06 23:27:42 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-06 23:27:42 +0300
commit2bca0787182eb1637cd82fc246bc19578e90ca09 (patch)
tree046bc50c0cf38c3f7ad86798556a723e62df5a68 /src/gui
parent6c9ef6af1b72b74b9ab94cc1c1349c3cd70c8be6 (diff)
downloadmanaplus-2bca0787182eb1637cd82fc246bc19578e90ca09.tar.gz
manaplus-2bca0787182eb1637cd82fc246bc19578e90ca09.tar.bz2
manaplus-2bca0787182eb1637cd82fc246bc19578e90ca09.tar.xz
manaplus-2bca0787182eb1637cd82fc246bc19578e90ca09.zip
Add strong typed bool type SkipError.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/theme.cpp8
-rw-r--r--src/gui/windows/equipmentwindow.cpp2
-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, 10 insertions, 8 deletions
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 6f6f622a5..844341e3f 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -373,7 +373,9 @@ Skin *Theme::readSkin(const std::string &filename, const bool full)
// logger->log("Loading skin '%s'.", filename.c_str());
- XML::Document doc(resolveThemePath(filename), UseResman_true, true);
+ XML::Document doc(resolveThemePath(filename),
+ UseResman_true,
+ SkipError_true);
const XmlNodePtr rootNode = doc.rootNode();
if (!rootNode || !xmlNameEqual(rootNode, "skinset"))
@@ -967,7 +969,7 @@ void Theme::loadColors(std::string file)
else
file.append("/colors.xml");
- XML::Document doc(resolveThemePath(file), UseResman_true, false);
+ XML::Document doc(resolveThemePath(file), UseResman_true, SkipError_false);
const XmlNodePtrConst root = doc.rootNode();
if (!root || !xmlNameEqual(root, "colors"))
@@ -1156,7 +1158,7 @@ ThemeInfo *Theme::loadInfo(const std::string &themeName)
themeName).append("/info.xml");
}
logger->log("loading: " + path);
- XML::Document doc(path, UseResman_true, false);
+ XML::Document doc(path, UseResman_true, SkipError_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 08cb4eccb..80d8f8fbe 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -573,7 +573,7 @@ void EquipmentWindow::fillBoxes()
XML::Document *const doc = new XML::Document(
paths.getStringValue("equipmentWindowFile"),
UseResman_true,
- false);
+ SkipError_false);
const XmlNodePtr root = doc->rootNode();
if (!root)
{
diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp
index cb7c8ae5f..3a7fd8acc 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, UseResman_true, false);
+ XML::Document doc(fileName, UseResman_true, SkipError_false);
const XmlNodePtrConst root = doc.rootNode();
if (!root)
return;
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 8aae85e23..e82bcc806 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -453,7 +453,7 @@ void ServerDialog::loadServers(const bool addNew)
XML::Document doc(std::string(mDir).append("/").append(
branding.getStringValue("onlineServerFile")),
UseResman_false,
- false);
+ SkipError_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 a512a89ad..10a5f987b 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -261,7 +261,7 @@ void SkillDialog::loadSkills()
void SkillDialog::loadXmlFile(const std::string &fileName)
{
- XML::Document doc(fileName, UseResman_true, false);
+ XML::Document doc(fileName, UseResman_true, SkipError_false);
XmlNodePtrConst root = doc.rootNode();
int setCount = 0;
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 9dd27a9c1..ab6295ab5 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -77,7 +77,7 @@ static std::vector<UpdateFile> loadXMLFile(const std::string &fileName,
const bool loadMods)
{
std::vector<UpdateFile> files;
- XML::Document doc(fileName, UseResman_false, false);
+ XML::Document doc(fileName, UseResman_false, SkipError_false);
const XmlNodePtrConst rootNode = doc.rootNode();
if (!rootNode || !xmlNameEqual(rootNode, "updates"))