Author: silene
Date: Sun Apr 5 11:44:11 2009
New Revision: 34524
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34524&view=rev
Log:
Removed pointers to config.
Modified:
trunk/src/game_preferences.cpp
trunk/src/menu_events.cpp
trunk/src/preferences.cpp
trunk/src/preferences.hpp
Modified: trunk/src/game_preferences.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_preferences.cpp?rev=34524&r1=34523&r2=34524&view=diff
==============================================================================
--- trunk/src/game_preferences.cpp (original)
+++ trunk/src/game_preferences.cpp Sun Apr 5 11:44:11 2009
@@ -72,8 +72,8 @@
std::copy(terrain.begin(), terrain.end(),
std::inserter(encountered_terrains_set,
encountered_terrains_set.begin()));
- config* history = preferences::get_child("history");
- if (history) {
+ if (const config &history = preferences::get_child("history"))
+ {
/* Structure of the history
[history]
[history_id]
@@ -81,7 +81,7 @@
message = foobar
[/line]
*/
- foreach (const config::any_child &h,
history->all_children_range())
+ foreach (const config::any_child &h,
history.all_children_range())
{
foreach (const config &l, h.cfg.child_range("line")) {
history_map[h.key].push_back(l["message"]);
Modified: trunk/src/menu_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.cpp?rev=34524&r1=34523&r2=34524&view=diff
==============================================================================
--- trunk/src/menu_events.cpp (original)
+++ trunk/src/menu_events.cpp Sun Apr 5 11:44:11 2009
@@ -2420,9 +2420,9 @@
_("Toggle overlaying of terrain codes
on hexes."));
register_alias("show_terrain_codes", "tc");
- config* alias_list = preferences::get_alias();
- if (alias_list != NULL) {
- foreach (const config::attribute &a,
alias_list->attribute_range()) {
+ if (const config &alias_list =
preferences::get_alias())
+ {
+ foreach (const config::attribute &a,
alias_list.attribute_range()) {
register_alias(a.second,
a.first);
}
}
Modified: trunk/src/preferences.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/preferences.cpp?rev=34524&r1=34523&r2=34524&view=diff
==============================================================================
--- trunk/src/preferences.cpp (original)
+++ trunk/src/preferences.cpp Sun Apr 5 11:44:11 2009
@@ -108,10 +108,9 @@
prefs.add_child(key, val);
}
-config* get_child(const std::string& key)
-{
- config &cfg = prefs.child(key);
- return cfg ? &cfg : NULL;
+const config &get_child(const std::string& key)
+{
+ return prefs.child(key);
}
void erase(const std::string& key) {
@@ -593,7 +592,8 @@
}
-config* get_alias() {
+const config &get_alias()
+{
return get_child("alias");
}
Modified: trunk/src/preferences.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/preferences.hpp?rev=34524&r1=34523&r2=34524&view=diff
==============================================================================
--- trunk/src/preferences.hpp (original)
+++ trunk/src/preferences.hpp Sun Apr 5 11:44:11 2009
@@ -42,7 +42,7 @@
void set(const std::string& key, std::string value);
void clear(const std::string& key);
void set_child(const std::string& key, const config& val);
- config* get_child(const std::string& key);
+ const config &get_child(const std::string &key);
std::string get(const std::string& key);
void erase(const std::string& key);
@@ -116,7 +116,7 @@
void save_hotkeys();
void add_alias(const std::string& alias, const std::string& command);
- config* get_alias();
+ const config &get_alias();
bool use_colour_cursors();
void _set_colour_cursors(bool value);
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
