Khaganat-NeL/khanat-opennel-code
1
0
Fork 0
Code Issues 21 Pull requests Packages Projects Releases 1 Wiki Activity

Fix compilation

Browse source
This commit is contained in:
Nimetu 2015-03-01 18:41:16 +02:00
parent e2c3fc8968
commit ba1052672f
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/src/gui/interface_anim.cpp
View file

@ -55,7 +55,7 @@ namespace NLGUI
if (ptr) _Dynamic = CInterfaceElement::convertBool (ptr);
ptr = xmlGetProp (cur, (xmlChar*)"type");
string sTmp = ptr;
string sTmp = ptr.str();
sTmp = strlwr(sTmp);
if (sTmp == "linear")
_Type = Track_Linear;

2
code/nel/src/gui/interface_group.cpp
View file

@ -312,7 +312,7 @@ namespace NLGUI
ptr = (char*) xmlGetProp( cur, (xmlChar*)"max_sizeparent" );
if (ptr)
{
string idparent = ptr;
string idparent = ptr.str();
idparent = NLMISC::strlwr(idparent);
if (idparent != "parent")
{

14
code/nel/src/gui/interface_parser.cpp
View file

@ -664,7 +664,7 @@ namespace NLGUI
//if it begins with a #, it is a reference in the instance attribute
if (strchr(ptr, '#') != NULL)
{
string LastProp = ptr;
string LastProp = ptr.str();
string NewProp ="";
string RepProp;
@ -929,7 +929,7 @@ namespace NLGUI
nlwarning("<CInterfaceParser::parseLink> Can't read the expression for a link node");
return false;
}
std::string expr = ptr;
std::string expr = ptr.str();
std::vector<CInterfaceLink::CTargetInfo> targets;
@ -1119,13 +1119,13 @@ namespace NLGUI
nlinfo ("options has no name");
return false;
}
string optionsName = ptr;
string optionsName = ptr.str();
// herit if possible
ptr = (char*) xmlGetProp( cur, (xmlChar*)"herit" );
if (ptr)
{
string optionsParentName = ptr;
string optionsParentName = ptr.str();
CInterfaceOptions *io = wm->getOptions( optionsParentName );
if( io != NULL )
options->copyBasicMap( *io );
@ -1807,7 +1807,7 @@ namespace NLGUI
nlwarning ("no id in a procedure");
return false;
}
string procId= ptr;
string procId= ptr.str();
if (_ProcedureMap.find(procId) != _ProcedureMap.end())
{
@ -2171,7 +2171,7 @@ namespace NLGUI
//get the property value
ptr = (char*)xmlGetProp( cur, props->name);
nlassert(ptr);
string propVal= ptr;
string propVal= ptr.str();
string newPropVal;
// solve define of this prop
@ -2328,7 +2328,7 @@ namespace NLGUI
nlinfo ("anim has no id");
return false;
}
string animId = ptr;
string animId = ptr.str();
pAnim = new CInterfaceAnim;
if (pAnim->parse (cur, parentGroup))

2
code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
View file

@ -468,7 +468,7 @@ bool CCtrlSheetInfo::parseCtrlInfo(xmlNodePtr cur, CInterfaceGroup * /* parentGr
prop = (char*) xmlGetProp( cur, (xmlChar*)"item_slot" );
if(prop)
{
string str= prop;
string str= prop.str();
_ItemSlot= SLOTTYPE::stringToSlotType(NLMISC::toUpper(str));
}

2
code/ryzom/client/src/interface_v3/group_map.cpp
View file

@ -556,7 +556,7 @@ bool CGroupMap::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup)
ptr = (char*) xmlGetProp( cur, (xmlChar*)"map_mode" );
if (ptr)
{
string sTmp = ptr;
string sTmp = ptr.str();
if (sTmp == "normal")
_MapMode = MapMode_Normal;
else if (sTmp == "death")

2
code/ryzom/client/src/interface_v3/parser_modules.cpp
View file

@ -353,7 +353,7 @@ bool CCommandParser::parse( xmlNodePtr cur, NLGUI::CInterfaceGroup *parentGroup
if (ptrName)
{
// Does the action exist ?
std::string name = ptrName;
std::string name = ptrName.str();
if (!ICommand::exists (name) || (CUserCommand::CommandMap.find(name) != CUserCommand::CommandMap.end()))
{
// Get the action