summaryrefslogtreecommitdiff
path: root/src/utils
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-02-28 02:06:49 +0300
committerAndrei Karas <akaras@inbox.ru>2017-02-28 02:06:49 +0300
commitfac5f4d0cf2181f88629b6a21c7d433217da90ca (patch)
treed2f50084e11d501f78fee4a268a6a288b8bd3236 /src/utils
parent3fba07dba53ae41d915ba4c3304e31f0b44893fa (diff)
downloadmanaverse-fac5f4d0cf2181f88629b6a21c7d433217da90ca.tar.gz
manaverse-fac5f4d0cf2181f88629b6a21c7d433217da90ca.tar.bz2
manaverse-fac5f4d0cf2181f88629b6a21c7d433217da90ca.tar.xz
manaverse-fac5f4d0cf2181f88629b6a21c7d433217da90ca.zip
Rename UseResMan into UseVirtFs.
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/xml/libxml.cpp4
-rw-r--r--src/utils/xml/libxml.h4
-rw-r--r--src/utils/xml/pugixml.cpp4
-rw-r--r--src/utils/xml/pugixml.h4
-rw-r--r--src/utils/xml/pugixmlwriter.h2
-rw-r--r--src/utils/xml_unittest.cc12
-rw-r--r--src/utils/xmlutils.cpp6
7 files changed, 18 insertions, 18 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"
diff --git a/src/utils/xml_unittest.cc b/src/utils/xml_unittest.cc
index 795cd2fa0..fc40f4439 100644
--- a/src/utils/xml_unittest.cc
+++ b/src/utils/xml_unittest.cc
@@ -75,7 +75,7 @@ TEST_CASE("xml doc")
SECTION("load1")
{
XML::Document doc("graphics/gui/browserbox.xml",
- UseResman_true,
+ UseVirtFs_true,
SkipError_false);
REQUIRE(doc.isLoaded() == true);
REQUIRE(doc.isValid() == true);
@@ -140,7 +140,7 @@ TEST_CASE("xml doc")
SECTION("properties")
{
XML::Document doc("graphics/gui/browserbox.xml",
- UseResman_true,
+ UseVirtFs_true,
SkipError_false);
const XmlNodePtr rootNode = doc.rootNode();
@@ -150,7 +150,7 @@ TEST_CASE("xml doc")
SECTION("for each")
{
XML::Document doc("graphics/gui/browserbox.xml",
- UseResman_true,
+ UseVirtFs_true,
SkipError_false);
const XmlNodePtr rootNode = doc.rootNode();
@@ -190,7 +190,7 @@ TEST_CASE("xml doc")
SECTION("child1")
{
XML::Document doc("graphics/gui/browserbox.xml",
- UseResman_true,
+ UseVirtFs_true,
SkipError_false);
const XmlNodePtr rootNode = doc.rootNode();
@@ -294,7 +294,7 @@ TEST_CASE("xml doc")
// load
XML::Document doc(tempXmlName,
- UseResman_false,
+ UseVirtFs_false,
SkipError_false);
REQUIRE(doc.isLoaded() == true);
REQUIRE(doc.isValid() == true);
@@ -334,7 +334,7 @@ TEST_CASE("xml doc")
// load
XML::Document doc(tempXmlName,
- UseResman_false,
+ UseVirtFs_false,
SkipError_false);
REQUIRE(doc.isLoaded() == true);
REQUIRE(doc.isValid() == true);
diff --git a/src/utils/xmlutils.cpp b/src/utils/xmlutils.cpp
index f0bfb8b4d..450a392d4 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,
const SkipError skipError)
{
- XML::Document doc(fileName, UseResman_true, skipError);
+ XML::Document doc(fileName, UseVirtFs_true, skipError);
const XmlNodePtrConst rootNode = doc.rootNode();
if (!rootNode || !xmlNameEqual(rootNode, rootName.c_str()))
@@ -85,7 +85,7 @@ void readXmlStringMap(const std::string &fileName,
std::map<std::string, std::string> &arr,
const SkipError skipError)
{
- XML::Document doc(fileName, UseResman_true, skipError);
+ XML::Document doc(fileName, UseVirtFs_true, skipError);
const XmlNodePtrConst rootNode = doc.rootNode();
if (!rootNode || !xmlNameEqual(rootNode, rootName.c_str()))
@@ -139,7 +139,7 @@ void readXmlIntMap(const std::string &fileName,
std::map<int32_t, int32_t> &arr,
const SkipError skipError)
{
- XML::Document doc(fileName, UseResman_true, skipError);
+ XML::Document doc(fileName, UseVirtFs_true, skipError);
const XmlNodePtrConst rootNode = doc.rootNode();
if (!rootNode || !xmlNameEqual(rootNode, rootName.c_str()))