X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flilypond-key.hh;h=7d18abd385d2873ee372f4428fdb46ae6b2567af;hb=dbb4524af169a9c15e5c7fcfddfa1a4b85dd288d;hp=fe47155bf6b1df772b6715a144d094b0a640dc04;hpb=9ce63beb6e98dfda72259406ae5a19f48cd9b6af;p=lilypond.git diff --git a/lily/include/lilypond-key.hh b/lily/include/lilypond-key.hh index fe47155bf6..7d18abd385 100644 --- a/lily/include/lilypond-key.hh +++ b/lily/include/lilypond-key.hh @@ -1,10 +1,9 @@ /* - lilypond-key.hh -- declare Lilypond_{grob,context}_key + lilypond-key.hh -- declare Lilypond_{grob, context}_key source file of the GNU LilyPond music typesetter - (c) 2004 Han-Wen Nienhuys - + (c) 2004--2006 Han-Wen Nienhuys */ #ifndef LILYPOND_KEY_HH @@ -13,7 +12,6 @@ #include "object-key.hh" #include "lily-proto.hh" #include "moment.hh" -#include "string.hh" class Lilypond_grob_key : public Object_key { @@ -30,8 +28,8 @@ public: 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; }; @@ -44,17 +42,17 @@ class Lilypond_context_key : public Object_key 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); + 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; }; @@ -70,8 +68,8 @@ public: 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; };