release: 1.3.44

[lilypond.git] / lily / include / sequential-music-iterator.hh

diff --git a/lily/include/sequential-music-iterator.hh b/lily/include/sequential-music-iterator.hh
index 8cf39854c840dec1b9f929545a1b2016325d60ae..0d2565abf5dc3536b01e4afad8395a773ca3fa2c 100644 (file)
--- a/lily/include/sequential-music-iterator.hh
+++ b/lily/include/sequential-music-iterator.hh
@@ -3,19 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef SEQUENTIAL_MUSIC_ITERATOR_HH
 #define SEQUENTIAL_MUSIC_ITERATOR_HH
 
-#include "music-list-iterator.hh"
+#include "music-iterator.hh"
 
 /** Sequential_music iteration: walk each element in turn, and
   construct an iterator for every element.
   
  */
-class Sequential_music_iterator :  public Music_list_iterator
+class Sequential_music_iterator :  public Music_iterator
 {
 public:
   Sequential_music_iterator ();
@@ -26,14 +26,15 @@ public:
   virtual bool ok () const;
 
 protected:
-  Sequential_music* sequential_music_l () const;
-
   virtual void do_print() const;
   virtual void do_process_and_next (Moment);
+  virtual Music_iterator *try_music_in_children (Music const*) const;
+
 
 private:
   Moment here_mom_;
-  PCursor<Music*> *cursor_p_;
+
+  Cons<Music> *cursor_;
   Music_iterator * iter_p_;
 
   /*
@@ -41,7 +42,7 @@ private:
    */
   void start_next_element();
   void leave_element();
-  void set_Sequential_music_translator();
+  void set_sequential_music_translator();
 };
 
 #endif // SEQUENTIAL_MUSIC_ITERATOR_HH