diff options
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/xml.cpp | 4 | ||||
| -rw-r--r-- | src/utils/xml.h | 2 | ||||
| -rw-r--r-- | src/utils/xmlutils.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp index 487c177bb..f2cbdb384 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -77,7 +77,7 @@ namespace XML { Document::Document(const std::string &filename, const UseResman useResman, - const bool skipError) : + const SkipError skipError) : mDoc(nullptr), mIsValid(false) { @@ -125,7 +125,7 @@ namespace XML if (!mDoc) logger->log("Error parsing XML file %s", filename.c_str()); } - else if (!skipError) + else if (skipError == SkipError_false) { logger->log("Error loading %s", filename.c_str()); } diff --git a/src/utils/xml.h b/src/utils/xml.h index f8d531963..fdefc1682 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -69,7 +69,7 @@ namespace XML */ Document(const std::string &filename, const UseResman useResman, - const bool skipError); + const SkipError skipError); /** * Constructor that attempts to load an XML document from memory. diff --git a/src/utils/xmlutils.cpp b/src/utils/xmlutils.cpp index f275477c0..232ec92b1 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, UseResman_true, false); + XML::Document doc(fileName, UseResman_true, SkipError_false); const XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, rootName.c_str())) |