X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental-placement.cc;h=1a557101223e510aafd382ad91642cb94fdce67d;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=04883f03a956ecfe6ce5ae623c0f02bc190de3bd;hpb=e0af94bb8939bc6f4998db6294010baa77139092;p=lilypond.git

diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc
index 04883f03a9..1a55710122 100644
--- a/lily/accidental-placement.cc
+++ b/lily/accidental-placement.cc
@@ -36,14 +36,14 @@ accidental_pitch (Grob *acc)
 {
   SCM cause = acc->get_parent (Y_AXIS)->get_property ("cause");
 
-  Stream_event *mcause = Stream_event::unsmob (cause);
+  Stream_event *mcause = unsmob<Stream_event> (cause);
   if (!mcause)
     {
       programming_error ("note head has no event cause");
       return 0;
     }
 
-  return Pitch::unsmob (mcause->get_property ("pitch"));
+  return unsmob<Pitch> (mcause->get_property ("pitch"));
 }
 
 void
@@ -54,7 +54,6 @@ Accidental_placement::add_accidental (Grob *me, Grob *a, bool stagger, long cont
     return;
 
   a->set_parent (me, X_AXIS);
-  a->set_property ("X-offset", Grob::x_parent_positioning_proc);
   long n = p->get_notename ();
 
   SCM accs = me->get_object ("accidental-grobs");
@@ -85,9 +84,9 @@ Accidental_placement::split_accidentals (Grob *accs,
        acs = scm_cdr (acs))
     for (SCM s = scm_cdar (acs); scm_is_pair (s); s = scm_cdr (s))
       {
-        Grob *a = Grob::unsmob (scm_car (s));
+        Grob *a = unsmob<Grob> (scm_car (s));
 
-        if (Grob::is_smob (a->get_object ("tie"))
+        if (unsmob<Grob> (a->get_object ("tie"))
             && !to_boolean (a->get_property ("forced")))
           break_reminder->push_back (a);
         else
@@ -237,7 +236,7 @@ build_apes (SCM accs)
       Accidental_placement_entry *ape = new Accidental_placement_entry;
 
       for (SCM t = scm_cdar (s); scm_is_pair (t); t = scm_cdr (t))
-        ape->grobs_.push_back (Grob::unsmob (scm_car (t)));
+        ape->grobs_.push_back (unsmob<Grob> (scm_car (t)));
 
       apes.push_back (ape);
     }
@@ -285,7 +284,7 @@ set_ape_skylines (Accidental_placement_entry *ape,
           offset -= a->extent (a, X_AXIS).length () + padding;
         }
 
-      if (Skyline_pair *sky = Skyline_pair::unsmob (a->get_property ("horizontal-skylines")))
+      if (Skyline_pair *sky = unsmob<Skyline_pair> (a->get_property ("horizontal-skylines")))
         {
           Skyline_pair copy (*sky);
           copy.raise (a->relative_coordinate (common[X_AXIS], X_AXIS));
@@ -313,7 +312,7 @@ extract_heads_and_stems (vector<Accidental_placement_entry *> const &apes)
           Grob *head = acc->get_parent (Y_AXIS);
           Grob *col = head->get_parent (X_AXIS);
 
-          if (Note_column::has_interface (col))
+          if (has_interface<Note_column> (col))
             note_cols.push_back (col);
           else
             ret.push_back (head);
@@ -327,7 +326,7 @@ extract_heads_and_stems (vector<Accidental_placement_entry *> const &apes)
   for (vsize i = note_cols.size (); i--;)
     {
       Grob *c = note_cols[i]->get_parent (X_AXIS);
-      if (Note_collision_interface::has_interface (c))
+      if (has_interface<Note_collision_interface> (c))
         {
           extract_grob_set (c, "elements", columns);
           concat (note_cols, columns);
@@ -371,7 +370,7 @@ build_heads_skyline (vector<Grob *> const &heads_and_stems,
   vector<Box> head_extents;
   for (vsize i = heads_and_stems.size (); i--;)
     head_extents.push_back (Box (heads_and_stems[i]->extent (common[X_AXIS], X_AXIS),
-                                 heads_and_stems[i]->pure_height (common[Y_AXIS], 0, INT_MAX)));
+                                 heads_and_stems[i]->pure_y_extent (common[Y_AXIS], 0, INT_MAX)));
 
   return Skyline (head_extents, Y_AXIS, LEFT);
 }
@@ -470,7 +469,7 @@ MAKE_SCHEME_CALLBACK (Accidental_placement, calc_positioning_done, 1);
 SCM
 Accidental_placement::calc_positioning_done (SCM smob)
 {
-  Grob *me = Grob::unsmob (smob);
+  Grob *me = unsmob<Grob> (smob);
   if (!me->is_live ())
     return SCM_BOOL_T;