X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Fwarn.cc;h=0bf8983c7a83f4dbd27a369404faf686c0c33cfe;hb=a19fd339a199f67a5722fa76e7abe1d507da2d5f;hp=8ac73541b6cf0cc30f2559f32b24c1896ae7424a;hpb=57be7394ffa2e7d7ba6d60548dba563f3409d472;p=lilypond.git

diff --git a/flower/warn.cc b/flower/warn.cc
index 8ac73541b6..0bf8983c7a 100644
--- a/flower/warn.cc
+++ b/flower/warn.cc
@@ -1,9 +1,20 @@
 /*
-  warn.cc -- implement warnings
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the Flower Library
+  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  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 "warn.hh"
@@ -11,18 +22,22 @@
 #include <cstdlib>
 #include <cstdio>
 
+#include "international.hh"
+
+using namespace std;
+
 /* Is progress indication at NEWLINE?  */
 static bool progress_newline = true;
 
 /* Display user information that is not a full message.  */
 void
-progress_indication (String s)
+progress_indication (string s)
 {
   /* Test if all silly progress_indication ("\n") can be dropped now.  */
   if (s == "\n")
     return;
 
-  fputs (s.to_str0 (), stderr);
+  fputs (s.c_str (), stderr);
   fflush (stderr);
   if (s.length ())
     progress_newline = s[s.length () - 1] == '\n';
@@ -30,7 +45,7 @@ progress_indication (String s)
 
 /* Display a single user message.  Always starts on a new line.  */
 void
-message (String s)
+message (string s)
 {
   if (!progress_newline)
     fputc ('\n', stderr);
@@ -39,27 +54,27 @@ message (String s)
 
 /* Display a warning message.  Always starts on a new line.  */
 void
-warning (String s)
+warning (string s)
 {
-  message (_f ("warning: %s", s.to_str0 ()) + "\n");
+  message (_f ("warning: %s", s.c_str ()) + "\n");
 }
 
 void
-non_fatal_error (String s)
+non_fatal_error (string s)
 {
-  message (_f ("error: %s", s.to_str0 ()) + "\n");
+  message (_f ("error: %s", s.c_str ()) + "\n");
 }
 
 /* Display an error message.  Always starts on a new line.  */
 void
-error (String s)
+error (string s)
 {
   non_fatal_error (s);
   exit (1);
 }
 
 void
-programming_error (String s)
+programming_error (string s)
 {
   message (_f ("programming error: %s", s) + "\n");
   message (_ ("continuing, cross fingers") + "\n");