X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=b1697e199eec9eaf4d8c74017ac3b81473bd3c11;hb=5175fb07679b964a62202f6c900451e88d120f69;hp=bae22a94afddb94a0ef6790a871938c043f64bf3;hpb=42688099e519fe7ed3b004ea3343f40a6920a24f;p=lilypond.git

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index bae22a94af..b1697e199e 100644
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -37,26 +37,10 @@
 #include "part-combine-music.hh"
 #include "part-combine-music-iterator.hh"
 #include "request.hh"
-#include "simple-music-iterator.hh"
+#include "request-iterator.hh"
 #include "output-property.hh"
 #include "chord-tremolo-iterator.hh"
 
-Music_iterator::Music_iterator ()
-{
-  first_b_ = true;
-}
-
-Music_iterator::Music_iterator (Music_iterator const& src)
-{
-  first_b_ = src.first_b_;
-  handle_ = *src.handle_.clone ();
-  music_l_ = src.music_l_;
-}
-
-Music_iterator::~Music_iterator()
-{
-}
-
 void
 Music_iterator::do_print() const
 {
@@ -110,6 +94,10 @@ Music_iterator::construct_children()
 {
 }
 
+Music_iterator::~Music_iterator()
+{
+}
+
 Moment
 Music_iterator::next_moment() const
 {
@@ -130,26 +118,11 @@ Music_iterator::do_process_and_next (Moment)
 }
 
 bool
-Music_iterator::ok () const
+Music_iterator::ok() const
 {
   return first_b_;
 }
 
-Music*
-Music_iterator::get_music ()
-{
-  if (ok ())
-    return music_l_;
-  return 0;
-}
-
-bool
-Music_iterator::next ()
-{
-  first_b_ = false;
-  return ok ();
-}
-
 Music_iterator*
 Music_iterator::static_get_iterator_p (Music  *m)
 {
@@ -229,6 +202,11 @@ Music_iterator::get_iterator_p (Music *m) const
   return p;
 }
 
+Music_iterator::Music_iterator()
+{
+  first_b_ = true;
+}
+
 Music_iterator*
 Music_iterator::try_music (Music  *m) const
 {