Author: silene
Date: Sat Apr 4 21:12:57 2009
New Revision: 34490
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34490&view=rev
Log:
Partly removed config::all_children.
Modified:
trunk/src/theme.cpp
Modified: trunk/src/theme.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/theme.cpp?rev=34490&r1=34489&r2=34490&view=diff
==============================================================================
--- trunk/src/theme.cpp (original)
+++ trunk/src/theme.cpp Sat Apr 4 21:12:57 2009
@@ -195,15 +195,12 @@
}
// cannot add [status] sub-elements, but who
cares
- if (const config &c =
parent_stack.back()->child("add")) {
- const config::child_map m =
c.all_children();
-
for(config::child_map::const_iterator j = m.begin(); j != m.end(); ++j) {
-
for(config::child_list::const_iterator k = j->second.begin();
- k !=
j->second.end(); ++k) {
-
res_cfgs_.back().add_child(j->first, **k);
- }
- }
+ if (const config &c =
parent_stack.back()->child("add"))
+ {
+ foreach (const config::any_child &j,
c.all_children_range()) {
+
res_cfgs_.back().add_child(j.key, j.cfg);
}
+ }
parent_stack.pop_back();
}
@@ -617,10 +614,8 @@
if (const config &status_cfg = cfg.child("status"))
{
- for(config::child_map::const_iterator i =
status_cfg.all_children().begin(); i != status_cfg.all_children().end(); ++i) {
- for(config::child_list::const_iterator j =
i->second.begin(); j != i->second.end(); ++j) {
-
status_.insert(std::pair<std::string,status_item>(i->first,status_item(**j)));
- }
+ foreach (const config::any_child &i,
status_cfg.all_children_range()) {
+ status_.insert(std::pair<std::string,
status_item>(i.key, status_item(i.cfg)));
}
if (const config &unit_image_cfg =
status_cfg.child("unit_image")) {
unit_image_ = object(unit_image_cfg);
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
