livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch ui string args to auto_ptr to do automatic cleanup

master
Richard Linden 2010-10-15 14:11:24 -07:00
parent 6dcf769ca5
commit 98563df257
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llui/lluistring.cpp
View File

@ -129,7 +129,7 @@ void LLUIString::updateResult() const
mResult = mOrig;
// get the defailt args + local args
if (!mArgs || mArgs->empty())
if (!mArgs.get() || mArgs->empty())
{
LLStringUtil::format(mResult, LLTrans::getDefaultArgs());
}
@ -150,7 +150,7 @@ void LLUIString::updateWResult() const
LLStringUtil::format_map_t& LLUIString::getArgs()
{
if (!mArgs)
if (!mArgs.get())
{
mArgs = new LLStringUtil::format_map_t;
}

4
indra/llui/lluistring.h
View File

@ -80,7 +80,7 @@ public:
S32 length() const { return getUpdatedWResult().size(); }
void clear();
void clearArgs() { if (mArgs) mArgs->clear(); }
void clearArgs() { if (mArgs.get()) mArgs->clear(); }
// These utility functions are included for text editing.
// They do not affect mOrig and do not perform argument substitution
@ -104,7 +104,7 @@ private:
std::string mOrig;
mutable std::string mResult;
mutable LLWString mWResult; // for displaying
LLStringUtil::format_map_t* mArgs;
std::auto_ptr<LLStringUtil::format_map_t> mArgs;
// controls lazy evaluation
mutable bool mNeedsResult;