unsmob_pitch -> Pitch::unsmob and related

[lilypond.git] / lily / spacing-determine-loose-columns.cc

diff --git a/lily/spacing-determine-loose-columns.cc b/lily/spacing-determine-loose-columns.cc
index d7fd373cbab3dc92021e0e5b2a3edc219d25609f..5c2c0b2a910f85b0e219fb3ae09d1cbbc3e68a8c 100644 (file)
--- a/lily/spacing-determine-loose-columns.cc
+++ b/lily/spacing-determine-loose-columns.cc
@@ -219,8 +219,8 @@ Spacing_spanner::prune_loose_columns (Grob *me,
 
       if (loose)
         {
-          Grob *right_neighbor = unsmob_grob (c->get_object ("right-neighbor"));
-          Grob *left_neighbor = unsmob_grob (c->get_object ("left-neighbor"));
+          Grob *right_neighbor = Grob::unsmob (c->get_object ("right-neighbor"));
+          Grob *left_neighbor = Grob::unsmob (c->get_object ("left-neighbor"));
 
           /*
             Either object can be non existent, if the score ends
@@ -282,7 +282,7 @@ Spacing_spanner::set_explicit_neighbor_columns (vector<Grob *> const &cols)
                   min_right_rank = right_rank;
                 }
 
-              Grob *old_left_neighbor = unsmob_grob (right_col->get_object ("left-neighbor"));
+              Grob *old_left_neighbor = Grob::unsmob (right_col->get_object ("left-neighbor"));
               if (!old_left_neighbor || left_rank > Paper_column::get_rank (old_left_neighbor))
                 right_col->set_object ("left-neighbor", left_col->self_scm ());
             }
@@ -304,9 +304,9 @@ Spacing_spanner::set_implicit_neighbor_columns (vector<Grob *> const &cols)
       if (!Paper_column::is_breakable (it) && !Paper_column::is_musical (it))
         continue;
 
-      if (i && !unsmob_grob (cols[i]->get_object ("left-neighbor")))
+      if (i && !Grob::unsmob (cols[i]->get_object ("left-neighbor")))
         cols[i]->set_object ("left-neighbor", cols[i - 1]->self_scm ());
-      if (i + 1 < cols.size () && !unsmob_grob (cols[i]->get_object ("right-neighbor")))
+      if (i + 1 < cols.size () && !Grob::unsmob (cols[i]->get_object ("right-neighbor")))
         cols[i]->set_object ("right-neighbor", cols[i + 1]->self_scm ());
     }
 }