Author: mordante
Date: Tue Aug 30 21:41:22 2011
New Revision: 50956
URL: http://svn.gna.org/viewcvs/wesnoth?rev=50956&view=rev
Log:
Remove a deprecated function.
Modified:
trunk/src/gui/dialogs/addon_connect.cpp
trunk/src/gui/dialogs/dialog.cpp
trunk/src/gui/dialogs/dialog.hpp
trunk/src/gui/dialogs/edit_label.cpp
trunk/src/gui/dialogs/folder_create.cpp
trunk/src/gui/dialogs/game_save.cpp
trunk/src/gui/dialogs/mp_cmd_wrapper.cpp
trunk/src/gui/dialogs/mp_create_game_set_password.cpp
Modified: trunk/src/gui/dialogs/addon_connect.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/addon_connect.cpp?rev=50956&r1=50955&r2=50956&view=diff
==============================================================================
--- trunk/src/gui/dialogs/addon_connect.cpp (original)
+++ trunk/src/gui/dialogs/addon_connect.cpp Tue Aug 30 21:41:22 2011
@@ -53,7 +53,7 @@
: allow_updates_(allow_updates)
, allow_remove_(allow_remove)
{
- register_text2("host_name", false, host_name, true);
+ register_text("host_name", false, host_name, true);
}
void taddon_connect::pre_show(CVideo& /*video*/, twindow& window)
Modified: trunk/src/gui/dialogs/dialog.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/dialog.cpp?rev=50956&r1=50955&r2=50956&view=diff
==============================================================================
--- trunk/src/gui/dialogs/dialog.cpp (original)
+++ trunk/src/gui/dialogs/dialog.cpp Tue Aug 30 21:41:22 2011
@@ -171,20 +171,6 @@
return field;
}
-tfield_text* tdialog::register_text2(const std::string& id
- , const bool mandatory
- , std::string& linked_variable
- , const bool capture_focus)
-{
- assert(!capture_focus || focus_.empty());
-
- if(capture_focus) {
- focus_ = id;
- }
-
- return tdialog::register_text(id, mandatory, linked_variable);
-}
-
tfield_label* tdialog::register_label(const std::string& id
, const bool mandatory
, const std::string& text
Modified: trunk/src/gui/dialogs/dialog.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/dialog.hpp?rev=50956&r1=50955&r2=50956&view=diff
==============================================================================
--- trunk/src/gui/dialogs/dialog.hpp (original)
+++ trunk/src/gui/dialogs/dialog.hpp Tue Aug 30 21:41:22 2011
@@ -255,36 +255,6 @@
, const bool capture_focus = false);
/**
- * Creates a new text field.
- *
- * The field created is owned by tdialog, the returned pointer can be
used
- * in the child classes as access to a field.
- *
- * @note This function uses @p mandatory instead of @p optional as in
other
- * functions, the other functions need to be converted to use @p
mandatory
- * as well.
- *
- * @todo Convert more functions to this new style once done drop the 2
from
- * the function name.
- *
- * @deprecated Use @ref register_text instead.
- *
- * @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 capture_focus Does this widget need to capture the focus
- * when created? @warning Only one widget may
- * capture the focus.
- *
- * @returns Pointer to the created widget.
- */
- tfield_text* register_text2(const std::string& id
- , const bool mandatory
- , std::string& linked_variable
- , const bool capture_focus = false);
-
- /**
* Registers a new control as a label.
*
* The label is used for a control to set the 'label' since it calls the
Modified: trunk/src/gui/dialogs/edit_label.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/edit_label.cpp?rev=50956&r1=50955&r2=50956&view=diff
==============================================================================
--- trunk/src/gui/dialogs/edit_label.cpp (original)
+++ trunk/src/gui/dialogs/edit_label.cpp Tue Aug 30 21:41:22 2011
@@ -48,7 +48,7 @@
tedit_label::tedit_label(std::string& label, bool& team_only)
{
- register_text2("label", true, label, true);
+ register_text("label", true, label, true);
register_bool("team_only_toggle", true, team_only);
}
Modified: trunk/src/gui/dialogs/folder_create.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/folder_create.cpp?rev=50956&r1=50955&r2=50956&view=diff
==============================================================================
--- trunk/src/gui/dialogs/folder_create.cpp (original)
+++ trunk/src/gui/dialogs/folder_create.cpp Tue Aug 30 21:41:22 2011
@@ -42,7 +42,7 @@
tfolder_create::tfolder_create(std::string& folder_name)
{
- register_text2("name", true, folder_name, true);
+ register_text("name", true, folder_name, true);
}
}
Modified: trunk/src/gui/dialogs/game_save.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/game_save.cpp?rev=50956&r1=50955&r2=50956&view=diff
==============================================================================
--- trunk/src/gui/dialogs/game_save.cpp (original)
+++ trunk/src/gui/dialogs/game_save.cpp Tue Aug 30 21:41:22 2011
@@ -49,7 +49,7 @@
tgame_save::tgame_save(std::string& filename, const std::string& title)
{
- register_text2("txtFilename", false, filename, true);
+ register_text("txtFilename", false, filename, true);
register_label("lblTitle", true, title);
}
Modified: trunk/src/gui/dialogs/mp_cmd_wrapper.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/mp_cmd_wrapper.cpp?rev=50956&r1=50955&r2=50956&view=diff
==============================================================================
--- trunk/src/gui/dialogs/mp_cmd_wrapper.cpp (original)
+++ trunk/src/gui/dialogs/mp_cmd_wrapper.cpp Tue Aug 30 21:41:22 2011
@@ -80,9 +80,9 @@
, reason_()
, time_()
{
- register_text2("message", false, message_, true);
- register_text2("reason", false, reason_);
- register_text2("time", false, time_);
+ register_text("message", false, message_, true);
+ register_text("reason", false, reason_);
+ register_text("time", false, time_);
register_label("user_label", false, user);
set_always_save_fields(true);
Modified: trunk/src/gui/dialogs/mp_create_game_set_password.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/mp_create_game_set_password.cpp?rev=50956&r1=50955&r2=50956&view=diff
==============================================================================
--- trunk/src/gui/dialogs/mp_create_game_set_password.cpp (original)
+++ trunk/src/gui/dialogs/mp_create_game_set_password.cpp Tue Aug 30 21:41:22
2011
@@ -43,7 +43,7 @@
tmp_create_game_set_password::tmp_create_game_set_password(
std::string& password)
{
- register_text2("password", true, password, true);
+ register_text("password", true, password, true);
}
} // namespace gui2
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
