* The grand 2005-2006 replace.

[lilypond.git] / lily / source.cc

diff --git a/lily/source.cc b/lily/source.cc
index da6ce5339dda71239529d30c8d31d7e3b11ef788..6c5a47691cf41c1212028fb25c70de692763d808 100644 (file)
--- a/lily/source.cc
+++ b/lily/source.cc
@@ -3,23 +3,19 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.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_list_ = 0;
-  path_C_= 0;
+  path_ = 0;
   is_binary_ = false;
 }
 
@@ -32,34 +28,34 @@ Sources::set_binary (bool bo)
 void
 Sources::set_path (File_path *f)
 {
-  path_C_ = f;
+  path_ = f;
 }
 
 /**
-  open a file
+   open a file
 
-  @param file_string the file to be opened, name might be changed if it
-  is found in a search path. UGH!
+   @param file_string the file to be opened, name might be changed if it
+   is found in a search path. UGH!
 
-  @return 0 if no file found
-  */
-Source_file*
+   @return 0 if no file found
+*/
+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;
     }
-  Source_file * f = new Source_file (file_string) ;
+  Source_file *f = new Source_file (file_string);
   add (f);
   return f;
 }
 
 void
-Sources::add (Source_file* sourcefile)
+Sources::add (Source_file *sourcefile)
 {
   sourcefile_list_ = new Killing_cons<Source_file> (sourcefile, sourcefile_list_);
 }
@@ -69,16 +65,16 @@ Sources::~Sources ()
   delete sourcefile_list_;
 }
 /**
-  search the list for file whose map contains pointer #str0#
+   search the list for file whose map contains pointer #str0#
 
-  @return 0 if not found.
-  */
-Source_file*
-Sources::get_sourcefile (char const* str0)
+   @return 0 if not found.
+*/
+Source_file *
+Sources::get_sourcefile (char const *str0)
 {
 
   for (Cons<Source_file> *i = sourcefile_list_; i; i = i->next_)
-    if (i->car_->contains (str0))      
+    if (i->car_->contains (str0))
       return i->car_;
   return 0;
 }