X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsequential-iterator.cc;h=0ff37e8a02430dc6656c0aedfe3fa4258c63eea4;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=5ba7a59ddf3c6d0b85c4a82eb2cc108439c5fafe;hpb=3f8a827aad721ed546b823e3f9f2605f61b90e20;p=lilypond.git

diff --git a/lily/sequential-iterator.cc b/lily/sequential-iterator.cc
index 5ba7a59ddf..0ff37e8a02 100644
--- a/lily/sequential-iterator.cc
+++ b/lily/sequential-iterator.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--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
@@ -33,7 +33,7 @@
 
 
   if (scm_is_pair (cursor_))
-  iter_->music_ == unsmob_music (scm_car (cursor_))
+  iter_->music_ == Music::unsmob (scm_car (cursor_))
   else
   iter_ == 0;
 
@@ -96,7 +96,7 @@ create_grace_fixup_list (SCM cursor)
 
   for (; scm_is_pair (cursor); cursor = scm_cdr (cursor))
     {
-      Music *mus = unsmob_music (scm_car (cursor));
+      Music *mus = Music::unsmob (scm_car (cursor));
       Moment s = mus->start_mom ();
       Moment l = mus->get_length () - s;
 
@@ -134,8 +134,8 @@ Sequential_iterator::construct_children ()
   iter_ = 0;
   if (scm_is_pair (cursor_))
     {
-      Music *m = unsmob_music (scm_car (cursor_));
-      iter_ = unsmob_iterator (get_iterator (m));
+      Music *m = Music::unsmob (scm_car (cursor_));
+      iter_ = Music_iterator::unsmob (get_iterator (m));
     }
 
   while (iter_ && !iter_->ok ())
@@ -195,7 +195,7 @@ Sequential_iterator::next_element (bool)
 
   iter_->quit ();
   if (scm_is_pair (cursor_))
-    iter_ = unsmob_iterator (get_iterator (unsmob_music (scm_car (cursor_))));
+    iter_ = Music_iterator::unsmob (get_iterator (Music::unsmob (scm_car (cursor_))));
   else
     iter_ = 0;
 }