0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add_object() no longer returns an object& since it's never used.

Browse source
This commit is contained in:
Mark de Wever 2007-08-11 10:44:01 +00:00
parent 28ef68a2e2
commit 1bcdf860c3
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/theme.cpp
View file

@ -508,19 +508,16 @@ bool theme::set_resolution(const SDL_Rect& screen)
return result;
}
theme::object& theme::add_object(const config& cfg){
static theme::object result;
void theme::add_object(const config& cfg){
const config* const main_map_cfg = cfg.child("main_map");
if(main_map_cfg != NULL) {
main_map_ = object(*main_map_cfg);
result = main_map_;
}
const config* const mini_map_cfg = cfg.child("mini_map");
if(mini_map_cfg != NULL) {
mini_map_ = object(*mini_map_cfg);
result = mini_map_;
}
const config* const status_cfg = cfg.child("status");
@ -536,7 +533,6 @@ theme::object& theme::add_object(const config& cfg){
} else {
unit_image_ = object();
}
result = unit_image_;
}
const config::child_list& panel_list = cfg.get_children("panel");
@ -544,7 +540,6 @@ theme::object& theme::add_object(const config& cfg){
panel new_panel(**p);
set_object_location(new_panel, (**p)["rect"], (**p)["ref"]);
panels_.push_back(new_panel);
result = new_panel;
}
const config::child_list& label_list = cfg.get_children("label");
@ -552,7 +547,6 @@ theme::object& theme::add_object(const config& cfg){
label new_label(**lb);
set_object_location(new_label, (**lb)["rect"], (**lb)["ref"]);
labels_.push_back(new_label);
result = new_label;
}
const config::child_list& menu_list = cfg.get_children("menu");
@ -567,10 +561,8 @@ theme::object& theme::add_object(const config& cfg){
}
LOG_DP << "done adding menu...\n";
result = new_menu;
}
return result;
}
void theme::remove_object(std::string id){

2
src/theme.hpp
View file

@ -177,7 +177,7 @@ public:
private:
theme::object& find_element(std::string id);
theme::object& add_object(const config& cfg);
void add_object(const config& cfg);
void remove_object(std::string id);
void set_object_location(theme::object& element, std::string rect_str, std::string ref_id);