Author: mordante
Date: Wed Mar 2 22:40:50 2011
New Revision: 48722
URL: http://svn.gna.org/viewcvs/wesnoth?rev=48722&view=rev
Log:
Polishing the code a bit.
Also rename legacy_menu_item to tlegacy_menu_item.
Modified:
trunk/src/gui/auxiliary/old_markup.cpp
trunk/src/gui/auxiliary/old_markup.hpp
trunk/src/gui/dialogs/campaign_difficulty.cpp
trunk/src/gui/dialogs/campaign_difficulty.hpp
trunk/src/gui/dialogs/wml_message.cpp
Modified: trunk/src/gui/auxiliary/old_markup.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/auxiliary/old_markup.cpp?rev=48722&r1=48721&r2=48722&view=diff
==============================================================================
--- trunk/src/gui/auxiliary/old_markup.cpp (original)
+++ trunk/src/gui/auxiliary/old_markup.cpp Wed Mar 2 22:40:50 2011
@@ -17,7 +17,7 @@
namespace gui2 {
-legacy_menu_item::legacy_menu_item(const std::string& str)
+tlegacy_menu_item::tlegacy_menu_item(const std::string& str)
: icon_(), label_(str), desc_(), default_(false)
{
if(label_.empty()) {
@@ -58,3 +58,4 @@
}
}
+
Modified: trunk/src/gui/auxiliary/old_markup.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/auxiliary/old_markup.hpp?rev=48722&r1=48721&r2=48722&view=diff
==============================================================================
--- trunk/src/gui/auxiliary/old_markup.hpp (original)
+++ trunk/src/gui/auxiliary/old_markup.hpp Wed Mar 2 22:40:50 2011
@@ -24,7 +24,7 @@
/**
* Implements simple parsing of legacy GUI1 item markup.
*/
-class legacy_menu_item
+class tlegacy_menu_item
{
/*
* Legacy options/menu items have some special markup:
@@ -41,7 +41,7 @@
* with special meanings for certain characters.
*/
public:
- legacy_menu_item(const std::string& str = std::string());
+ tlegacy_menu_item(const std::string& str = std::string());
const std::string& icon() const {
return icon_;
@@ -59,17 +59,30 @@
return default_;
}
- legacy_menu_item& operator=(const legacy_menu_item& o) {
- if(&o != this) {
- icon_ = o.icon_;
- label_ = o.label_;
- desc_ = o.desc_;
+ tlegacy_menu_item& operator=(const tlegacy_menu_item& rhs) {
+ if(&rhs != this) {
+ icon_ = rhs.icon_;
+ label_ = rhs.label_;
+ desc_ = rhs.desc_;
}
return *this;
}
private:
- std::string icon_, label_, desc_;
+ /** The icon for the menu item. */
+ std::string icon_;
+
+ /** The first text item of the menu item, normally a short string. */
+ std::string label_;
+
+ /** The second text item of the menu item, normally a longer string. */
+ std::string desc_;
+
+ /**
+ * Is the item the default item and thus initially selected.
+ *
+ * It's unspecified what happens if multiple items in a menu are
selected.
+ */
bool default_;
};
Modified: trunk/src/gui/dialogs/campaign_difficulty.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/campaign_difficulty.cpp?rev=48722&r1=48721&r2=48722&view=diff
==============================================================================
--- trunk/src/gui/dialogs/campaign_difficulty.cpp (original)
+++ trunk/src/gui/dialogs/campaign_difficulty.cpp Wed Mar 2 22:40:50 2011
@@ -77,7 +77,7 @@
std::map<std::string, string_map> data;
- foreach(const legacy_menu_item& item, items_) {
+ foreach(const tlegacy_menu_item& item, items_) {
if(item.is_default()) {
index_ = list.get_item_count();
}
Modified: trunk/src/gui/dialogs/campaign_difficulty.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/campaign_difficulty.hpp?rev=48722&r1=48721&r2=48722&view=diff
==============================================================================
--- trunk/src/gui/dialogs/campaign_difficulty.hpp (original)
+++ trunk/src/gui/dialogs/campaign_difficulty.hpp Wed Mar 2 22:40:50 2011
@@ -36,7 +36,7 @@
private:
int index_;
- std::vector<legacy_menu_item> items_;
+ std::vector<tlegacy_menu_item> items_;
/** Inherited from tdialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const;
Modified: trunk/src/gui/dialogs/wml_message.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/wml_message.cpp?rev=48722&r1=48721&r2=48722&view=diff
==============================================================================
--- trunk/src/gui/dialogs/wml_message.cpp (original)
+++ trunk/src/gui/dialogs/wml_message.cpp Wed Mar 2 22:40:50 2011
@@ -280,7 +280,7 @@
* a new syntax which doesn't use those hacks (also
avoids the problem
* with special meanings for certain characters.
*/
- legacy_menu_item item(option_list_[i]);
+ tlegacy_menu_item item(option_list_[i]);
if(item.is_default()) {
// Number of items hasn't been increased yet so
i is ok.
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
