X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finternational.cc;h=1518182a2c379c8286022a0d6501e675849dfb30;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=7a5ce5ad37d6eaea7df178a7ec47a080d6586b5c;hpb=2745cbd907f8216a4cc1fc5f488ae19efdfdbd10;p=lilypond.git

diff --git a/flower/international.cc b/flower/international.cc
index 7a5ce5ad37..1518182a2c 100644
--- a/flower/international.cc
+++ b/flower/international.cc
@@ -1,46 +1,62 @@
-/*   
-  international.cc -- implement stuff for internationalisation
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
-  
- */
-
-#include <stdarg.h>
-#include "config.h"
-#include "string-convert.hh"
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1997--2015 Jan Nieuwenhuizen <janneke@gnu.org>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#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_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, const string &s, const string &s2, const 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 ());
 }