Convert LLUIColorTable to string_view

indra/llui/llui.cpp

@@ -531,7 +531,7 @@ namespace LLInitParam
 	{
 		if (control.isProvided() && !control().empty())
 		{
-			updateValue(LLUIColorTable::instance().getColor(control));
+			updateValue(LLUIColorTable::instance().getColor(control.getValue()));
 		}
 		else
 		{

indra/llui/lluicolortable.cpp

@@ -63,7 +63,7 @@ void LLUIColorTable::insertFromParams(const Params& p, string_color_map_t& table
 		ColorEntryParams color_entry = *it;
 		if(color_entry.color.value.isChosen())
 		{
-			setColor(color_entry.name, color_entry.color.value, table);
+			setColor(color_entry.name.getValue(), color_entry.color.value, table);
 		}
 		else
 		{
@@ -176,7 +176,7 @@ void LLUIColorTable::clear()
 	clearTable(mUserSetColors);
 }
 
-LLUIColor LLUIColorTable::getColor(const std::string& name, const LLColor4& default_color) const
+LLUIColor LLUIColorTable::getColor(std::string_view name, const LLColor4& default_color) const
 {
 	string_color_map_t::const_iterator iter = mUserSetColors.find(name);
 	
@@ -196,7 +196,7 @@ LLUIColor LLUIColorTable::getColor(const std::string& name, const LLColor4& defa
 }
 
 // update user color, loaded colors are parsed on initialization
-void LLUIColorTable::setColor(const std::string& name, const LLColor4& color)
+void LLUIColorTable::setColor(std::string_view name, const LLColor4& color)
 {
 	setColor(name, color, mUserSetColors);
 	setColor(name, color, mLoadedColors);
@@ -254,7 +254,7 @@ void LLUIColorTable::saveUserSettings() const
 	}
 }
 
-bool LLUIColorTable::colorExists(const std::string& color_name) const
+bool LLUIColorTable::colorExists(std::string_view color_name) const
 {
 	return ((mLoadedColors.find(color_name) != mLoadedColors.end())
 		 || (mUserSetColors.find(color_name) != mUserSetColors.end()));
@@ -272,7 +272,7 @@ void LLUIColorTable::clearTable(string_color_map_t& table)
 
 // this method inserts a color into the table if it does not exist
 // if the color already exists it changes the color
-void LLUIColorTable::setColor(const std::string& name, const LLColor4& color, string_color_map_t& table)
+void LLUIColorTable::setColor(std::string_view name, const LLColor4& color, string_color_map_t& table)
 {
 	string_color_map_t::iterator it = table.lower_bound(name);
 	if(it != table.end()

indra/llui/lluicolortable.h

@@ -42,7 +42,7 @@ class LLUIColorTable final : public LLSingleton<LLUIColorTable>
 	LOG_CLASS(LLUIColorTable);
 
 	// consider using sorted vector, can be much faster
-	typedef std::map<std::string, LLUIColor>  string_color_map_t;
+	typedef std::map<std::string, LLUIColor, std::less<>>  string_color_map_t;
 
 public:
 	struct ColorParams : LLInitParam::ChoiceBlock<ColorParams>
@@ -75,13 +75,13 @@ class LLUIColorTable final : public LLSingleton<LLUIColorTable>
 	void clear();
 
 	// color lookup
-	LLUIColor getColor(const std::string& name, const LLColor4& default_color = LLColor4::magenta) const;
+	LLUIColor getColor(std::string_view, const LLColor4& default_color = LLColor4::magenta) const;
 
 	// if the color is in the table, it's value is changed, otherwise it is added
-	void setColor(const std::string& name, const LLColor4& color);
+	void setColor(std::string_view name, const LLColor4& color);
 
 	// returns true if color_name exists in the table
-	bool colorExists(const std::string& color_name) const;
+	bool colorExists(std::string_view color_name) const;
 
 	// loads colors from settings files
 	bool loadFromSettings();
@@ -95,7 +95,7 @@ class LLUIColorTable final : public LLSingleton<LLUIColorTable>
 	void insertFromParams(const Params& p, string_color_map_t& table);
 	
 	void clearTable(string_color_map_t& table);
-	void setColor(const std::string& name, const LLColor4& color, string_color_map_t& table);
+	void setColor(std::string_view name, const LLColor4& color, string_color_map_t& table);
 
 	string_color_map_t mLoadedColors;
 	string_color_map_t mUserSetColors;