[Wesnoth-cvs-commits] wesnoth/src dialogs.cpp game.cpp language.cpp l...

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    04/11/30 21:41:19

Modified files:
        src            : dialogs.cpp game.cpp language.cpp language.hpp 
        src/editor     : editor_palettes.cpp 

Log message:
        Remove two useless functions from language.cpp.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/dialogs.cpp.diff?tr1=1.74&tr2=1.75&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.167&tr2=1.168&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/language.cpp.diff?tr1=1.59&tr2=1.60&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/language.hpp.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor_palettes.cpp.diff?tr1=1.21&tr2=1.22&r1=text&r2=text

Patches:
Index: wesnoth/src/dialogs.cpp
diff -u wesnoth/src/dialogs.cpp:1.74 wesnoth/src/dialogs.cpp:1.75
--- wesnoth/src/dialogs.cpp:1.74        Sat Nov 27 10:24:50 2004
+++ wesnoth/src/dialogs.cpp     Tue Nov 30 21:41:18 2004
@@ -1,4 +1,4 @@
-/* $Id: dialogs.cpp,v 1.74 2004/11/27 10:24:50 silene Exp $ */
+/* $Id: dialogs.cpp,v 1.75 2004/11/30 21:41:18 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -70,7 +70,6 @@
                
sample_units.push_back(::get_advanced_unit(info,units,loc,u->second.type().name()));
                sample_units.back().add_modification("advance",**mod);
                const unit_type& type = sample_units.back().type();
-               // lang_options.push_back("&" + type.image() + "," + 
translate_string_default("advance_" + (**mod)["id"],(**mod)["description"]));
                lang_options.push_back("&" + type.image() + "," + 
(**mod)["description"]);
        }
 
Index: wesnoth/src/editor/editor_palettes.cpp
diff -u wesnoth/src/editor/editor_palettes.cpp:1.21 
wesnoth/src/editor/editor_palettes.cpp:1.22
--- wesnoth/src/editor/editor_palettes.cpp:1.21 Sat Nov  6 13:13:16 2004
+++ wesnoth/src/editor/editor_palettes.cpp      Tue Nov 30 21:41:19 2004
@@ -153,7 +153,7 @@
        std::stringstream str;
        const std::string& name = map_.get_terrain_info(t).name();
        const std::string& underlying = map_.underlying_terrain(t);
-       str << translate_string(name);
+       str << name;
        if(underlying.size() != 1 || underlying[0] != t) {
                str << " (";
                for(std::string::const_iterator i = underlying.begin();
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.167 wesnoth/src/game.cpp:1.168
--- wesnoth/src/game.cpp:1.167  Thu Nov 25 19:50:51 2004
+++ wesnoth/src/game.cpp        Tue Nov 30 21:41:18 2004
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.167 2004/11/25 19:50:51 ydirson Exp $ */
+/* $Id: game.cpp,v 1.168 2004/11/30 21:41:18 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -978,7 +978,7 @@
        if(difficulties.empty() == false) {
                if(difficulty_options.size() != difficulties.size()) {
                        difficulty_options.resize(difficulties.size());
-                       
std::transform(difficulties.begin(),difficulties.end(),difficulty_options.begin(),translate_string);
+                       
std::copy(difficulties.begin(),difficulties.end(),difficulty_options.begin());
                }
 
                const int res = gui::show_dialog(disp(),NULL,_("Difficulty"),
Index: wesnoth/src/language.cpp
diff -u wesnoth/src/language.cpp:1.59 wesnoth/src/language.cpp:1.60
--- wesnoth/src/language.cpp:1.59       Tue Nov 30 21:14:13 2004
+++ wesnoth/src/language.cpp    Tue Nov 30 21:41:18 2004
@@ -1,4 +1,4 @@
-/* $Id: language.cpp,v 1.59 2004/11/30 21:14:13 silene Exp $ */
+/* $Id: language.cpp,v 1.60 2004/11/30 21:41:18 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -95,16 +95,6 @@
        return (*this)[std::string(key)];
 }
 
-const std::string& translate_string(const std::string& str)
-{
-       return str;
-}
-
-const std::string& translate_string_default(const std::string& str, const 
std::string& default_val)
-{
-       return str;
-}
-
 std::vector<language_def> get_languages()
 {
        std::vector<language_def> res;
Index: wesnoth/src/language.hpp
diff -u wesnoth/src/language.hpp:1.29 wesnoth/src/language.hpp:1.30
--- wesnoth/src/language.hpp:1.29       Mon Aug 23 06:40:59 2004
+++ wesnoth/src/language.hpp    Tue Nov 30 21:41:18 2004
@@ -1,4 +1,4 @@
-/* $Id: language.hpp,v 1.29 2004/08/23 06:40:59 gakusho Exp $ */
+/* $Id: language.hpp,v 1.30 2004/11/30 21:41:18 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -49,14 +49,6 @@
 //displayed on screen.
 extern symbol_table string_table;
 
-//function which translates a string if the string is available in
-//the string table, and otherwise simply returns the string itself
-const std::string& translate_string(const std::string& str);
-
-//version of translate_string which will look up key in the string table,
-//and otherwise returns default_val
-const std::string& translate_string_default(const std::string& key, const 
std::string& default_val);
-
 //function which, given the main configuration object, will return
 //a list of the translations of the game available.
 std::vector<language_def> get_languages();