* lily/spacing-spanner.cc (calc_common_shortest_duration): use

[lilypond.git] / lily / include / input.hh

diff --git a/lily/include/input.hh b/lily/include/input.hh
index 18a29936c9358f953e45392b130ec597ebc7ef6b..e211dc15c3f5dda4b323797ef77e76d55580c1e2 100644 (file)
--- a/lily/include/input.hh
+++ b/lily/include/input.hh
@@ -3,13 +3,14 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef INPUT_HH
 #define INPUT_HH
 
 #include "flower-proto.hh"
+#include "std-string.hh"
 
 /**
    Base class for anything that records its poisition in the parse file.
@@ -26,17 +27,20 @@ public:
   char const *end () const;
 
   void set (Source_file *, char const *, char const *);
-  void warning (String) const; // should use member func?
-  void non_fatal_error (String) const;
-  void error (String) const;
-  void message (String) const;
+  void warning (string) const;
+  void programming_error (string) const;
+  void non_fatal_error (string) const;
+  void error (string) const;
+  void message (string) const;
   void set_spot (Input const &);
   void step_forward ();
   void set_location (Input const &, Input const &);
+
   Input spot () const;
-  String location_string () const;
-  String line_number_string () const;
-  String file_string ()const;
+
+  string location_string () const;
+  string line_number_string () const;
+  string file_string ()const;
 
   int line_number ()const;
   int column_number ()const;