Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

[lilypond.git] / lily / tuplet-iterator.cc

diff --git a/lily/tuplet-iterator.cc b/lily/tuplet-iterator.cc
index 20d04e651b16c745557a4eab4cb4deb67cec1301..79ee9241b4b9974251b60ba4dd8497669b1f9ac6 100644 (file)
--- a/lily/tuplet-iterator.cc
+++ b/lily/tuplet-iterator.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>,
+  Copyright (C) 1998--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>,
                  Erik Sandberg <mandolaerik@gmail.com>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -68,7 +68,7 @@ Tuplet_iterator::create_event (Direction d)
 
   Music *mus = get_music ();
 
-  Music *ev = Music::unsmob (ev_scm);
+  Music *ev = unsmob<Music> (ev_scm);
   ev->set_spot (*mus->origin ());
   if (d == START)
     {
@@ -128,10 +128,10 @@ Tuplet_iterator::process (Moment m)
 void
 Tuplet_iterator::construct_children ()
 {
-  if (Duration *d = Duration::unsmob (get_music ()->get_property ("duration")))
+  if (Duration *d = unsmob<Duration> (get_music ()->get_property ("duration")))
     spanner_duration_ = d->get_length ();
   else if (Moment *mp
-           = Moment::unsmob (get_outlet ()->get_property ("tupletSpannerDuration")))
+           = unsmob<Moment> (get_outlet ()->get_property ("tupletSpannerDuration")))
     spanner_duration_ = mp->main_part_;
   else
     spanner_duration_.set_infinite (1);