* Another grand 2003 update.

[lilypond.git] / lily / include / grace-iterator.hh

diff --git a/lily/include/grace-iterator.hh b/lily/include/grace-iterator.hh
index 9743d7ab901ddd2f5826c101e60ddae5d53c7fe8..96ce38cb38e14a271abea6d3817ad274073ce24b 100644 (file)
--- a/lily/include/grace-iterator.hh
+++ b/lily/include/grace-iterator.hh
@@ -3,23 +3,22 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#ifndef GRACE_ITERATOR_HH
-#define GRACE_ITERATOR_HH
+#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;
+  VIRTUAL_COPY_CONS (Music_iterator);
+  virtual void process (Moment);
+  DECLARE_SCHEME_CALLBACK(constructor, ());
+  Moment pending_moment () const;
 };