mail[Wesnoth-commits] r29109 - in /trunk/src/gui/widgets: listbox.cpp toggle_panel.cpp toggle_panel.hpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by koraq on August 30, 2008 - 17:15:
Author: mordante
Date: Sat Aug 30 16:34:44 2008
New Revision: 29109

URL: http://svn.gna.org/viewcvs/wesnoth?rev=29109&view=rev
Log:
Renamed set_members to set_child_members.

This is done to avoid hiding the set_members function in the base class.

Modified:
    trunk/src/gui/widgets/listbox.cpp
    trunk/src/gui/widgets/toggle_panel.cpp
    trunk/src/gui/widgets/toggle_panel.hpp

Modified: trunk/src/gui/widgets/listbox.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/listbox.cpp?rev=29109&r1=29108&r2=29109&view=diff
==============================================================================
--- trunk/src/gui/widgets/listbox.cpp (original)
+++ trunk/src/gui/widgets/listbox.cpp Sat Aug 30 16:34:44 2008
@@ -781,7 +781,7 @@
                                }
                        } else if(panel) {
                                
panel->set_callback_state_change(callback_select_list_item);
-                               panel->set_members(data);
+                               panel->set_child_members(data);
                        } else if(child_grid) {
                                init_in_grid(child_grid, data);
                        } else {

Modified: trunk/src/gui/widgets/toggle_panel.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/toggle_panel.cpp?rev=29109&r1=29108&r2=29109&view=diff
==============================================================================
--- trunk/src/gui/widgets/toggle_panel.cpp (original)
+++ trunk/src/gui/widgets/toggle_panel.cpp Sat Aug 30 16:34:44 2008
@@ -40,7 +40,7 @@
 
 namespace gui2 {
 
-void ttoggle_panel::set_members(const std::map<std::string /* widget id */, 
std::map<
+void ttoggle_panel::set_child_members(const std::map<std::string /* widget 
id */, std::map<
                std::string /* member id */, t_string /* member value */> >& 
data)
 {
        // typedef boost problem work around.

Modified: trunk/src/gui/widgets/toggle_panel.hpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/toggle_panel.hpp?rev=29109&r1=29108&r2=29109&view=diff
==============================================================================
--- trunk/src/gui/widgets/toggle_panel.hpp (original)
+++ trunk/src/gui/widgets/toggle_panel.hpp Sat Aug 30 16:34:44 2008
@@ -45,7 +45,7 @@
         *
         * @param data                Map with the key value pairs to set the 
members.
         */
-       void set_members(const std::map<std::string /* widget id */, std::map<
+       void set_child_members(const std::map<std::string /* widget id */, 
std::map<
                std::string /* member id */, t_string /* member value */> >& 
data);
 
        /***** ***** ***** ***** Inherited ***** ***** ***** *****/




Related Messages


Powered by MHonArc, Updated Sat Aug 30 17:21:53 2008