Author: mordante
Date: Sun Jul 31 18:56:09 2011
New Revision: 50507

URL: http://svn.gna.org/viewcvs/wesnoth?rev=50507&view=rev
Log:
Remove register_bool2.

The function register_bool now has the same interface so removed the
duplicate and modify all its callers.

Modified:
    trunk/src/gui/dialogs/dialog.cpp
    trunk/src/gui/dialogs/dialog.hpp
    trunk/src/gui/dialogs/edit_label.cpp
    trunk/src/gui/dialogs/game_save.cpp

Modified: trunk/src/gui/dialogs/dialog.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/dialog.cpp?rev=50507&r1=50506&r2=50507&view=diff
==============================================================================
--- trunk/src/gui/dialogs/dialog.cpp (original)
+++ trunk/src/gui/dialogs/dialog.cpp Sun Jul 31 18:56:09 2011
@@ -103,14 +103,6 @@
        return field;
 }
 
-tfield_bool* tdialog::register_bool2(const std::string& id
-               , const bool mandatory
-               , bool& linked_variable
-               , void (*callback_change) (twidget* widget))
-{
-       return register_bool(id, mandatory, linked_variable, callback_change);
-}
-
 tfield_integer* tdialog::register_integer(
                  const std::string& id
                , const bool mandatory

Modified: trunk/src/gui/dialogs/dialog.hpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/dialog.hpp?rev=50507&r1=50506&r2=50507&view=diff
==============================================================================
--- trunk/src/gui/dialogs/dialog.hpp (original)
+++ trunk/src/gui/dialogs/dialog.hpp Sun Jul 31 18:56:09 2011
@@ -216,26 +216,6 @@
                        , void (*callback_change) (twidget* widget) = NULL);
 
        /**
-        * Creates a new boolean field.
-        *
-        * The field created is owned by tdialog, the returned pointer can be 
used
-        * in the child classes as access to a field.
-        *
-        * @param id                  Id of the widget, same value as in WML.
-        * @param mandatory           Is the widget mandatory or optional.
-        * @param linked_variable     The variable the widget is linked to. See
-        *                            @ref tfield::tfield for more information.
-        * @param callback_change     When the value of the widget changes this
-        *                            callback is called.
-        *
-        * @returns                   Pointer to the created widget.
-        */
-       tfield_bool* register_bool2(const std::string& id
-                       , const bool mandatory
-                       , bool& linked_variable
-                       , void (*callback_change) (twidget* widget) = NULL);
-
-       /**
         * Creates a new integer field.
         *
         * See @ref register_bool for more info.

Modified: trunk/src/gui/dialogs/edit_label.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/edit_label.cpp?rev=50507&r1=50506&r2=50507&view=diff
==============================================================================
--- trunk/src/gui/dialogs/edit_label.cpp (original)
+++ trunk/src/gui/dialogs/edit_label.cpp Sun Jul 31 18:56:09 2011
@@ -49,7 +49,7 @@
 tedit_label::tedit_label(std::string& label, bool& team_only)
 {
        register_text2("label", true, label, true);
-       register_bool2("team_only_toggle", true, team_only);
+       register_bool("team_only_toggle", true, team_only);
 }
 
 }

Modified: trunk/src/gui/dialogs/game_save.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/game_save.cpp?rev=50507&r1=50506&r2=50507&view=diff
==============================================================================
--- trunk/src/gui/dialogs/game_save.cpp (original)
+++ trunk/src/gui/dialogs/game_save.cpp Sun Jul 31 18:56:09 2011
@@ -76,7 +76,7 @@
        register_label2("lblTitle", true, title);
        register_label2("txtFilename", false, filename);
        register_label2("lblMessage", true, message);
-       register_bool2("ignore_all", true, ignore_all);
+       register_bool("ignore_all", true, ignore_all);
 }
 
 } // namespace gui2


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

Reply via email to