lilypond-0.0.21

diff --git a/src/inputscore.cc b/src/inputscore.cc
index 5043354f0c902955e78464cc389b15b556761503..8bbe7e266e3bccf21a496c9d16de40d5367fd853 100644 (file)
--- a/src/inputscore.cc
+++ b/src/inputscore.cc
@@ -32,7 +32,7 @@ Input_score::parse()
     Paperdef* p=new Paperdef(*paper_);
     Score *s = new Score(p);
     
-    for (PCursor<Input_staff*> i(staffs_); i.ok(); i++) {
+    for (iter_top(staffs_,i); i.ok(); i++) {
        Staff* staf=i->parse(commands_);
        s->add(staf);
     }
@@ -54,7 +54,7 @@ void
 Input_score::print()const
 {
     mtor << "Input_score {\n";
-    for (PCursor<Input_staff*> i(staffs_); i.ok(); i++) {
+    for (iter_top(staffs_,i); i.ok(); i++) {
        i->print();
     }
     mtor << "}\n";

diff --git a/src/scoreline.cc b/src/scoreline.cc
index 788efd5dabc97bcc0d56fae8800bd87cc6de8517..39c13c48b8d054c116083bf86db4cfd30cc7c4c3 100644 (file)
--- a/src/scoreline.cc
+++ b/src/scoreline.cc
@@ -12,7 +12,7 @@ String
 Line_of_score::TeXstring() const
 {
      String s("\\vbox{%<- line of score\n");
-     for (PCursor<Line_of_staff*> sc(staffs); sc.ok(); sc++){
+     for (iter_top(staffs,sc); sc.ok(); sc++){
         s += sc->TeXstring();
         if ((sc+1).ok())
             s+= "\\interstaffline\n";
@@ -32,7 +32,7 @@ Line_of_score::Line_of_score(svec<PCol *> sv,
        p->line=this;
     }
 
-    for (PCursor<PStaff*> sc(pscore_->staffs); sc.ok(); sc++)
+    for (iter_top(pscore_->staffs,sc); sc.ok(); sc++)
        staffs.bottom().add(new Line_of_staff(this, sc));    
 }
 /* construct a line with the named columns. Make the line field
@@ -45,7 +45,7 @@ Line_of_score::Line_of_score(svec<PCol *> sv,
 void
 Line_of_score::process()
 {
-    for (PCursor<Line_of_staff*> i(staffs); i.ok(); i++)
+    for (iter_top(staffs,i); i.ok(); i++)
        i->process();
 }
        

diff --git a/src/voice.cc b/src/voice.cc
index 2f2bbaec53b3d914c6057ff53be5e8a5bcebe1df..9c474f81bb851a84f696231de45b8bdb2ce37836 100644 (file)
--- a/src/voice.cc
+++ b/src/voice.cc
@@ -25,7 +25,7 @@ Voice::print() const
 {
 #ifndef NPRINT
     mtor << "start: "<< start<<eol;
-    for (PCursor<Voice_element*> vec(elts); vec.ok(); vec++)
+    for (iter_top(elts,vec); vec.ok(); vec++)
        vec->print();
 #endif
 }
@@ -34,7 +34,7 @@ Moment
 Voice::last() const
 {
     Moment l =start;
-    for (PCursor<Voice_element*> vec(elts); vec.ok(); vec++)
+    for (iter_top(elts,vec); vec.ok(); vec++)
        l  += vec->duration;
     return l;
 }
@@ -44,7 +44,7 @@ Voice_element::print() const
 {
 #ifndef NPRINT
     mtor << "voice_element { dur :"<< duration <<"\n";
-    for (PCursor<Request*> rc(reqs); rc.ok(); rc++) {
+    for (iter_top(reqs,rc); rc.ok(); rc++) {
        rc->print();
     }
     mtor << "}\n";