2003 -> 2004

[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 fe35294b9b99028654e49e7a5e66ca71b205cb73..667b8e02d67c2bef0563ae81ff3e4e74d1f41b32 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--2002 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);
-  static SCM constructor_cxx_function;
+  DECLARE_SCHEME_CALLBACK(constructor, ());
   Chord_tremolo_iterator ();
   Chord_tremolo_iterator (Chord_tremolo_iterator const & );
 protected:
-  virtual ~Chord_tremolo_iterator ();
+  virtual void derived_substitute (Translator_group*f, Translator_group*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 process (Moment) ;
   virtual Music_iterator *try_music_in_children (Music *) const;
-
 private:
   Moment factor_;
-  Music_iterator * child_iter_p_;
+  Music_iterator * child_iter_;
 };