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

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

diff --git a/lily/include/change-iterator.hh b/lily/include/change-iterator.hh
index f52eb63120164d80bfdfbc9424ef174c6b1c13ee..71aa7cb8d3abb2b4b98e00a8501c3523b6f72c7b 100644 (file)
--- a/lily/include/change-iterator.hh
+++ b/lily/include/change-iterator.hh
@@ -3,25 +3,24 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 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
 {
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
   /* constructor is public */
-  virtual void do_process (Moment);
+  virtual void process (Moment);
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME(Change_iterator);
 
 private:
-  void  error (String);
+  void error (string);
 };
 
 #endif