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

When in Rome, do as the Romans do

Browse source
This commit is contained in:
kaetemi 2014-09-11 10:36:41 +02:00
parent 5f78631be3
commit f629bcbc3f
3 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
code/nel/include/nel/georges/form_elm.h
View file

@ -440,21 +440,23 @@ public:
// From UFormElm
bool isAtom () const;
bool getValue (std::string &resultname, TEval evaluate) const;
bool getValue (sint8 &resultname, TEval evaluate) const;
bool getValue (uint8 &resultname, TEval evaluate) const;
bool getValue (sint16 &resultname, TEval evaluate) const;
bool getValue (uint16 &resultname, TEval evaluate) const;
bool getValue (sint32 &resultname, TEval evaluate) const;
bool getValue (uint32 &resultname, TEval evaluate) const;
bool getValue (float &resultname, TEval evaluate) const;
bool getValue (double &resultname, TEval evaluate) const;
bool getValue (bool &resultname, TEval evaluate) const;
bool getValue (NLMISC::CRGBA &resultname, TEval evaluate) const;
bool getValue (std::string &result, TEval evaluate) const;
bool getValue (sint8 &result, TEval evaluate) const;
bool getValue (uint8 &result, TEval evaluate) const;
bool getValue (sint16 &result, TEval evaluate) const;
bool getValue (uint16 &result, TEval evaluate) const;
bool getValue (sint32 &result, TEval evaluate) const;
bool getValue (uint32 &result, TEval evaluate) const;
bool getValue (float &result, TEval evaluate) const;
bool getValue (double &result, TEval evaluate) const;
bool getValue (bool &result, TEval evaluate) const;
bool getValue (NLMISC::CRGBA &result, TEval evaluate) const;
// Set the value, the elt been used
void setValue (const char *value);
std::string getValue() const;
// Get the raw value. Does not care about any parent or default values
void getValue (std::string &result) const;
private:
// The value

4
code/nel/src/georges/form_elm.cpp
View file

@ -3056,9 +3056,9 @@ void CFormElmAtom::setValue (const char *value)
// ***************************************************************************
std::string CFormElmAtom::getValue() const
void CFormElmAtom::getValue (std::string &result) const
{
return Value;
result = Value;
}
// ***************************************************************************

3
code/studio/src/plugins/georges_editor/browser_ctrl_pvt.cpp
View file

@ -310,7 +310,8 @@ void BrowserCtrlPvt::setupAtom( GeorgesQt::CFormItem *node )
return;
NLGEORGES::CFormElmAtom *atom = static_cast< NLGEORGES::CFormElmAtom* >( n );
std::string v = atom->getValue();
std::string v;
atom->getValue( v );
const NLGEORGES::CType *t = atom->getType();
QVariant::Type tt = QVariant::String;