partial: 0.0.39-1.jcn

[lilypond.git] / src / score.cc

diff --git a/src/score.cc b/src/score.cc
index 83bffd72f775038d1a1ce06650d518de92f8a056..0dd16ecbf729cb28f82a248b6d91e3141f245899 100644 (file)
--- a/src/score.cc
+++ b/src/score.cc
@@ -5,19 +5,19 @@
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
-#include "tstream.hh"
+#include "tex-stream.hh"
 #include "score.hh"
-#include "sccol.hh"
+#include "score-column.hh"
 #include "pscore.hh"
 #include "staff.hh"
 #include "debug.hh"
-#include "paperdef.hh"
+#include "paper-def.hh"
 #include "main.hh"
 #include "source.hh"
-#include "sourcefile.hh"
-#include "scorewalker.hh"
-#include "midioutput.hh"
-#include "mididef.hh"
+#include "source-file.hh"
+#include "score-walker.hh"
+#include "midi-output.hh"
+#include "midi-def.hh"
 
 extern String default_out_fn;
 
@@ -96,7 +96,7 @@ Score::clean_cols()
 
     for (iter_top(cols_,c); c.ok(); ) {
        if (!c->pcol_l_->used_b()) {
-           delete c.get();
+           delete c.get_p();
        } else {
            c->preprocess();
            c++;
@@ -159,15 +159,12 @@ Score::find_col(Moment w, bool mus)
 }
 
 void
-Score::do_cols()
-    
+Score::do_cols()    
 {
-
     iter_top(cols_,i);
     for (; i.ok(); i++) {
        pscore_p_->add(i->pcol_l_);
     }
-
 }
 
 Moment
@@ -181,7 +178,7 @@ Score::last() const
 }
 
 void
-Score::set(Paperdef *pap_p)
+Score::set(Paper_def *pap_p)
 {
     delete paper_p_;
     paper_p_ = pap_p;