diff --git a/code/nel/include/nel/georges/form_elm.h b/code/nel/include/nel/georges/form_elm.h index 48118b7d8..2d9e76630 100644 --- a/code/nel/include/nel/georges/form_elm.h +++ b/code/nel/include/nel/georges/form_elm.h @@ -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 diff --git a/code/nel/src/georges/form_elm.cpp b/code/nel/src/georges/form_elm.cpp index 03d39967a..658d1d9f6 100644 --- a/code/nel/src/georges/form_elm.cpp +++ b/code/nel/src/georges/form_elm.cpp @@ -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; } // *************************************************************************** diff --git a/code/studio/src/plugins/georges_editor/browser_ctrl_pvt.cpp b/code/studio/src/plugins/georges_editor/browser_ctrl_pvt.cpp index 484649e52..dbeb8fecf 100644 --- a/code/studio/src/plugins/georges_editor/browser_ctrl_pvt.cpp +++ b/code/studio/src/plugins/georges_editor/browser_ctrl_pvt.cpp @@ -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;