* lily/instrument-name-engraver.cc (stop_translation_timestep):

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

diff --git a/lily/include/input.hh b/lily/include/input.hh
index e5ad3b42c5a44e17d561db13a1018a6f5e78c12e..9c255b70f0cc5ce83e09c7338c8652fc850e3d86 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@cs.uu.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.
@@ -24,27 +25,27 @@ public:
   Source_file *get_source_file () const;
   char const *start () const;
   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 (std::string) const; // should use member func?
+  void non_fatal_error (std::string) const;
+  void error (std::string) const;
+  void message (std::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;
-  
+  std::string location_string () const;
+  std::string line_number_string () const;
+  std::string file_string ()const;
+
   int line_number ()const;
   int column_number ()const;
   int end_line_number ()const;
   int end_column_number ()const;
 
-  void get_counts (int*line, int *char_count, int *col) const;
-  
+  void get_counts (int *line, int *char_count, int *col) const;
+
   Input (Input const &i);
   Input ();
 };