* VERSION (MY_PATCH_LEVEL): make 1.7.0

[lilypond.git] / lily / include / chord-tremolo-iterator.hh

diff --git a/lily/include/chord-tremolo-iterator.hh b/lily/include/chord-tremolo-iterator.hh
index 9100bce3199ae30510b307bca8e6a0561b1a6074..de5344874ac676895a4df2252b9461870e50f6d9 100644 (file)
--- a/lily/include/chord-tremolo-iterator.hh
+++ b/lily/include/chord-tremolo-iterator.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -14,20 +14,22 @@
 
 class Chord_tremolo_iterator : public Music_iterator
 {
-  Moment factor_;
-  Music_iterator * child_iter_p_;
-
 public:
+  VIRTUAL_COPY_CONS (Music_iterator);
+  DECLARE_SCHEME_CALLBACK(constructor, ());
   Chord_tremolo_iterator ();
-
+  Chord_tremolo_iterator (Chord_tremolo_iterator const & );
 protected:
-  virtual ~Chord_tremolo_iterator ();
-  virtual Moment next_moment () const;
-  virtual void construct_children  () ;
+  virtual void derived_mark () const;
+  virtual Moment pending_moment () const;
+  virtual void do_quit(); 
+  virtual void construct_children () ;
   virtual bool ok () const;
-  virtual void do_print () const;
-  virtual void do_process_and_next (Moment) ;
-  virtual Music_iterator *try_music_in_children (Music const *) const;
+  virtual void process (Moment) ;
+  virtual Music_iterator *try_music_in_children (Music *) const;
+private:
+  Moment factor_;
+  Music_iterator * child_iter_;
 };