X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frhythmic-head.cc;h=27ad66cb8c5bcd0803b9d9fd57d14f93c129bd84;hb=329f465a4b6d33aee925665a5d172b6fabcdaf2f;hp=977777f98be05feae62988e8172d8c37d6eb19fc;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git

diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc
index 977777f98b..27ad66cb8c 100644
--- a/lily/rhythmic-head.cc
+++ b/lily/rhythmic-head.cc
@@ -3,56 +3,52 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "rhythmic-head.hh"
+
 #include "warn.hh"
 #include "rest.hh"
 #include "stem.hh"
 #include "staff-symbol-referencer.hh"
 #include "item.hh"
 
-
-Item*
-Rhythmic_head::get_dots (Grob*me) 
+Item *
+Rhythmic_head::get_dots (Grob *me)
 {
-  SCM s = me->get_grob_property ("dot");
+  SCM s = me->get_object ("dot");
   return unsmob_item (s);
 }
 
-Item*
-Rhythmic_head::get_stem (Grob*me) 
+Item *
+Rhythmic_head::get_stem (Grob *me)
 {
-  SCM s = me->get_grob_property ("stem");
+  SCM s = me->get_object ("stem");
   return unsmob_item (s);
 }
 
 int
-Rhythmic_head::dot_count (Grob*me) 
+Rhythmic_head::dot_count (Grob *me)
 {
   return get_dots (me)
-    ? gh_scm2int (get_dots (me)->get_grob_property ("dot-count")) : 0;
+    ? scm_to_int (get_dots (me)->get_property ("dot-count")) : 0;
 }
 
 void
-Rhythmic_head::set_dots (Grob*me,Item *dot)
+Rhythmic_head::set_dots (Grob *me, Item *dot)
 {
-  me->set_grob_property ("dot", dot->self_scm ());
+  me->set_object ("dot", dot->self_scm ());
 }
 
-
-
 int
-Rhythmic_head::duration_log (Grob*me) 
+Rhythmic_head::duration_log (Grob *me)
 {
-  SCM s = me->get_grob_property ("duration-log");
-  return gh_number_p (s) ? gh_scm2int (s) : 0;
+  SCM s = me->get_property ("duration-log");
+  return scm_is_number (s) ? scm_to_int (s) : 0;
 }
 
-
-
-ADD_INTERFACE (Rhythmic_head,"rhythmic-head-interface",
-  "Note head or rest",
-  "dot stem duration-log");
+ADD_INTERFACE (Rhythmic_head, "rhythmic-head-interface",
+	       "Note head or rest",
+	       "dot stem duration-log");