X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-wrapper-iterator.cc;h=428cac5a623a3a0308070a205bc938e41ec9ffa9;hb=99433c54bea756a38ed6b2a70bc8c90cd0d37902;hp=4d794033d8cc692e7754da335cc041af4f01fe52;hpb=e58fce49b3113408254011774685370b8233df17;p=lilypond.git

diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index 4d794033d8..428cac5a62 100644
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 
 
@@ -15,32 +15,21 @@ Music_wrapper_iterator::Music_wrapper_iterator ()
   child_iter_ =0;
 }
 
-Music_wrapper_iterator::Music_wrapper_iterator (Music_wrapper_iterator const &src)
-  : Music_iterator (src)
-{
-  child_iter_ = 0;
-  if  (src.child_iter_)
-  {
-    child_iter_ = src.child_iter_->clone () ;
-    scm_gc_unprotect_object (child_iter_->self_scm());
-  }
-}
-
 void
-Music_wrapper_iterator::do_quit()
+Music_wrapper_iterator::do_quit ()
 {
-  child_iter_->quit();
+  child_iter_->quit ();
 }
 
 void
 Music_wrapper_iterator::derived_mark () const
 {
   if (child_iter_)
-    scm_gc_mark (child_iter_->self_scm());
+    scm_gc_mark (child_iter_->self_scm ());
 }
 
 void
-Music_wrapper_iterator::derived_substitute (Translator_group*f,Translator_group*t) 
+Music_wrapper_iterator::derived_substitute (Context *f,Context *t) 
 {
   
   if (child_iter_)
@@ -50,7 +39,7 @@ Music_wrapper_iterator::derived_substitute (Translator_group*f,Translator_group*
 void
 Music_wrapper_iterator::construct_children ()
 {
-  Music * m =  dynamic_cast<Music_wrapper const*> (get_music ())-> element();  
+  Music * m =  dynamic_cast<Music_wrapper const*> (get_music ())-> element ();  
   child_iter_ = unsmob_iterator (get_iterator (m));
 }