Run `make grand-replace'.

[lilypond.git] / flower / international.cc

diff --git a/flower/international.cc b/flower/international.cc
index 6734a49bff81cff2a28997d086ea31650f1e3d39..6a493b5e6e5d298b0e2372b5941744828906f084 100644 (file)
--- a/flower/international.cc
+++ b/flower/international.cc
@@ -1,46 +1,51 @@
-/*   
+/*
   international.cc -- implement stuff for internationalisation
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
-  
- */
 
-#include <stdarg.h>
-#include "config.h"
-#include "string-convert.hh"
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
+
+#include "config.hh"
+
 #include "international.hh"
+#include "string-convert.hh"
 
 #if !HAVE_GETTEXT
-inline char*
-gettext (char const* s)
+inline char *
+gettext (char const *s)
 {
-  return (char*)s;
+  return (char *)s;
 }
 #else
 #include <libintl.h>
 #endif
 
-String 
+string
 _ (char const *ch)
 {
-  return String (gettext (ch));
+  return string (gettext (ch));
 }
 
-String 
-_f (char const* format, ...)
+string
+_f (char const *format, ...)
 {
   va_list args;
   va_start (args, format);
-  String str = String_convert::vform_str (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_str (gettext (format), s.ch_C (), s2.ch_C (), 
-    s3.ch_C ());
+  return String_convert::form_string (gettext (format), s.c_str (), s2.c_str (),
+                                     s3.c_str ());
 }