release: 1.0.15

[lilypond.git] / lily / music-wrapper-iterator.cc

diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index 13b2a90c31dacebe3749b245ecba110ff80dbd9b..4e0ca78ff7977de010960d0b63a47fd18eae9a15 100644 (file)
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -1,5 +1,5 @@
 /*   
-  music-wrapper-iterator.cc --  implement 
+  music-wrapper-iterator.cc --  implement Music_wrapper_iterator
   
   source file of the GNU LilyPond music typesetter
   
@@ -11,10 +11,9 @@
 #include "music-wrapper-iterator.hh"
 #include "music-wrapper.hh"
 
-Music_wrapper_iterator::Music_wrapper_iterator (Music_wrapper *r)
+Music_wrapper_iterator::Music_wrapper_iterator ()
 {
   child_iter_p_ =0;
-  music_l_ = r;
 }
 
 IMPLEMENT_IS_TYPE_B1(Music_wrapper_iterator, Music_iterator);
@@ -28,7 +27,7 @@ Music_wrapper_iterator::do_print () const
 void
 Music_wrapper_iterator::construct_children ()
 {
-  child_iter_p_ = get_iterator_p (music_l_->element_p_);  
+  child_iter_p_ = get_iterator_p (music_wrapper_l ()->element_p_);  
 }
 
 Music_wrapper_iterator::~Music_wrapper_iterator ()
@@ -36,7 +35,11 @@ Music_wrapper_iterator::~Music_wrapper_iterator ()
   delete child_iter_p_;
 }
 
-
+Music_wrapper*
+Music_wrapper_iterator::music_wrapper_l ()
+{
+  return (Music_wrapper*) music_l_;
+}
 bool
 Music_wrapper_iterator::ok () const
 {
@@ -44,10 +47,10 @@ Music_wrapper_iterator::ok () const
 }
 
 void
-Music_wrapper_iterator::process_and_next (Moment m)
+Music_wrapper_iterator::do_process_and_next (Moment m)
 {
   child_iter_p_->process_and_next (m);
-  Music_iterator::process_and_next (m);
+  Music_iterator::do_process_and_next (m);
 }
 
 Moment