Cleanup of accidental-engraver.cc / accidental.cc

[lilypond.git] / lily / include / midi-stream.hh

diff --git a/lily/include/midi-stream.hh b/lily/include/midi-stream.hh
index c4512f82ec1ae14470e069bea51aec1687639a3e..4f02d6cbca7a9f469ceb2317587aff3927750182 100644 (file)
--- a/lily/include/midi-stream.hh
+++ b/lily/include/midi-stream.hh
@@ -1,32 +1,33 @@
 /*
   midi-stream.hh -- declare Midi_stream
 
-  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef MIDI_STREAM_HH
 #define MIDI_STREAM_HH
 
 #include <cstdio>
+using namespace std;
 
-#include "string.hh"
+#include "std-string.hh"
 
 class Midi_item;
 
 /// Midi outputfile
 struct Midi_stream
 {
-  Midi_stream (String file_name_string);
+  Midi_stream (string file_name_string);
   ~Midi_stream ();
 
-  Midi_stream &operator<< (String str);
-  Midi_stream &operator<< (Midi_item const &midi_c_r);
-  Midi_stream &operator<< (int i);
+  Midi_stream &operator << (string str);
+  Midi_stream &operator << (Midi_item const &midi_c_r);
+  Midi_stream &operator << (int i);
 
   void open ();
 
   FILE *out_file_;
-  String file_name_string_;
+  string file_name_string_;
 };
 
 #endif // MIDI_STREAM_HH