release: 0.0.78

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

diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index 143587be88af2f4efad572c6352ce04e3cd151d1..42ad968c420a575bf517e86a74ee72c532117abc 100644 (file)
--- a/lily/include/music-iterator.hh
+++ b/lily/include/music-iterator.hh
@@ -22,7 +22,7 @@ protected:
     
 public:
     Music_iterator *daddy_iter_l_;
-    NAME_MEMBERS();
+    DECLARE_MY_RUNTIME_TYPEINFO;
     Array<Translator *>report_to_l_arr_;
 
     Translator *report_to_l()const;
@@ -48,7 +48,7 @@ public:
 class Change_iterator : public Music_iterator {
     Change_reg * change_l_;
 public:
-     NAME_MEMBERS();
+     DECLARE_MY_RUNTIME_TYPEINFO;
     virtual void process_and_next(Moment);
     Change_iterator(Change_reg*);
 };
@@ -60,7 +60,7 @@ class Chord_iterator : public Music_iterator
 public:
     ~Chord_iterator();
     Chord_iterator(Chord const*);
-    NAME_MEMBERS();
+    DECLARE_MY_RUNTIME_TYPEINFO;
 protected:
     virtual void do_print()const;
     virtual void construct_children();
@@ -69,13 +69,13 @@ protected:
     virtual bool ok()const;
 };
 
-class Voice_element_iterator : public Music_iterator {
-    const Voice_element * elt_l_;
+class Request_chord_iterator : public Music_iterator {
+    const Request_chord * elt_l_;
     Moment elt_duration_;
     bool last_b_;
 public:
-    Voice_element_iterator(Voice_element*);
-    NAME_MEMBERS();
+    Request_chord_iterator(Request_chord*);
+    DECLARE_MY_RUNTIME_TYPEINFO;
 
 protected:
     virtual void process_and_next(Moment);
@@ -94,7 +94,7 @@ class Voice_iterator :  private PCursor<Music*>, public Music_iterator
     void next_element();
 public:
     Voice_iterator(Voice const*);
-    NAME_MEMBERS();
+    DECLARE_MY_RUNTIME_TYPEINFO;
 protected:
     virtual void do_print()const;
     virtual void construct_children();