nitpick

[lilypond.git] / lily / source.cc

diff --git a/lily/source.cc b/lily/source.cc
index c400a2bfa8a2e7ae100abaab4713818d3703329d..811b4dd6814dd541400b38895eae08f39c16ed88 100644 (file)
--- a/lily/source.cc
+++ b/lily/source.cc
@@ -14,15 +14,15 @@
 Sources::Sources ()
 {
   path_ = 0;
-  is_binary_ = false;
 }
 
-void
-Sources::set_binary (bool bo)
+
+Sources::Sources (Sources const &)
 {
-  is_binary_ = bo;
+  assert (false);
 }
 
+
 void
 Sources::set_path (File_path *f)
 {
@@ -32,22 +32,20 @@ Sources::set_path (File_path *f)
 /**
    open a file
 
-   @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
+   File_string the file to be opened, name might be changed if it is
+   found in a search path.
 */
 Source_file *
-Sources::get_file (string &file_string) //UGH
+Sources::get_file (string *file_string) //UGH
 {
-  if ((file_string != "-") && path_)
+  if (*file_string != "-" && path_)
     {
-      string file_string_o = path_->find (file_string);
-      if ((file_string_o == "") && (file_string != ""))
+      string file_string_o = path_->find (*file_string);
+      if ((file_string_o == "") && (*file_string != ""))
        return 0;
-      file_string = file_string_o;
+      *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;
 }
@@ -60,19 +58,9 @@ Sources::add (Source_file *sourcefile)
 
 Sources::~Sources ()
 {
-  junk_pointers (sourcefiles_);
-}
-
-Source_file *
-Sources::get_sourcefile (char const *str0)
-{
-  for (vector<Source_file*>::iterator i = sourcefiles_.begin();
-       i != sourcefiles_.end (); i++)
+  for (vsize i = 0; i < sourcefiles_.size (); i++)
     {
-      if ((*i)->contains (str0))
-       return *i;
+      sourcefiles_[i]->unprotect ();
     }
-
-  return 0;
 }