diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-02-28 02:06:49 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-02-28 02:06:49 +0300 |
| commit | fac5f4d0cf2181f88629b6a21c7d433217da90ca (patch) | |
| tree | d2f50084e11d501f78fee4a268a6a288b8bd3236 /src/utils/xml | |
| parent | 3fba07dba53ae41d915ba4c3304e31f0b44893fa (diff) | |
| download | mv-fac5f4d0cf2181f88629b6a21c7d433217da90ca.tar.gz mv-fac5f4d0cf2181f88629b6a21c7d433217da90ca.tar.bz2 mv-fac5f4d0cf2181f88629b6a21c7d433217da90ca.tar.xz mv-fac5f4d0cf2181f88629b6a21c7d433217da90ca.zip | |
Rename UseResMan into UseVirtFs.
Diffstat (limited to 'src/utils/xml')
| -rw-r--r-- | src/utils/xml/libxml.cpp | 4 | ||||
| -rw-r--r-- | src/utils/xml/libxml.h | 4 | ||||
| -rw-r--r-- | src/utils/xml/pugixml.cpp | 4 | ||||
| -rw-r--r-- | src/utils/xml/pugixml.h | 4 | ||||
| -rw-r--r-- | src/utils/xml/pugixmlwriter.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/utils/xml/libxml.cpp b/src/utils/xml/libxml.cpp index 8b5b34efc..f6e38f08f 100644 --- a/src/utils/xml/libxml.cpp +++ b/src/utils/xml/libxml.cpp @@ -81,7 +81,7 @@ static void xmlErrorLogger(void *ctx A_UNUSED, const char *msg, ...) namespace XML { Document::Document(const std::string &filename, - const UseResman useResman, + const UseVirtFs useResman, const SkipError skipError) : Resource(), mDoc(nullptr), @@ -96,7 +96,7 @@ namespace XML int size = 0; char *data = nullptr; valid = true; - if (useResman == UseResman_true) + if (useResman == UseVirtFs_true) { data = static_cast<char*>(VirtFs::loadFile( filename.c_str(), size)); diff --git a/src/utils/xml/libxml.h b/src/utils/xml/libxml.h index f1c192072..9ef419121 100644 --- a/src/utils/xml/libxml.h +++ b/src/utils/xml/libxml.h @@ -28,7 +28,7 @@ #define XML_INCLUDE_DEFINE #include "enums/simpletypes/skiperror.h" -#include "enums/simpletypes/useresman.h" +#include "enums/simpletypes/usevirtfs.h" #include "utils/xml/libxml.inc" @@ -57,7 +57,7 @@ namespace XML * resource manager. Logs errors. */ Document(const std::string &filename, - const UseResman useResman, + const UseVirtFs useResman, const SkipError skipError); /** diff --git a/src/utils/xml/pugixml.cpp b/src/utils/xml/pugixml.cpp index 47d6b25de..8d5e8db59 100644 --- a/src/utils/xml/pugixml.cpp +++ b/src/utils/xml/pugixml.cpp @@ -58,7 +58,7 @@ namespace XML } Document::Document(const std::string &filename, - const UseResman useResman, + const UseVirtFs useResman, const SkipError skipError) : Resource(), mDoc(), @@ -74,7 +74,7 @@ namespace XML int size = 0; char *data = nullptr; valid = true; - if (useResman == UseResman_true) + if (useResman == UseVirtFs_true) { data = static_cast<char*>(VirtFs::loadFile( filename.c_str(), size)); diff --git a/src/utils/xml/pugixml.h b/src/utils/xml/pugixml.h index 3f2556c16..b6d9e5bfd 100644 --- a/src/utils/xml/pugixml.h +++ b/src/utils/xml/pugixml.h @@ -28,7 +28,7 @@ #define XML_INCLUDE_DEFINE #include "enums/simpletypes/skiperror.h" -#include "enums/simpletypes/useresman.h" +#include "enums/simpletypes/usevirtfs.h" #include "utils/xml/pugixml.inc" @@ -57,7 +57,7 @@ namespace XML * resource manager. Logs errors. */ Document(const std::string &filename, - const UseResman useResman, + const UseVirtFs useResman, const SkipError skipError); /** diff --git a/src/utils/xml/pugixmlwriter.h b/src/utils/xml/pugixmlwriter.h index 3d6712992..fe5977655 100644 --- a/src/utils/xml/pugixmlwriter.h +++ b/src/utils/xml/pugixmlwriter.h @@ -24,7 +24,7 @@ #ifdef ENABLE_PUGIXML #include "enums/simpletypes/skiperror.h" -#include "enums/simpletypes/useresman.h" +#include "enums/simpletypes/usevirtfs.h" #include "utils/xml/pugixml.h" |