summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-02-21 05:25:21 +0300
committerAndrei Karas <akaras@inbox.ru>2017-02-21 05:25:21 +0300
commit01ac8bad77156f50ba57ddff5306714dc3815ef3 (patch)
tree5595cba954c4ea6c7a656a165fb2f39860918096 /src/gui
parent62fa493303fe3c191706090606ada885eaf184f5 (diff)
downloadmv-01ac8bad77156f50ba57ddff5306714dc3815ef3.tar.gz
mv-01ac8bad77156f50ba57ddff5306714dc3815ef3.tar.bz2
mv-01ac8bad77156f50ba57ddff5306714dc3815ef3.tar.xz
mv-01ac8bad77156f50ba57ddff5306714dc3815ef3.zip
Fix compilation with pugixml.
Add macroses for XmlChar and XmlConstChar.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/theme.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 9fa1b59ec..1888627d1 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -1179,7 +1179,7 @@ ImageSet *Theme::getImageSetFromThemeXml(const std::string &name,
#define readValue(name) \
{ \
- tmpData = reinterpret_cast<char*>( \
+ tmpData = reinterpret_cast<XmlChar*>( \
XmlNodeGetContent(infoNode)); \
info->name = tmpData; \
XmlFree(tmpData); \
@@ -1187,7 +1187,7 @@ ImageSet *Theme::getImageSetFromThemeXml(const std::string &name,
#define readIntValue(name) \
{ \
- tmpData = reinterpret_cast<char*>( \
+ tmpData = reinterpret_cast<XmlChar*>( \
XmlNodeGetContent(infoNode)); \
info->name = atoi(tmpData); \
XmlFree(tmpData); \
@@ -1195,7 +1195,7 @@ ImageSet *Theme::getImageSetFromThemeXml(const std::string &name,
#define readFloatValue(name) \
{ \
- tmpData = reinterpret_cast<char*>( \
+ tmpData = reinterpret_cast<XmlChar*>( \
XmlNodeGetContent(infoNode)); \
info->name = static_cast<float>(atof(tmpData)); \
XmlFree(tmpData); \
@@ -1231,7 +1231,7 @@ ThemeInfo *Theme::loadInfo(const std::string &themeName)
const std::string fontSize2("fontSize_" + mScreenDensity);
const std::string npcfontSize2("npcfontSize_" + mScreenDensity);
- char *tmpData = nullptr;
+ XmlChar *tmpData = nullptr;
for_each_xml_child_node(infoNode, rootNode)
{
if (xmlNameEqual(infoNode, "name"))