X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fobject-key.hh;h=c163d4c0e9a09ebfda25c5ab55ee4d1054692841;hb=358d6e99ada8019268ade9ba9080b2d0d88eeb7a;hp=755b72f1228b8ad5c8d35f06572eed2a4f3ee96f;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git diff --git a/lily/include/object-key.hh b/lily/include/object-key.hh index 755b72f122..c163d4c0e9 100644 --- a/lily/include/object-key.hh +++ b/lily/include/object-key.hh @@ -3,8 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2004--2005 Han-Wen Nienhuys - + (c) 2004--2006 Han-Wen Nienhuys */ #ifndef OBJECT_KEY_HH @@ -18,58 +17,59 @@ In the future, they might also act as handles for external processes requesting notation to be drawn. - */ +*/ class Object_key { - DECLARE_SMOBS(Object_key, ); + DECLARE_SMOBS (Object_key); protected: - Object_key(); + Object_key (); virtual void derived_mark () const; virtual int get_type () const; - virtual int do_compare (Object_key const * other) const; - virtual SCM as_scheme () const; + virtual int do_compare (Object_key const *other) const; public: + virtual SCM as_scheme () const; static Object_key *from_scheme (SCM); static Object_key *undump (SCM); int compare (Object_key const *other) const; SCM dump () const; }; -enum Object_key_type { - BASE_KEY, - COPIED_KEY, - GENERAL_KEY, - GROB_KEY, - CONTEXT_KEY, - KEY_COUNT, -}; +enum Object_key_type + { + BASE_KEY, + COPIED_KEY, + GENERAL_KEY, + GROB_KEY, + CONTEXT_KEY, + KEY_COUNT, + }; class Copied_key : public Object_key { private: - Object_key const * original_; + Object_key const *original_; int copy_count_; protected: virtual void derived_mark () const; virtual int get_type () const; - virtual int do_compare (Object_key const * other) const; + virtual int do_compare (Object_key const *other) const; virtual SCM as_scheme () const; public: static Object_key *from_scheme (SCM); - Copied_key (Object_key const*, int); + Copied_key (Object_key const *, int); }; -DECLARE_UNSMOB(Object_key, key); +DECLARE_UNSMOB (Object_key, key); -struct Object_key_less { +struct Object_key_less +{ bool operator () (Object_key const *const &t1, Object_key const *const &t2) const { return t1->compare (t2); } }; - #endif /* OBJECT_KEY_HH */