Author: silene
Date: Sat Apr  4 23:30:55 2009
New Revision: 34500

URL: http://svn.gna.org/viewcvs/wesnoth?rev=34500&view=rev
Log:
Removed config::get_children.

Modified:
    trunk/src/campaign_server/campaign_server.cpp

Modified: trunk/src/campaign_server/campaign_server.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/campaign_server/campaign_server.cpp?rev=34500&r1=34499&r2=34500&view=diff
==============================================================================
--- trunk/src/campaign_server/campaign_server.cpp (original)
+++ trunk/src/campaign_server/campaign_server.cpp Sat Apr  4 23:30:55 2009
@@ -659,9 +659,15 @@
                                                
write_file(campaign["filename"], std::string());
                                                
remove(campaign["filename"].c_str());
 
-                                               const config::child_list& 
campaigns_list = campaigns().get_children("campaign");
-                                               const size_t index = 
std::find(campaigns_list.begin(), campaigns_list.end(), &campaign) - 
campaigns_list.begin();
-                                               
campaigns().remove_child("campaign",index);
+                                               config::child_itors itors = 
campaigns().child_range("campaign");
+                                               for (size_t index = 0; 
itors.first != itors.second;
+                                                    ++index, ++itors.first)
+                                               {
+                                                       if (&campaign == 
&*itors.first) {
+                                                               
campaigns().remove_child("campaign", index);
+                                                               break;
+                                                       }
+                                               }
                                                scoped_ostream cfgfile = 
ostream_file(file_);
                                                write(*cfgfile, cfg_);
                                                
network::send_data(construct_message("Add-on deleted."), sock, gzipped);


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to