Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into lilypond...

[lilypond.git] / lily / include / sources.hh

diff --git a/lily/include/sources.hh b/lily/include/sources.hh
index 13776f31becac34e91276040646d895c1a970a50..32dbb2ad458ae062ae40d30f5928625b014ea4e3 100644 (file)
--- a/lily/include/sources.hh
+++ b/lily/include/sources.hh
@@ -1,13 +1,13 @@
 /*
   sources.hh -- part of LilyPond
 
-  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef SOURCES_HH
 #define SOURCES_HH
 
-#include "flower-proto.hh"
+#include "lily-proto.hh"
 #include "std-vector.hh"
 
 class Sources
@@ -19,8 +19,7 @@ public:
   Sources ();
   ~Sources ();
 
-  Source_file *get_file (string *file_name);
-  Source_file *get_sourcefile (char const *);
+  Source_file *get_file (string file_name, string const& currentpath);
   void add (Source_file *sourcefile);
   void set_path (File_path *);