X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fgrace-iterator.hh;h=f4e64de693597fb0bda67bb79991892125fd5940;hb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;hp=77d5cd75b7d12c05963b68cffc4d22cce02c8537;hpb=434da79e9d7684b2b05fa92a6d808d4ea7933046;p=lilypond.git

diff --git a/lily/include/grace-iterator.hh b/lily/include/grace-iterator.hh
index 77d5cd75b7..f4e64de693 100644
--- a/lily/include/grace-iterator.hh
+++ b/lily/include/grace-iterator.hh
@@ -1,29 +1,24 @@
-/*   
-  grace-iterator.hh -- declare 
-  
+/*
+  grace-iterator.hh -- declare Grace_iterator
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
-#ifndef GRACE_ITERATOR_HH
-#define GRACE_ITERATOR_HH
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
+#ifndef NEWGRACE_ITERATOR_HH
+#define NEWGRACE_ITERATOR_HH
 
 #include "music-wrapper-iterator.hh"
 
 class Grace_iterator : public Music_wrapper_iterator
 {
 public:
-  ~Grace_iterator ();
-  virtual void construct_children () ;
-  virtual void do_process_and_next (Moment);
-  Moment next_moment () const;
-  Music* next_music_l ();
+  virtual void process (Moment);
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME(Grace_iterator);
+  Moment pending_moment () const;
 };
 
-
-
 #endif /* GRACE_ITERATOR_HH */
 
-