* lily/dots.cc (print): replace -

[lilypond.git] / lily / source.cc

diff --git a/lily/source.cc b/lily/source.cc
index 727d80e83393965331c7d38706445ee369ebdf65..481bb9d7eeda48241f073bc1ae6144631b66eb2d 100644 (file)
--- a/lily/source.cc
+++ b/lily/source.cc
@@ -3,36 +3,32 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
-#include <assert.h>
+#include "source.hh"
 
 #include "killing-cons.tcc"
-#include "string.hh"
-#include "flower-proto.hh"
 #include "source-file.hh"
-#include "source.hh"
 #include "file-path.hh"
 
 Sources::Sources ()
 {
-  sourcefile_p_list_ = 0;
-  path_C_= 0;
-  binary_b_ = false;
+  sourcefile_list_ = 0;
+  path_ = 0;
+  is_binary_ = false;
 }
 
 void
 Sources::set_binary (bool bo)
 {
-  binary_b_ = bo;
+  is_binary_ = bo;
 }
 
 void
 Sources::set_path (File_path *f)
 {
-  path_C_ = f;
+  path_ = f;
 }
 
 /**
@@ -46,9 +42,9 @@ Sources::set_path (File_path *f)
 Source_file*
 Sources::get_file (String &file_string) //UGH
 {
-  if ((file_string != "-") && path_C_)
+  if ((file_string != "-") && path_)
     {
-      String file_string_o = path_C_->find (file_string); 
+      String file_string_o = path_->find (file_string); 
       if ((file_string_o == "") && (file_string != ""))
        return 0;
       file_string = file_string_o;
@@ -61,12 +57,12 @@ Sources::get_file (String &file_string) //UGH
 void
 Sources::add (Source_file* sourcefile)
 {
-  sourcefile_p_list_ = new Killing_cons<Source_file> (sourcefile, sourcefile_p_list_);
+  sourcefile_list_ = new Killing_cons<Source_file> (sourcefile, sourcefile_list_);
 }
 
 Sources::~Sources ()
 {
-  delete sourcefile_p_list_;
+  delete sourcefile_list_;
 }
 /**
   search the list for file whose map contains pointer #str0#
@@ -77,8 +73,8 @@ Source_file*
 Sources::get_sourcefile (char const* str0)
 {
 
-  for (Cons<Source_file> *i = sourcefile_p_list_; i; i = i->next_)
-    if (i->car_->in_b (str0))  
+  for (Cons<Source_file> *i = sourcefile_list_; i; i = i->next_)
+    if (i->car_->contains (str0))      
       return i->car_;
   return 0;
 }