more object key removal.

[lilypond.git] / lily / lilypond-key.cc

diff --git a/lily/lilypond-key.cc b/lily/lilypond-key.cc
index 48f4daa446640cb8f1ee7bef021474defe9ef306..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/lily/lilypond-key.cc
+++ b/lily/lilypond-key.cc
@@ -1,127 +0,0 @@
-/*
-  lilypond-key.cc --  implement Lilypond_{grob,context}_key
-
-  source file of the GNU LilyPond music typesetter
-
-  (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
-*/
-
-
-#include "object-key.hh"
-#include "lilypond-key.hh"
-
-Lilypond_grob_key::Lilypond_grob_key (Object_key const *context,
-                                     Moment start,
-                                     String name)
-  // int ambiguity_count,
-{
-  context_ = context;
-  creation_moment_ = start;
-  grob_name_ = name;
-  //  ambiguity_count_ = ambiguity_count;
-}
-
-void
-Lilypond_grob_key::derived_mark () const
-{
-  scm_gc_mark (context_->self_scm ());
-}
-
-int
-Lilypond_grob_key::do_compare (Object_key const* key) const
-{
-  Lilypond_grob_key const * other = dynamic_cast<Lilypond_grob_key const*> (key); 
-  int c;
-
-  c = context_->compare (other->context_);
-  if (c)
-    return c;
-  
-  c = Moment::compare (creation_moment_, other->creation_moment_);
-  if (c)
-    return c;
-
-  c = String::compare (grob_name_, other->grob_name_);
-  if (c)
-    return c;
-#if 0
-  c = sign (ambiguity_count_ - other->ambiguity_count_); 
-  if (c)
-    return c;
-#endif
-  
-  return 0;
-}
-
-
-int
-Lilypond_grob_key::get_type () const
-{
-  return GROB_KEY;
-}
-
-/****************************************************************/
-
-
-void
-Lilypond_context_key::derived_mark () const
-{
-  if (parent_context_)
-    scm_gc_mark (parent_context_->self_scm ());
-}
-
-Lilypond_context_key::Lilypond_context_key (Object_key const *parent,
-                                           Moment start,
-                                           String type,
-                                           String id
-                                           // int count
-                                           )
-{
-  parent_context_ = parent;
-  start_moment_ = start;
-  context_name_ = type;
-  id_ = id;
-}
-
-
-int
-Lilypond_context_key::do_compare (Object_key const *key) const
-{
-  Lilypond_context_key const * other
-    = dynamic_cast<Lilypond_context_key const*> (key); 
-
-  int c;
-  if (parent_context_)
-    {
-      c = parent_context_->compare (other->parent_context_);
-      if (c)
-       return c;
-    }
-  
-  c = Moment::compare (start_moment_, other->start_moment_);
-  if (c)
-    return c;
-
-  c = String::compare (context_name_, other->context_name_);
-  if (c)
-    return c;
-
-  c = String::compare (id_, other->id_);
-  if (c)
-    return c;
-
-#if 0
-  c = sign (ambiguity_count_ - other->ambiguity_count_);
-  if (c)
-    return c;
-#endif
-  
-  return 0;
-}
-
-int
-Lilypond_context_key::get_type () const
-{
-  return CONTEXT_KEY;
-}