summaryrefslogtreecommitdiff
path: root/src/gui
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/gui
parent3fba07dba53ae41d915ba4c3304e31f0b44893fa (diff)
downloadmv-fac5f4d0cf2181f88629b6a21c7d433217da90ca.tar.gz
mv-fac5f4d0cf2181f88629b6a21c7d433217da90ca.tar.bz2
mv-fac5f4d0cf2181f88629b6a21c7d433217da90ca.tar.xz
mv-fac5f4d0cf2181f88629b6a21c7d433217da90ca.zip
Rename UseResMan into UseVirtFs.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/theme.cpp6
-rw-r--r--src/gui/windows/equipmentwindow.cpp4
-rw-r--r--src/gui/windows/serverdialog.cpp2
-rw-r--r--src/gui/windows/skilldialog.cpp2
-rw-r--r--src/gui/windows/updaterwindow.cpp2
5 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 206d8f9a5..5be8efbf9 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -402,7 +402,7 @@ Skin *Theme::readSkin(const std::string &filename, const bool full)
if (!VirtFs::exists(path))
return nullptr;
XML::Document *const doc = Loader::getXml(path,
- UseResman_true,
+ UseVirtFs_true,
SkipError_true);
if (!doc)
return nullptr;
@@ -1007,7 +1007,7 @@ void Theme::loadColors(std::string file)
file.append("/colors.xml");
XML::Document *const doc = Loader::getXml(resolveThemePath(file),
- UseResman_true,
+ UseVirtFs_true,
SkipError_false);
if (!doc)
return;
@@ -1216,7 +1216,7 @@ ThemeInfo *Theme::loadInfo(const std::string &themeName)
}
logger->log("loading: " + path);
XML::Document *const doc = Loader::getXml(path,
- UseResman_true,
+ UseVirtFs_true,
SkipError_false);
if (!doc)
return nullptr;
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index 192d03dc1..1910bb8e1 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -628,7 +628,7 @@ void EquipmentWindow::fillBoxes()
{
XML::Document *const doc = new XML::Document(
paths.getStringValue("equipmentWindowFile"),
- UseResman_true,
+ UseVirtFs_true,
SkipError_false);
const XmlNodePtr root = doc->rootNode();
if (!root)
@@ -737,7 +737,7 @@ void EquipmentWindow::prepareSlotNames()
{
mSlotNames.clear();
XML::Document doc(paths.getStringValue("equipmentSlotsFile"),
- UseResman_true,
+ UseVirtFs_true,
SkipError_false);
const XmlNodePtrConst root = doc.rootNode();
if (!root)
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index c4f65d770..e1fe669ee 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -480,7 +480,7 @@ void ServerDialog::loadServers(const bool addNew)
{
XML::Document doc(std::string(mDir).append("/").append(
branding.getStringValue("onlineServerFile")),
- UseResman_false,
+ UseVirtFs_false,
SkipError_false);
const XmlNodePtr rootNode = doc.rootNode();
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index 64d05b042..eec6a2ac5 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -316,7 +316,7 @@ void SkillDialog::loadXmlFile(const std::string &fileName,
const SkipError skipError)
{
XML::Document doc(fileName,
- UseResman_true,
+ UseVirtFs_true,
skipError);
XmlNodePtrConst root = doc.rootNode();
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index ef4b543a1..192d55dc5 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -78,7 +78,7 @@ static std::vector<UpdateFile> loadXMLFile(const std::string &fileName,
const bool loadMods)
{
std::vector<UpdateFile> files;
- XML::Document doc(fileName, UseResman_false, SkipError_false);
+ XML::Document doc(fileName, UseVirtFs_false, SkipError_false);
const XmlNodePtrConst rootNode = doc.rootNode();
if (!rootNode || !xmlNameEqual(rootNode, "updates"))