From: fred <fred>
Date: Wed, 11 Dec 1996 23:24:05 +0000 (+0000)
Subject: lilypond-0.0.16
X-Git-Tag: release/1.5.59~6607
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=af87aa7eed3248adca309f04ca0eada9033001af;p=lilypond.git

lilypond-0.0.16
---

diff --git a/src/paper.cc b/src/paper.cc
index 29fcd240e4..fe2a30d136 100644
--- a/src/paper.cc
+++ b/src/paper.cc
@@ -4,7 +4,7 @@
 #include "debug.hh"
 #include "lookup.hh"
 #include "dimen.hh"
-#include "textdb.hh"
+
 
 
 // golden ratio
diff --git a/src/score.cc b/src/score.cc
index 2be27345d3..ca468ee6ae 100644
--- a/src/score.cc
+++ b/src/score.cc
@@ -75,41 +75,41 @@ Score::create_cols(Real w)
     c1->musical = false;
     c2->musical = true;
     
-    PCursor<Score_column*> scc(cols_);
+    PCursor<Score_column*> i(cols_);
 
-    for (; scc.ok(); scc++) {
-	assert(scc->when != w);
-	if (scc->when > w)
+    for (; i.ok(); i++) {
+	assert(i->when != w);
+	if (i->when > w)
 	    break;
     }
 
-    if (!scc.ok()) {
+    if (!i.ok()) {
 	cols_.bottom().add(c1);
 	cols_.bottom().add(c2);
-	scc = cols_.bottom();
-	scc --;
+	i = cols_.bottom();
+	i --;
     } else {
-	scc.insert(c1);
-	scc.insert(c2);
-	scc -= 2;
+	i.insert(c1);
+	i.insert(c2);
+	i -= 2;
     }
-    return scc;
+    return i;
 }
 
 PCursor<Score_column*>
 Score::find_col(Real w,bool mus)
 {
-    PCursor<Score_column*> scc(cols_);
-    for (; scc.ok(); scc++) {
-	if (scc->when == w && scc->musical == mus)
-	    return scc;
-	if (scc->when > w)
+    PCursor<Score_column*> i(cols_);
+    for (; i.ok(); i++) {
+	if (i->when == w && i->musical == mus)
+	    return i;
+	if (i->when > w)
 	    break;
     }
-    scc = create_cols(w);
+    i = create_cols(w);
     if (mus)
-	scc++;
-    return scc;
+	i++;
+    return i;
 }
 
 void
@@ -124,8 +124,8 @@ Real
 Score::last() const
 {    
     Real l = 0;
-    for (PCursor<Staff*> stc(staffs_); stc.ok(); stc++) {
-	l = MAX(l, stc->last());
+    for (PCursor<Staff*> i(staffs_); i.ok(); i++) {
+	l = MAX(l, i->last());
     }
     return l;
 }
diff --git a/src/staff.cc b/src/staff.cc
index 521d31635d..cbe0e59bbb 100644
--- a/src/staff.cc
+++ b/src/staff.cc
@@ -30,12 +30,12 @@ Staff::paper() const
 void
 Staff::clean_cols()
 {
-    PCursor<Staff_column *> stc(cols);
-    for(; stc.ok(); ){
-	if (!stc->score_column->used())
-	    stc.del();
+    PCursor<Staff_column *> i(cols);
+    for(; i.ok(); ){
+	if (!i->score_column->used())
+	    i.del();
 	else
-	    stc++;
+	    i++;
     }
 }
 
diff --git a/src/symbol.cc b/src/symbol.cc
index ce9507f8b8..d9ffea7afb 100644
--- a/src/symbol.cc
+++ b/src/symbol.cc
@@ -1,6 +1,6 @@
 #include "symbol.hh"
 #include "vray.hh"
-#include "textdb.hh"
+
 
 Symbol::Symbol()
     :    dim(Interval(0,0),Interval(0,0))
diff --git a/src/symtable.cc b/src/symtable.cc
index bc5d173869..87ed983da3 100644
--- a/src/symtable.cc
+++ b/src/symtable.cc
@@ -1,5 +1,4 @@
 #include "misc.hh"
-#include "textdb.hh"
 #include "dimen.hh"
 #include "debug.hh"
 #include "real.hh"
@@ -7,6 +6,7 @@
 #include "assoc.hh"
 #include "associter.hh"
 #include "symtable.hh"
+
 Symtables::Symtables()
 {
 }