Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / include / audio-item.hh

diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh
index 1ab00fd9158a2847b7b9310999b13c501efdbf19..1e7bfec32af1955df611231fdb9080ba9a07fbea 100644 (file)
--- a/lily/include/audio-item.hh
+++ b/lily/include/audio-item.hh
@@ -1,7 +1,7 @@
 /*
   audio-item.hh -- declare Audio_items
 
-  (c) 1996--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef AUDIO_ITEM_HH
@@ -24,7 +24,7 @@ public:
 
 private:
   Audio_item (Audio_item const &);
-  Audio_item &operator= (Audio_item const &);
+  Audio_item &operator = (Audio_item const &);
 };
 
 class Audio_dynamic : public Audio_item
@@ -47,9 +47,9 @@ public:
 class Audio_instrument : public Audio_item
 {
 public:
-  Audio_instrument (String instrument_string);
+  Audio_instrument (string instrument_string);
 
-  String str_;
+  string str_;
 };
 
 class Audio_note : public Audio_item
@@ -68,7 +68,7 @@ public:
 class Audio_piano_pedal : public Audio_item
 {
 public:
-  String type_string_;
+  string type_string_;
   Direction dir_;
 };
 
@@ -81,10 +81,10 @@ public:
       MARKER, CUE_POINT
     };
 
-  Audio_text (Audio_text::Type type, String text_string);
+  Audio_text (Audio_text::Type type, string text_string);
 
   Type type_;
-  String text_string_;
+  string text_string_;
 };
 
 class Audio_tempo : public Audio_item