X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Flilypond-key.hh;h=4196ffd5f2d24580f092fcb872f8c28a6a2f0b36;hb=d929a664c85112ffecaa16c5e114d6f75cf002e2;hp=24d0a3f36bfe9217f1a73103801f509ed8f27a33;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git

diff --git a/lily/include/lilypond-key.hh b/lily/include/lilypond-key.hh
index 24d0a3f36b..4196ffd5f2 100644
--- a/lily/include/lilypond-key.hh
+++ b/lily/include/lilypond-key.hh
@@ -3,8 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef LILYPOND_KEY_HH
@@ -18,19 +17,19 @@ class Lilypond_grob_key : public Object_key
 {
   Object_key const *context_;
   Moment creation_moment_;
-  String grob_name_;
+  string grob_name_;
   int disambiguation_count_;
 
 public:
   Lilypond_grob_key (Object_key const *context,
 		     Moment start,
-		     String name, int);
+		     string name, int);
 
   static Object_key *from_scheme (SCM);
 protected:
   virtual int get_type () const;
-  virtual void derived_mark () const; 
-  virtual int do_compare (Object_key const* a) const;
+  virtual void derived_mark () const;
+  virtual int do_compare (Object_key const *a) const;
   virtual SCM as_scheme () const;
 };
 
@@ -38,39 +37,39 @@ class Lilypond_context_key : public Object_key
 {
   Object_key const *parent_context_;
   Moment start_moment_;
-  String context_name_;
-  String id_;
+  string context_name_;
+  string id_;
   int disambiguation_count_;
 
 public:
-  Lilypond_context_key (Object_key const * parent,
+  Lilypond_context_key (Object_key const *parent,
 			Moment start,
-			String type,
-			String id,
-  			int count);
+			string type,
+			string id,
+ 			int count);
 
   static Object_key *from_scheme (SCM);
 protected:
   virtual int get_type () const;
-  virtual int do_compare (Object_key const* a) const;
-  virtual void derived_mark () const; 
+  virtual int do_compare (Object_key const *a) const;
+  virtual void derived_mark () const;
   virtual SCM as_scheme () const;
 };
 
 class Lilypond_general_key : public Object_key
 {
   Object_key const *parent_;
-  String name_;
+  string name_;
   int disambiguation_count_;
 public:
-  Lilypond_general_key (Object_key const *parent, String name,
+  Lilypond_general_key (Object_key const *parent, string name,
 			int count);
 
   static Object_key *from_scheme (SCM);
 protected:
   virtual int get_type () const;
-  virtual int do_compare (Object_key const* a) const;
-  virtual void derived_mark () const; 
+  virtual int do_compare (Object_key const *a) const;
+  virtual void derived_mark () const;
   virtual SCM as_scheme () const;
 };