[Wesnoth-cvs-commits] wesnoth/src game.cpp help.cpp widgets/menu.cpp ...

[Philippe Plantier]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Philippe Plantier <address@hidden>      04/10/30 17:20:01

Modified files:
        src            : game.cpp help.cpp 
        src/widgets    : menu.cpp menu.hpp 

Log message:
        s/SEPERATOR/SEPARATOR/g (fixed the spelling of some constants)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.149&tr2=1.150&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/help.cpp.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/menu.cpp.diff?tr1=1.64&tr2=1.65&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/menu.hpp.diff?tr1=1.23&tr2=1.24&r1=text&r2=text

Patches:
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.149 wesnoth/src/game.cpp:1.150
--- wesnoth/src/game.cpp:1.149  Thu Oct 21 23:05:55 2004
+++ wesnoth/src/game.cpp        Sat Oct 30 17:20:01 2004
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.149 2004/10/21 23:05:55 ydirson Exp $ */
+/* $Id: game.cpp,v 1.150 2004/10/30 17:20:01 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1204,7 +1204,7 @@
        state_.campaign_define = "MULTIPLAYER";
 
        std::vector<std::string> host_or_join;
-       const std::string sep(1,gui::menu::HELP_STRING_SEPERATOR);
+       const std::string sep(1,gui::menu::HELP_STRING_SEPARATOR);
        host_or_join.push_back(std::string("&icons/icon-server.png,") + _("Join 
Official Server") + sep + _("Log on to the official Wesnoth multiplayer 
server"));
        host_or_join.push_back(std::string("&icons/icon-serverother.png,") + 
_("Join Game") + sep + _("Join a server or hosted game"));
        host_or_join.push_back(std::string("&icons/icon-hostgame.png,") + 
_("Host Networked Game") + sep + _("Host a game without using a server"));
Index: wesnoth/src/help.cpp
diff -u wesnoth/src/help.cpp:1.40 wesnoth/src/help.cpp:1.41
--- wesnoth/src/help.cpp:1.40   Thu Oct 21 15:06:13 2004
+++ wesnoth/src/help.cpp        Sat Oct 30 17:20:01 2004
@@ -1038,14 +1038,14 @@
        std::string pad_string;
        // Indentation is represented as three spaces per level.
        pad_string.resize(level * 3, ' ');
-       to_show << pad_string << char(menu::IMG_TEXT_SEPERATOR) << "&" ;
+       to_show << pad_string << char(menu::IMG_TEXT_SEPARATOR) << "&" ;
        if (expanded(sec)) {
                to_show << open_section_img;
        }
        else {
                to_show << closed_section_img;
        }
-       to_show << char(menu::IMG_TEXT_SEPERATOR) << sec.title;
+       to_show << char(menu::IMG_TEXT_SEPARATOR) << sec.title;
        return to_show.str();
 }
 
@@ -1053,8 +1053,8 @@
        std::string pad_string;
        pad_string.resize(level * 3, ' ');
        std::stringstream to_show;
-       to_show << pad_string << char(menu::IMG_TEXT_SEPERATOR) << "&" << 
topic_img
-                       << char(menu::IMG_TEXT_SEPERATOR) << topic.title;
+       to_show << pad_string << char(menu::IMG_TEXT_SEPARATOR) << "&" << 
topic_img
+                       << char(menu::IMG_TEXT_SEPARATOR) << topic.title;
        return to_show.str();
 }
 
Index: wesnoth/src/widgets/menu.cpp
diff -u wesnoth/src/widgets/menu.cpp:1.64 wesnoth/src/widgets/menu.cpp:1.65
--- wesnoth/src/widgets/menu.cpp:1.64   Sat Oct  9 21:14:47 2004
+++ wesnoth/src/widgets/menu.cpp        Sat Oct 30 17:20:01 2004
@@ -66,10 +66,10 @@
        for(std::vector<std::vector<std::string> >::iterator i = 
items_.begin(); i != items_.end(); ++i) {
                help_.resize(help_.size()+1);
                for(std::vector<std::string>::iterator j = i->begin(); j != 
i->end(); ++j) {
-                       
if(std::find(j->begin(),j->end(),static_cast<char>(HELP_STRING_SEPERATOR)) == 
j->end()) {
+                       
if(std::find(j->begin(),j->end(),static_cast<char>(HELP_STRING_SEPARATOR)) == 
j->end()) {
                                help_.back().push_back("");
                        } else {
-                               const std::vector<std::string>& items = 
config::split(*j,HELP_STRING_SEPERATOR,0);
+                               const std::vector<std::string>& items = 
config::split(*j,HELP_STRING_SEPARATOR,0);
                                if(items.size() >= 2) {
                                        *j = items.front();
                                        help_.back().push_back(items.back());
@@ -499,7 +499,7 @@
 
        SDL_Rect item_size(const std::string& item) {
                SDL_Rect res = {0,0,0,0};
-               std::vector<std::string> img_text_items = config::split(item, 
menu::IMG_TEXT_SEPERATOR);
+               std::vector<std::string> img_text_items = config::split(item, 
menu::IMG_TEXT_SEPARATOR);
                for (std::vector<std::string>::const_iterator it = 
img_text_items.begin();
                         it != img_text_items.end(); it++) {
                        if (res.w > 0 || res.h > 0) {
@@ -583,7 +583,7 @@
        for(size_t i = 0; i != items_[item].size(); ++i) {
                const int last_x = xpos;
                std::string str = items_[item][i];
-               std::vector<std::string> img_text_items = config::split(str, 
IMG_TEXT_SEPERATOR);
+               std::vector<std::string> img_text_items = config::split(str, 
IMG_TEXT_SEPARATOR);
                for (std::vector<std::string>::const_iterator it = 
img_text_items.begin();
                         it != img_text_items.end(); it++) {
                        str = *it;
Index: wesnoth/src/widgets/menu.hpp
diff -u wesnoth/src/widgets/menu.hpp:1.23 wesnoth/src/widgets/menu.hpp:1.24
--- wesnoth/src/widgets/menu.hpp:1.23   Sun Aug 22 19:08:32 2004
+++ wesnoth/src/widgets/menu.hpp        Sat Oct 30 17:20:01 2004
@@ -66,8 +66,8 @@
        void scroll(int pos);
 
        void set_dirty() { drawn_ = false; }
-       enum { HELP_STRING_SEPERATOR = '|', DEFAULT_ITEM = '*' };
-       enum { IMG_TEXT_SEPERATOR = 1 }; // Re-evaluate if this should be
+       enum { HELP_STRING_SEPARATOR = '|', DEFAULT_ITEM = '*' };
+       enum { IMG_TEXT_SEPARATOR = 1 }; // Re-evaluate if this should be
                                                                         // 
something else to be settable
                                                                         // 
from WML.