Run `make grand-replace'.

[lilypond.git] / flower / international.cc

diff --git a/flower/international.cc b/flower/international.cc
index 1e908cc5fde3f8b51ffd7ed2def564b8dc25ba4c..6a493b5e6e5d298b0e2372b5941744828906f084 100644 (file)
--- a/flower/international.cc
+++ b/flower/international.cc
@@ -3,10 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "config.hh"
+
+#include "international.hh"
 #include "string-convert.hh"
 
 #if !HAVE_GETTEXT
@@ -19,25 +21,31 @@ gettext (char const *s)
 #include <libintl.h>
 #endif
 
-String
+string
 _ (char const *ch)
 {
-  return String (gettext (ch));
+  return string (gettext (ch));
 }
 
-String
+string
 _f (char const *format, ...)
 {
   va_list args;
   va_start (args, format);
-  String str = String_convert::vform_string (gettext (format), args);
+  string str = v_f (format, args);
   va_end (args);
   return str;
 }
 
-String
-_f (char const *format, String s, String s2, String s3)
+string
+v_f (char const *format, va_list args)
+{
+  return String_convert::vform_string (gettext (format), args);
+}
+
+string
+_f (char const *format, string s, string s2, string s3)
 {
-  return String_convert::form_string (gettext (format), s.to_str0 (), s2.to_str0 (),
-                                     s3.to_str0 ());
+  return String_convert::form_string (gettext (format), s.c_str (), s2.c_str (),
+                                     s3.c_str ());
 }