From 2bca0787182eb1637cd82fc246bc19578e90ca09 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 6 May 2015 23:27:42 +0300 Subject: Add strong typed bool type SkipError. --- src/gui/theme.cpp | 8 +++++--- src/gui/windows/equipmentwindow.cpp | 2 +- src/gui/windows/questswindow.cpp | 2 +- src/gui/windows/serverdialog.cpp | 2 +- src/gui/windows/skilldialog.cpp | 2 +- src/gui/windows/updaterwindow.cpp | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) (limited to 'src/gui') 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 loadXMLFile(const std::string &fileName, const bool loadMods) { std::vector 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")) -- cgit v1.2.3-70-g09d2