unsmob_pitch -> Pitch::unsmob and related

[lilypond.git] / lily / note-column.cc

diff --git a/lily/note-column.cc b/lily/note-column.cc
index 625bed1b2f4cbc27fc507c2be414a2066cae7be9..28a0b13d77e0a0c808054245a0cc7e2e715dbd44 100644 (file)
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -43,7 +43,7 @@ using namespace std;
 bool
 Note_column::has_rests (Grob *me)
 {
-  return unsmob_grob (me->get_object ("rest"));
+  return Grob::unsmob (me->get_object ("rest"));
 }
 
 bool
@@ -97,7 +97,7 @@ Note_column::head_positions_interval (Grob *me)
 Direction
 Note_column::dir (Grob *me)
 {
-  Grob *stem = unsmob_grob (me->get_object ("stem"));
+  Grob *stem = Grob::unsmob (me->get_object ("stem"));
   if (stem && Stem::has_interface (stem))
     return get_grob_direction (stem);
   else
@@ -121,7 +121,7 @@ Note_column::set_stem (Grob *me, Grob *stem)
 Grob *
 Note_column::get_rest (Grob *me)
 {
-  return unsmob_grob (me->get_object ("rest"));
+  return Grob::unsmob (me->get_object ("rest"));
 }
 
 void
@@ -138,7 +138,7 @@ Note_column::add_head (Grob *me, Grob *h)
     }
   else if (Note_head::has_interface (h))
     {
-      if (unsmob_grob (me->get_object ("rest")))
+      if (Grob::unsmob (me->get_object ("rest")))
         both = true;
       Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"), h);
     }
@@ -187,7 +187,7 @@ Note_column::accidentals (Grob *me)
   for (vsize i = 0; i < heads.size (); i++)
     {
       Grob *h = heads[i];
-      acc = h ? unsmob_grob (h->get_object ("accidental-grob")) : 0;
+      acc = h ? Grob::unsmob (h->get_object ("accidental-grob")) : 0;
       if (acc)
         break;
     }
@@ -208,7 +208,7 @@ Note_column::dot_column (Grob *me)
   extract_grob_set (me, "note-heads", heads);
   for (vsize i = 0; i < heads.size (); i++)
     {
-      Grob *dots = unsmob_grob (heads[i]->get_object ("dot"));
+      Grob *dots = Grob::unsmob (heads[i]->get_object ("dot"));
       if (dots)
         return dots->get_parent (X_AXIS);
     }