Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into lilypond...

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

diff --git a/lily/include/change-iterator.hh b/lily/include/change-iterator.hh
index 4ab9d99e4a8851199fe51c9dca4a7ca32d8b15b1..c7ecfda15cc3850bc5a9731927a5cb4772c45dee 100644 (file)
--- a/lily/include/change-iterator.hh
+++ b/lily/include/change-iterator.hh
@@ -3,27 +3,24 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef CHANGE_ITERATOR_HH
 #define CHANGE_ITERATOR_HH
 
-#include "music-iterator.hh"
-
+#include "simple-music-iterator.hh"
 
-class Change_iterator : public Music_iterator
+class Change_iterator : public Simple_music_iterator
 {
-  void  error (String);
-
-protected:
-  virtual void do_process_and_next (Moment);
-
 public:
-  /*
-    CTOR is public
-   */
+  /* constructor is public */
+  virtual void process (Moment);
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME(Change_iterator);
+
+private:
+  void error (string);
 };
 
 #endif