upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-19 01:38:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUI2/Definition: avoid redundant map search

Browse Source
This commit is contained in:
Charles Dang 2025-03-05 11:28:40 -05:00
parent 0d43a49c71
commit f292c946d8
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/core/gui_definition.cpp
View File

@ -72,14 +72,13 @@ gui_definition::gui_definition(const config& cfg)
styled_widget_definition_ptr def_ptr = widget_parser.parser(definition);
const std::string& def_id = def_ptr->id;
auto [_, success] = def_map.emplace(def_id, std::move(def_ptr));
if(def_map.find(def_id) != def_map.end()) {
if(!success) {
ERR_GUI_P << "Skipping duplicate definition '" << def_id << "' for '" << type_id << "'";
continue;
}
def_map.emplace(def_id, std::move(def_ptr));
if(def_id == "default") {
found_default_def = true;
}
@ -300,12 +299,8 @@ bool add_single_widget_definition(const std::string& widget_type, const std::str
throw std::invalid_argument("widget '" + widget_type + "' doesn't exist");
}
if(def_map.find(definition_id) != def_map.end()) {
return false;
}
def_map.emplace(definition_id, parser->second.parser(cfg));
return true;
auto [_, success] = def_map.emplace(definition_id, parser->second.parser(cfg));
return success;
}
void remove_single_widget_definition(const std::string& widget_type, const std::string& definition_id)