Author: silene
Date: Sun Apr 5 19:04:54 2009
New Revision: 34550
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34550&view=rev
Log:
Removed useless pointer.
Modified:
trunk/src/replay_controller.cpp
trunk/src/theme.cpp
trunk/src/theme.hpp
Modified: trunk/src/replay_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/replay_controller.cpp?rev=34550&r1=34549&r2=34550&view=diff
==============================================================================
--- trunk/src/replay_controller.cpp (original)
+++ trunk/src/replay_controller.cpp Sun Apr 5 19:04:54 2009
@@ -147,7 +147,7 @@
if (const config &res = theme_cfg.child("resolution"))
{
if (const config &replay_theme_cfg = res.child("replay"))
- gui_->get_theme().modify(&replay_theme_cfg);
+ gui_->get_theme().modify(replay_theme_cfg);
//Make sure we get notified if the theme is redrawn completely.
That way we have
//a chance to restore the replay controls of the theme as well.
gui_->invalidate_theme();
Modified: trunk/src/theme.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/theme.cpp?rev=34550&r1=34549&r2=34550&view=diff
==============================================================================
--- trunk/src/theme.cpp (original)
+++ trunk/src/theme.cpp Sun Apr 5 19:04:54 2009
@@ -687,7 +687,8 @@
}
}
-void theme::modify(const config* cfg){
+void theme::modify(const config &cfg)
+{
std::map<std::string,std::string> title_stash;
std::vector<theme::menu>::iterator m;
for (m = menus_.begin(); m != menus_.end(); ++m) {
@@ -696,7 +697,7 @@
}
// Change existing theme objects.
- foreach (const config &c, cfg->child_range("change"))
+ foreach (const config &c, cfg.child_range("change"))
{
std::string id = c["id"];
std::string ref_id = c["ref"];
@@ -706,12 +707,12 @@
}
// Add new theme objects.
- foreach (const config &c, cfg->child_range("add")) {
+ foreach (const config &c, cfg.child_range("add")) {
add_object(c);
}
// Remove existent theme objects.
- foreach (const config &c, cfg->child_range("remove")) {
+ foreach (const config &c, cfg.child_range("remove")) {
remove_object(c["id"]);
}
Modified: trunk/src/theme.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/theme.hpp?rev=34550&r1=34549&r2=34550&view=diff
==============================================================================
--- trunk/src/theme.hpp (original)
+++ trunk/src/theme.hpp Sun Apr 5 19:04:54 2009
@@ -195,7 +195,7 @@
explicit theme(const config& cfg, const SDL_Rect& screen);
bool set_resolution(const SDL_Rect& screen);
- void modify(const config* cfg);
+ void modify(const config &cfg);
const std::vector<panel>& panels() const { return panels_; }
const std::vector<label>& labels() const { return labels_; }
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
