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/utils | |
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/utils')
-rw-r--r-- | src/utils/xml.cpp | 4 | ||||
-rw-r--r-- | src/utils/xml.h | 4 | ||||
-rw-r--r-- | src/utils/xmlutils.cpp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp index 33173b3ee..487c177bb 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -76,7 +76,7 @@ static void xmlErrorLogger(void *ctx A_UNUSED, const char *msg, ...) namespace XML { Document::Document(const std::string &filename, - const bool useResman, + const UseResman useResman, const bool skipError) : mDoc(nullptr), mIsValid(false) @@ -89,7 +89,7 @@ namespace XML int size = 0; char *data = nullptr; valid = true; - if (useResman) + if (useResman == UseResman_true) { data = static_cast<char*>(PhysFs::loadFile( filename.c_str(), size)); diff --git a/src/utils/xml.h b/src/utils/xml.h index 35e7bb7e6..f8d531963 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -23,6 +23,8 @@ #ifndef UTILS_XML_H #define UTILS_XML_H +#include "enums/simpletypes.h" + #include <libxml/tree.h> #include <libxml/xmlwriter.h> @@ -66,7 +68,7 @@ namespace XML * resource manager. Logs errors. */ Document(const std::string &filename, - const bool useResman, + const UseResman useResman, const bool skipError); /** diff --git a/src/utils/xmlutils.cpp b/src/utils/xmlutils.cpp index 7c370dda0..f275477c0 100644 --- a/src/utils/xmlutils.cpp +++ b/src/utils/xmlutils.cpp @@ -34,7 +34,7 @@ void readXmlIntVector(const std::string &fileName, std::vector<int> &arr) { arr.clear(); - XML::Document doc(fileName, true, false); + XML::Document doc(fileName, UseResman_true, false); const XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, rootName.c_str())) |