X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=52745136fc54a891498ca96ba53b8273465e3ccd;hb=7c97fdea910b6c97606f5f66b5b5a0a001193451;hp=7c36f1755b5701a45d2ea42aea9b7b0bf7a60963;hpb=f4d8c77fc2ebac49bbdb0d0e9bec636313508846;p=lilypond.git

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 7c36f1755b..52745136fc 100644
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -364,7 +364,7 @@ MAKE_SCHEME_CALLBACK (Spanner, set_spacing_rods, 1);
 SCM
 Spanner::set_spacing_rods (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);
+  Grob *me = Grob::unsmob (smob);
   SCM num_length = me->get_property ("minimum-length");
   if (scm_is_number (num_length))
     {
@@ -422,7 +422,7 @@ MAKE_SCHEME_CALLBACK (Spanner, calc_normalized_endpoints, 1);
 SCM
 Spanner::calc_normalized_endpoints (SCM smob)
 {
-  Spanner *me = unsmob_spanner (smob);
+  Spanner *me = Spanner::unsmob (smob);
   SCM result = SCM_EOL;
 
   Spanner *orig = dynamic_cast<Spanner *> (me->original ());
@@ -466,16 +466,16 @@ Spanner::calc_normalized_endpoints (SCM smob)
 }
 
 Spanner *
-unsmob_spanner (SCM s)
+Spanner::unsmob (SCM s)
 {
-  return dynamic_cast<Spanner *> (unsmob_grob (s));
+  return dynamic_cast<Spanner *> (Grob::unsmob (s));
 }
 
 MAKE_SCHEME_CALLBACK (Spanner, bounds_width, 1);
 SCM
 Spanner::bounds_width (SCM grob)
 {
-  Spanner *me = unsmob_spanner (grob);
+  Spanner *me = Spanner::unsmob (grob);
 
   Grob *common = me->get_bound (LEFT)->common_refpoint (me->get_bound (RIGHT), X_AXIS);
 
@@ -491,7 +491,7 @@ MAKE_SCHEME_CALLBACK (Spanner, kill_zero_spanned_time, 1);
 SCM
 Spanner::kill_zero_spanned_time (SCM grob)
 {
-  Spanner *me = unsmob_spanner (grob);
+  Spanner *me = Spanner::unsmob (grob);
   /*
     Remove the line or hairpin at the start of the line.  For
     piano voice indicators, it makes no sense to have them at