X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fchord-tremolo-iterator.hh;h=233af0a9bca5300f7521e6b71e995aee119ba2e8;hb=9ce63beb6e98dfda72259406ae5a19f48cd9b6af;hp=6d25034d6d22b74e7c5801d174da5df6972b328e;hpb=08c8760ee53ee597eaf6ac24dd783af6938d632d;p=lilypond.git

diff --git a/lily/include/chord-tremolo-iterator.hh b/lily/include/chord-tremolo-iterator.hh
index 6d25034d6d..233af0a9bc 100644
--- 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -15,21 +15,22 @@
 class Chord_tremolo_iterator : public Music_iterator
 {
 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_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_;
 };