* stepmake/stepmake/generic-vars.make (LOOP): Add PLUS to keep -j

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

diff --git a/lily/include/change-iterator.hh b/lily/include/change-iterator.hh
index a43c4da5f2d1d73d32632820403299c17d8ac1dd..75c84286d9fd6d63c1e3a8750566748fe73bd17f 100644 (file)
--- a/lily/include/change-iterator.hh
+++ b/lily/include/change-iterator.hh
@@ -3,29 +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);
-  /*
-    CTOR is public
-   */
-
-protected:
-  virtual void do_process_and_next (Moment);
+  /* constructor is public */
+  virtual void process (Moment);
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME(Change_iterator);
 
 private:
-  void  error (String);
+  void error (std::string);
 };
 
 #endif