X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fgrace-iterator.hh;h=610a15e810140ee944f5d9718ea7de066d6f385c;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=c253d078e826d0bcaebe6fa0a7d74047ec86fe78;hpb=9b34d4afef6dd3f50c8f9cec1e613eb44f8c7913;p=lilypond.git

diff --git a/lily/include/grace-iterator.hh b/lily/include/grace-iterator.hh
index c253d078e8..610a15e810 100644
--- a/lily/include/grace-iterator.hh
+++ b/lily/include/grace-iterator.hh
@@ -1,30 +1,24 @@
-/*   
+/*
   grace-iterator.hh -- declare Grace_iterator
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
-#ifndef GRACE_ITERATOR_HH
-#define GRACE_ITERATOR_HH
+  (c) 1999--2008 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:
-  VIRTUAL_COPY_CONS (Music_iterator);
-  ~Grace_iterator ();
-  virtual void construct_children () ;
-  virtual void do_process_and_next (Moment);
-
-  Moment next_moment () const;
+  virtual void process (Moment);
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME(Grace_iterator);
+  Moment pending_moment () const;
 };
 
-
-
 #endif /* GRACE_ITERATOR_HH */
 
-