patch::: 1.1.38.jcn1: Cons

[lilypond.git] / lily / music-list.cc

diff --git a/lily/music-list.cc b/lily/music-list.cc
index 0324d8af6c5207acef113262841365fe03c9bd63..a17fad69cf5a7b62fe22248f51380fc0b26ba6e0 100644 (file)
--- a/lily/music-list.cc
+++ b/lily/music-list.cc
@@ -17,8 +17,8 @@ Moment
 Simultaneous_music::length_mom () const
 {
   Moment dur = 0;
-  for (Cons<Music> *i = music_p_list_p_->head_; i;  i = i->next_)
-    dur = dur >? i->car_->length_mom ();
+  for (Cons<Music> *i = music_p_list_p_->head_cons_p_; i;  i = i->next_cons_p_)
+    dur = dur >? i->car_p_->length_mom ();
 
   return dur;
 }
@@ -27,8 +27,8 @@ void
 Music_sequence::compress (Moment m)
 {
   
-  for (Cons<Music> *i = music_p_list_p_->head_; i;  i = i->next_)
-    i->car_->compress (m);
+  for (Cons<Music> *i = music_p_list_p_->head_cons_p_; i;  i = i->next_cons_p_)
+    i->car_p_->compress (m);
 }
 
 Simultaneous_music::Simultaneous_music(Music_list *p)
@@ -46,9 +46,9 @@ Moment
 Sequential_music::length_mom () const
 {
   Moment last=0;
-  for (Cons<Music> *i = music_p_list_p_->head_; i;  i = i->next_)
+  for (Cons<Music> *i = music_p_list_p_->head_cons_p_; i;  i = i->next_cons_p_)
     {
-      last += i->car_->length_mom ();
+      last += i->car_p_->length_mom ();
     }
   return  last;
 }
@@ -76,9 +76,9 @@ Music_list::do_relative_octave (Musical_pitch last, bool ret_first)
 {
   Musical_pitch retval;
   int count=0;
-  for (Cons<Music> *i = head_; i ; i = i->next_)
+  for (Cons<Music> *i = head_cons_p_; i ; i = i->next_cons_p_)
     {
-      last = i->car_->to_relative_octave (last);
+      last = i->car_p_->to_relative_octave (last);
       if (!count ++ )
        retval = last;
     }
@@ -93,8 +93,8 @@ Music_list::do_relative_octave (Musical_pitch last, bool ret_first)
 Music_list::Music_list (Music_list const &s)
   : Cons_list<Music> (s)
 {
-  init_list ();
-  clone_killing_cons_list (*this, s.head_);
+  init ();
+  clone_killing_cons_list (*this, s.head_cons_p_);
 }
 
 
@@ -116,9 +116,9 @@ Request_chord::Request_chord()
 Musical_pitch
 Request_chord::to_relative_octave (Musical_pitch last)
 {
-  for (Cons<Music> *i = music_p_list_p_->head_; i ; i = i->next_)
+  for (Cons<Music> *i = music_p_list_p_->head_cons_p_; i ; i = i->next_cons_p_)
     {
-      if (Melodic_req *m= dynamic_cast <Melodic_req *> (i->car_))
+      if (Melodic_req *m= dynamic_cast <Melodic_req *> (i->car_p_))
        {
          Musical_pitch &pit = m->pitch_;
          pit.to_relative_octave (last);