* The grand 2005-2006 replace.

[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 6d25034d6d22b74e7c5801d174da5df6972b328e..12c12607f110b9393aed68a36eea487563ddf76f 100644 (file)
--- a/lily/include/chord-tremolo-iterator.hh
+++ b/lily/include/chord-tremolo-iterator.hh
@@ -1,11 +1,10 @@
-/*   
+/*
   chord-tremolo-iterator.hh -- declare Chord_tremolo_iterator
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef CHORD_TREMOLO_ITERATOR_HH
 #define CHORD_TREMOLO_ITERATOR_HH
@@ -15,23 +14,24 @@
 class Chord_tremolo_iterator : public Music_iterator
 {
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
+  DECLARE_CLASSNAME(Chord_tremolo_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_substitute (Context *f, Context *t);
+
+  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 void process (Moment);
   virtual Music_iterator *try_music_in_children (Music *) const;
-
 private:
   Moment factor_;
-  Music_iterator * child_iter_p_;
+  Music_iterator *child_iter_;
 };
 
-
 #endif /* CHORD_TREMOLO_ITERATOR_HH */