X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmeasure-grouping-engraver.cc;h=84da38886143de09402494bddf72002dcf331e22;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=758ce5f17428aabc024ab974aa3739786848bdad;hpb=e7aa6c445f463844dbaa52d38ea4aac2882b5601;p=lilypond.git

diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc
index 758ce5f174..84da388861 100644
--- a/lily/measure-grouping-engraver.cc
+++ b/lily/measure-grouping-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2002--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2002--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@ Measure_grouping_engraver::finalize ()
 {
   if (grouping_)
     {
-      grouping_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
+      grouping_->set_bound (RIGHT, Grob::unsmob (get_property ("currentCommandColumn")));
       grouping_->suicide ();
       grouping_ = 0;
     }
@@ -64,7 +64,7 @@ Measure_grouping_engraver::process_music ()
   if (grouping_ && now.main_part_ >= stop_grouping_mom_ && !now.grace_part_)
     {
       grouping_->set_bound (RIGHT,
-                            unsmob_grob (get_property ("currentMusicalColumn")));
+                            Grob::unsmob (get_property ("currentMusicalColumn")));
 
       grouping_ = 0;
     }
@@ -75,10 +75,10 @@ Measure_grouping_engraver::process_music ()
   SCM grouping = get_property ("beatStructure");
   if (scm_is_pair (grouping))
     {
-      Moment *measpos = unsmob_moment (get_property ("measurePosition"));
+      Moment *measpos = Moment::unsmob (get_property ("measurePosition"));
       Rational mp = measpos->main_part_;
 
-      Moment *base_mom = unsmob_moment (get_property ("baseMoment"));
+      Moment *base_mom = Moment::unsmob (get_property ("baseMoment"));
       Rational base_moment = base_mom->main_part_;
 
       Rational where (0);
@@ -97,7 +97,7 @@ Measure_grouping_engraver::process_music ()
               if (grouplen > 1)
                 {
                   grouping_ = make_spanner ("MeasureGrouping", SCM_EOL);
-                  grouping_->set_bound (LEFT, unsmob_grob (get_property ("currentMusicalColumn")));
+                  grouping_->set_bound (LEFT, Grob::unsmob (get_property ("currentMusicalColumn")));
 
                   stop_grouping_mom_ = now.main_part_ + Rational (grouplen - 1) * base_moment;
                   get_global_context ()->add_moment_to_process (Moment (stop_grouping_mom_));