diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-05-06 23:13:00 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-05-06 23:13:00 +0300 |
commit | 6c9ef6af1b72b74b9ab94cc1c1349c3cd70c8be6 (patch) | |
tree | c31a7e703e9452f667ef5a7f0958375ba388c50e /src/gui | |
parent | a86bdc28fb8bc8a70c6a19523789495d87c7a56d (diff) | |
download | mv-6c9ef6af1b72b74b9ab94cc1c1349c3cd70c8be6.tar.gz mv-6c9ef6af1b72b74b9ab94cc1c1349c3cd70c8be6.tar.bz2 mv-6c9ef6af1b72b74b9ab94cc1c1349c3cd70c8be6.tar.xz mv-6c9ef6af1b72b74b9ab94cc1c1349c3cd70c8be6.zip |
Add strong types bool type UseResman.
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/theme.cpp | 6 | ||||
-rw-r--r-- | src/gui/windows/equipmentwindow.cpp | 2 | ||||
-rw-r--r-- | src/gui/windows/questswindow.cpp | 2 | ||||
-rw-r--r-- | src/gui/windows/serverdialog.cpp | 4 | ||||
-rw-r--r-- | src/gui/windows/skilldialog.cpp | 2 | ||||
-rw-r--r-- | src/gui/windows/updaterwindow.cpp | 2 |
6 files changed, 10 insertions, 8 deletions
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index f2cfc4c09..6f6f622a5 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, true); + XML::Document doc(resolveThemePath(filename), UseResman_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, false); + XML::Document doc(resolveThemePath(file), UseResman_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, false); + XML::Document doc(path, UseResman_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 44cb01bc1..08cb4eccb 100644 --- a/src/gui/windows/equipmentwindow.cpp +++ b/src/gui/windows/equipmentwindow.cpp @@ -572,7 +572,7 @@ void EquipmentWindow::fillBoxes() { XML::Document *const doc = new XML::Document( paths.getStringValue("equipmentWindowFile"), - true, + UseResman_true, false); const XmlNodePtr root = doc->rootNode(); if (!root) diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp index d5fdf895a..cb7c8ae5f 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, false); + XML::Document doc(fileName, UseResman_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 57a8af078..8aae85e23 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -451,7 +451,9 @@ void ServerDialog::downloadServerList() void ServerDialog::loadServers(const bool addNew) { XML::Document doc(std::string(mDir).append("/").append( - branding.getStringValue("onlineServerFile")), false, false); + branding.getStringValue("onlineServerFile")), + UseResman_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 a11ba562b..a512a89ad 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, true, false); + XML::Document doc(fileName, UseResman_true, false); XmlNodePtrConst root = doc.rootNode(); int setCount = 0; diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 6a9ad373c..9dd27a9c1 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, false, false); + XML::Document doc(fileName, UseResman_false, false); const XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "updates")) |