Author: mordante
Date: Thu Jul 24 19:03:42 2008
New Revision: 28179
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28179&view=rev
Log:
Renaming to make some names more generic:
is_selected() to get_value.
set_seleced() to set_value and removed the default parameter.
Modified:
trunk/src/gui/widgets/listbox.cpp
trunk/src/gui/widgets/menubar.cpp
trunk/src/gui/widgets/toggle_button.cpp
trunk/src/gui/widgets/toggle_button.hpp
trunk/src/gui/widgets/toggle_panel.cpp
trunk/src/gui/widgets/toggle_panel.hpp
trunk/src/gui/widgets/widget.hpp
Modified: trunk/src/gui/widgets/listbox.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/listbox.cpp?rev=28179&r1=28178&r2=28179&view=diff
==============================================================================
--- trunk/src/gui/widgets/listbox.cpp (original)
+++ trunk/src/gui/widgets/listbox.cpp Thu Jul 24 19:03:42 2008
@@ -177,7 +177,7 @@
// if not allowed to deselect reselect.
tselectable_* selectable =
dynamic_cast<tselectable_*>(caller);
assert(selectable);
- selectable->set_selected();
+ selectable->set_value(true);
}
return true;
@@ -692,7 +692,7 @@
tselectable_* selectable =
dynamic_cast<tselectable_*>(widget);
if(selectable) {
- selectable->set_selected(sel);
+ selectable->set_value(sel);
} else if(grid) {
select_in_grid(child_grid, sel);
} else {
Modified: trunk/src/gui/widgets/menubar.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/menubar.cpp?rev=28179&r1=28178&r2=28179&view=diff
==============================================================================
--- trunk/src/gui/widgets/menubar.cpp (original)
+++ trunk/src/gui/widgets/menubar.cpp Thu Jul 24 19:03:42 2008
@@ -83,12 +83,12 @@
}
if(selected_item_ != -1) {
- (*(*this)[selected_item_]).set_selected(false);
+ (*(*this)[selected_item_]).set_value(false);
}
selected_item_ = item;
if(selected_item_ != -1) {
- (*(*this)[selected_item_]).set_selected(true);
+ (*(*this)[selected_item_]).set_value(true);
}
}
@@ -118,10 +118,10 @@
assert(index < get_item_count());
// Set the selection.
- if(!item->is_selected()) {
+ if(!item->get_value()) {
// Deselected an item, allowed?
if(must_select_) {
- item->set_selected();
+ item->set_value(true);
} else {
selected_item_ = -1;
}
Modified: trunk/src/gui/widgets/toggle_button.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/toggle_button.cpp?rev=28179&r1=28178&r2=28179&view=diff
==============================================================================
--- trunk/src/gui/widgets/toggle_button.cpp (original)
+++ trunk/src/gui/widgets/toggle_button.cpp Thu Jul 24 19:03:42 2008
@@ -58,7 +58,7 @@
{
DBG_G_E << "Toggle button: mouse enter.\n";
- if(is_selected()) {
+ if(get_value()) {
set_state(FOCUSSED_SELECTED);
} else {
set_state(FOCUSSED);
@@ -69,7 +69,7 @@
{
DBG_G_E << "Toggle button: mouse leave.\n";
- if(is_selected()) {
+ if(get_value()) {
set_state(ENABLED_SELECTED);
} else {
set_state(ENABLED);
@@ -80,7 +80,7 @@
{
DBG_G_E << "Toggle button: left mouse button click.\n";
- if(is_selected()) {
+ if(get_value()) {
set_state(ENABLED);
} else {
set_state(ENABLED_SELECTED);
@@ -106,13 +106,13 @@
void ttoggle_button::set_active(const bool active)
{
if(active) {
- if(is_selected()) {
+ if(get_value()) {
set_state(ENABLED_SELECTED);
} else {
set_state(ENABLED);
}
} else {
- if(is_selected()) {
+ if(get_value()) {
set_state(DISABLED_SELECTED);
} else {
set_state(DISABLED);
@@ -131,9 +131,9 @@
}
}
-void ttoggle_button::set_selected(const bool selected)
+void ttoggle_button::set_value(const bool selected)
{
- if(selected == is_selected()) {
+ if(selected == get_value()) {
return;
}
Modified: trunk/src/gui/widgets/toggle_button.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/toggle_button.hpp?rev=28179&r1=28178&r2=28179&view=diff
==============================================================================
--- trunk/src/gui/widgets/toggle_button.hpp (original)
+++ trunk/src/gui/widgets/toggle_button.hpp Thu Jul 24 19:03:42 2008
@@ -73,10 +73,10 @@
void set_canvas_text();
/** Inherited from tselectable_ */
- bool is_selected() const { return state_ >= ENABLED_SELECTED; }
+ bool get_value() const { return state_ >= ENABLED_SELECTED; }
/** Inherited from tselectable_ */
- void set_selected(const bool selected = true);
+ void set_value(const bool selected);
/***** ***** ***** setters / getters for members ***** ****** *****/
Modified: trunk/src/gui/widgets/toggle_panel.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/toggle_panel.cpp?rev=28179&r1=28178&r2=28179&view=diff
==============================================================================
--- trunk/src/gui/widgets/toggle_panel.cpp (original)
+++ trunk/src/gui/widgets/toggle_panel.cpp Thu Jul 24 19:03:42 2008
@@ -57,7 +57,7 @@
{
DBG_G_E << "Toggle panel: mouse enter.\n";
- if(is_selected()) {
+ if(get_value()) {
set_state(FOCUSSED_SELECTED);
} else {
set_state(FOCUSSED);
@@ -68,7 +68,7 @@
{
DBG_G_E << "Toggle panel: mouse leave.\n";
- if(is_selected()) {
+ if(get_value()) {
set_state(ENABLED_SELECTED);
} else {
set_state(ENABLED);
@@ -79,7 +79,7 @@
{
DBG_G_E << "Toggle panel: left mouse button click.\n";
- if(is_selected()) {
+ if(get_value()) {
set_state(ENABLED);
} else {
set_state(ENABLED_SELECTED);
@@ -105,13 +105,13 @@
void ttoggle_panel::set_active(const bool active)
{
if(active) {
- if(is_selected()) {
+ if(get_value()) {
set_state(ENABLED_SELECTED);
} else {
set_state(ENABLED);
}
} else {
- if(is_selected()) {
+ if(get_value()) {
set_state(DISABLED_SELECTED);
} else {
set_state(DISABLED);
@@ -144,9 +144,9 @@
conf->top_border + conf->bottom_border);
}
-void ttoggle_panel::set_selected(const bool selected)
+void ttoggle_panel::set_value(const bool selected)
{
- if(selected == is_selected()) {
+ if(selected == get_value()) {
return;
}
Modified: trunk/src/gui/widgets/toggle_panel.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/toggle_panel.hpp?rev=28179&r1=28178&r2=28179&view=diff
==============================================================================
--- trunk/src/gui/widgets/toggle_panel.hpp (original)
+++ trunk/src/gui/widgets/toggle_panel.hpp Thu Jul 24 19:03:42 2008
@@ -122,10 +122,10 @@
tpoint border_space() const;
/** Inherited from tselectable_ */
- bool is_selected() const { return state_ >= ENABLED_SELECTED; }
+ bool get_value() const { return state_ >= ENABLED_SELECTED; }
/** Inherited from tselectable_ */
- void set_selected(const bool selected = true);
+ void set_value(const bool selected);
/***** ***** ***** setters / getters for members ***** ****** *****/
Modified: trunk/src/gui/widgets/widget.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/widget.hpp?rev=28179&r1=28178&r2=28179&view=diff
==============================================================================
--- trunk/src/gui/widgets/widget.hpp (original)
+++ trunk/src/gui/widgets/widget.hpp Thu Jul 24 19:03:42 2008
@@ -545,10 +545,10 @@
virtual ~tselectable_() {}
/** Is the control selected? */
- virtual bool is_selected() const = 0;
+ virtual bool get_value() const = 0;
/** Select the control. */
- virtual void set_selected(const bool = true) = 0;
+ virtual void set_value(const bool) = 0;
};
/**
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
