X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fgrace-iterator.hh;h=4da3511c0be8d36d6b0a3600f77f7c200576e604;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=ce7459b974291854dcf8bc6d7189721c9a4f06d8;hpb=07d4d05df6479d58c3c5152c07d7c86b94ee98b4;p=lilypond.git

diff --git a/lily/include/grace-iterator.hh b/lily/include/grace-iterator.hh
index ce7459b974..4da3511c0b 100644
--- a/lily/include/grace-iterator.hh
+++ b/lily/include/grace-iterator.hh
@@ -1,29 +1,35 @@
-/*   
-  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
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1999--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#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 void process (Moment);
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME (Grace_iterator);
+  Moment pending_moment () const;
 };
 
-
-
 #endif /* GRACE_ITERATOR_HH */
 
-