Second Life viewer sources 1.21.0-RC

1 files changed, 28 insertions, 28 deletions

diff --git a/linden/indra/llui/lluictrlfactory.cpp b/linden/indra/llui/lluictrlfactory.cpp
index 212c1c5..bcd4876 100644
--- a/linden/indra/llui/lluictrlfactory.cpp
+++ b/linden/indra/llui/lluictrlfactory.cpp
@@ -76,18 +76,18 @@ const S32 VPAD = 4;
 const S32 FLOATER_H_MARGIN = 15;
 const S32 MIN_WIDGET_HEIGHT = 10;
 
-std::vector<LLString> LLUICtrlFactory::sXUIPaths;
+std::vector<std::string> LLUICtrlFactory::sXUIPaths;
 
 // UI Ctrl class for padding
 class LLUICtrlLocate : public LLUICtrl
 {
 public:
-        LLUICtrlLocate() : LLUICtrl("locate", LLRect(0,0,0,0), FALSE, NULL, NULL) { setTabStop(FALSE); }
+        LLUICtrlLocate() : LLUICtrl(std::string("locate"), LLRect(0,0,0,0), FALSE, NULL, NULL) { setTabStop(FALSE); }
         virtual void draw() { }
 
         static LLView *fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
         {
-                LLString name("pad");
+                std::string name("pad");
                 node->getAttributeString("name", name);
 
                 LLUICtrlLocate *new_ctrl = new LLUICtrlLocate();
@@ -117,7 +117,7 @@ LLUICtrlFactory::~LLUICtrlFactory()
 
 void LLUICtrlFactory::setupPaths()
 {
-        LLString filename = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "paths.xml");
+        std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "paths.xml");
 
         LLXMLNodePtr root;
         BOOL success  = LLXMLNode::parseFile(filename, root, NULL);
@@ -130,7 +130,7 @@ void LLUICtrlFactory::setupPaths()
                 for (path = root->getFirstChild(); path.notNull(); path = path->getNextSibling())
                 {
                         LLUIString path_val_ui(path->getValue());
-                        LLString language = "en-us";
+                        std::string language = "en-us";
                         if (LLUI::sConfigGroup)
                         {
                                 language = LLUI::sConfigGroup->getString("Language");
@@ -149,8 +149,8 @@ void LLUICtrlFactory::setupPaths()
         }
         else // parsing failed
         {
-                LLString slash = gDirUtilp->getDirDelimiter();
-                LLString dir = "xui" + slash + "en-us";
+                std::string slash = gDirUtilp->getDirDelimiter();
+                std::string dir = "xui" + slash + "en-us";
                 llwarns << "XUI::config file unable to open: " << filename << llendl;
                 sXUIPaths.push_back(dir);
         }
@@ -161,7 +161,7 @@ void LLUICtrlFactory::setupPaths()
 //-----------------------------------------------------------------------------
 // getLayeredXMLNode()
 //-----------------------------------------------------------------------------
-bool LLUICtrlFactory::getLayeredXMLNode(const LLString &xui_filename, LLXMLNodePtr& root)
+bool LLUICtrlFactory::getLayeredXMLNode(const std::string &xui_filename, LLXMLNodePtr& root)
 {
         std::string full_filename = gDirUtilp->findSkinnedFilename(sXUIPaths.front(), xui_filename);
         if (full_filename.empty())
@@ -182,12 +182,12 @@ bool LLUICtrlFactory::getLayeredXMLNode(const LLString &xui_filename, LLXMLNodeP
 
         LLXMLNodePtr updateRoot;
 
-        std::vector<LLString>::const_iterator itor;
+        std::vector<std::string>::const_iterator itor;
 
         for (itor = sXUIPaths.begin(), ++itor; itor != sXUIPaths.end(); ++itor)
         {
-                LLString nodeName;
-                LLString updateName;
+                std::string nodeName;
+                std::string updateName;
 
                 std::string layer_filename = gDirUtilp->findSkinnedFilename((*itor), xui_filename);
                 if(layer_filename.empty())
@@ -218,7 +218,7 @@ bool LLUICtrlFactory::getLayeredXMLNode(const LLString &xui_filename, LLXMLNodeP
 //-----------------------------------------------------------------------------
 // buildFloater()
 //-----------------------------------------------------------------------------
-void LLUICtrlFactory::buildFloater(LLFloater* floaterp, const LLString &filename, 
+void LLUICtrlFactory::buildFloater(LLFloater* floaterp, const std::string& filename, 
                                                                         const LLCallbackMap::map_t* factory_map, BOOL open) /* Flawfinder: ignore */
 {
         LLXMLNodePtr root;
@@ -259,9 +259,9 @@ void LLUICtrlFactory::buildFloater(LLFloater* floaterp, const LLString &filename
 //-----------------------------------------------------------------------------
 // saveToXML()
 //-----------------------------------------------------------------------------
-S32 LLUICtrlFactory::saveToXML(LLView* viewp, const LLString& filename)
+S32 LLUICtrlFactory::saveToXML(LLView* viewp, const std::string& filename)
 {
-        llofstream out(filename.c_str());
+        llofstream out(filename);
         if (!out.good())
         {
                 llwarns << "Unable to open " << filename << " for output." << llendl;
@@ -281,7 +281,7 @@ S32 LLUICtrlFactory::saveToXML(LLView* viewp, const LLString& filename)
 //-----------------------------------------------------------------------------
 // buildPanel()
 //-----------------------------------------------------------------------------
-BOOL LLUICtrlFactory::buildPanel(LLPanel* panelp, const LLString &filename,
+BOOL LLUICtrlFactory::buildPanel(LLPanel* panelp, const std::string& filename,
                                                                         const LLCallbackMap::map_t* factory_map)
 {
         BOOL didPost = FALSE;
@@ -325,7 +325,7 @@ BOOL LLUICtrlFactory::buildPanel(LLPanel* panelp, const LLString &filename,
 //-----------------------------------------------------------------------------
 // buildMenu()
 //-----------------------------------------------------------------------------
-LLMenuGL *LLUICtrlFactory::buildMenu(const LLString &filename, LLView* parentp)
+LLMenuGL *LLUICtrlFactory::buildMenu(const std::string &filename, LLView* parentp)
 {
         // TomY TODO: Break this function into buildMenu and buildMenuBar
         LLXMLNodePtr root;
@@ -363,7 +363,7 @@ LLMenuGL *LLUICtrlFactory::buildMenu(const LLString &filename, LLView* parentp)
 //-----------------------------------------------------------------------------
 // buildMenu()
 //-----------------------------------------------------------------------------
-LLPieMenu *LLUICtrlFactory::buildPieMenu(const LLString &filename, LLView* parentp)
+LLPieMenu *LLUICtrlFactory::buildPieMenu(const std::string &filename, LLView* parentp)
 {
         LLXMLNodePtr root;
 
@@ -379,7 +379,7 @@ LLPieMenu *LLUICtrlFactory::buildPieMenu(const LLString &filename, LLView* paren
                 return NULL;
         }
 
-        LLString name("menu");
+        std::string name("menu");
         root->getAttributeString("name", name);
 
         LLPieMenu *menu = new LLPieMenu(name);
@@ -404,7 +404,7 @@ void LLUICtrlFactory::rebuild()
                 built_panel_it != mBuiltPanels.end();
                 ++built_panel_it)
         {
-                LLString filename = built_panel_it->second;
+                std::string filename = built_panel_it->second;
                 LLPanel* panelp = built_panel_it->first.get();
                 if (!panelp)
                 {
@@ -432,7 +432,7 @@ void LLUICtrlFactory::rebuild()
                 {
                         continue;
                 }
-                LLString filename = built_floater_it->second;
+                std::string filename = built_floater_it->second;
                 llinfos << "Rebuilding UI floater " << floaterp->getName()
                         << " from " << filename
                         << llendl;
@@ -452,8 +452,8 @@ void LLUICtrlFactory::rebuild()
 
 LLView *LLUICtrlFactory::createCtrlWidget(LLPanel *parent, LLXMLNodePtr node)
 {
-        LLString ctrl_type = node->getName()->mString;
-        LLString::toLower(ctrl_type);
+        std::string ctrl_type = node->getName()->mString;
+        LLStringUtil::toLower(ctrl_type);
         
         LLWidgetClassRegistry::factory_func_t func = LLWidgetClassRegistry::getInstance()->getCreatorFunc(ctrl_type);
 
@@ -494,7 +494,7 @@ LLView* LLUICtrlFactory::createWidget(LLPanel *parent, LLXMLNodePtr node)
 //-----------------------------------------------------------------------------
 // createFactoryPanel()
 //-----------------------------------------------------------------------------
-LLPanel* LLUICtrlFactory::createFactoryPanel(LLString name)
+LLPanel* LLUICtrlFactory::createFactoryPanel(const std::string& name)
 {
         std::deque<const LLCallbackMap::map_t*>::iterator itor;
         for (itor = mFactoryStack.begin(); itor != mFactoryStack.end(); ++itor)
@@ -516,10 +516,10 @@ LLPanel* LLUICtrlFactory::createFactoryPanel(LLString name)
 //-----------------------------------------------------------------------------
 
 //static
-BOOL LLUICtrlFactory::getAttributeColor(LLXMLNodePtr node, const LLString& name, LLColor4& color)
+BOOL LLUICtrlFactory::getAttributeColor(LLXMLNodePtr node, const std::string& name, LLColor4& color)
 {
-        LLString colorstring;
-        BOOL res = node->getAttributeString(name, colorstring);
+        std::string colorstring;
+        BOOL res = node->getAttributeString(name.c_str(), colorstring);
         if (res && LLUI::sColorsGroup)
         {
                 if (LLUI::sColorsGroup->controlExists(colorstring))
@@ -533,11 +533,11 @@ BOOL LLUICtrlFactory::getAttributeColor(LLXMLNodePtr node, const LLString& name,
         }
         if (!res)
         {
-                res = LLColor4::parseColor(colorstring.c_str(), &color);
+                res = LLColor4::parseColor(colorstring, &color);
         }       
         if (!res)
         {
-                res = node->getAttributeColor(name, color);
+                res = node->getAttributeColor(name.c_str(), color);
         }
         return res;
 }