X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Finternational.hh;h=f4216736a282d31bc079243b09644921d9e5b1cb;hb=38d7d319eabc906e82fb42002678c6d42a23b6f7;hp=bce42e30d4f516b41c37c5285cf1ae32cfc4106b;hpb=2745cbd907f8216a4cc1fc5f488ae19efdfdbd10;p=lilypond.git

diff --git a/flower/include/international.hh b/flower/include/international.hh
index bce42e30d4..f4216736a2 100644
--- a/flower/include/international.hh
+++ b/flower/include/international.hh
@@ -1,36 +1,42 @@
-/*   
+/*
   international.hh -- declare stuff for internationalization
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
-  
- */
+
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #ifndef INTERNATIONAL_HH
 #define INTERNATIONAL_HH
 
-#include "string.hh"
+#include <stdarg.h>
+
+#include "std-string.hh"
 
 /**
- Internationalisation: _i ("to be translated") gets an entry in the POT file
- gettext () must be invoked explicitely to do the actual "translation".
- See flower/getopt-long.cc.
- */
+   Internationalisation: _i ("to be translated") gets an entry in the POT file
+   gettext () must be invoked explicitely to do the actual "translation".
+   See flower/getopt-long.cc.
+*/
 #define _i(sz) sz
 
 // don't inline: get warnings only once
 /**
- Internationalisation: _ ("to be translated") gets "translated" by GNU gettext
+   Internationalisation: _ ("to be translated") gets "translated" by GNU gettext
 */
-String _ (char const *ch);
+string _ (char const *ch);
 
 /**
- Internationalisation: _f ("Usage: %s [FILE]", "lilypond") gets "translated" by 
- GNU gettext
+   Internationalisation: _f ("Usage: %s [FILE]", "lilypond") gets "translated" by
+   GNU gettext
 */
-String _f (char const* format, ...);
-String _f (char const* format, String s, String s2 = "", String s3 = "");
+string _f (char const *format, ...)
+  	   __attribute__ ((format (printf, 1, 2)));
+string _f (char const *format, string s, string s2 = "", string s3 = "");
+/**
+   va_list version of _f
+ */
+string v_f (char const *format, va_list args);
 
 #endif // INTERNATIONAL_HH