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

[lilypond.git] / flower / include / file-path.hh

diff --git a/flower/include/file-path.hh b/flower/include/file-path.hh
index 37a4b6c2b1b2e794b5e35ec5f6eba258a8a96da8..ee62d94b156b7acc7248818f610f99a3e3983515 100644 (file)
--- a/flower/include/file-path.hh
+++ b/flower/include/file-path.hh
@@ -3,14 +3,14 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef FILE_PATH_HH
 #define FILE_PATH_HH
 
-#include "array.hh"
-#include "string.hh"
+#include "std-vector.hh"
+#include "std-string.hh"
 
 /**
    search in directories for a file.
@@ -23,16 +23,20 @@
 
 class File_path
 {
-  Array<String> dirs_; 
+  vector<string> dirs_;
+
 public:
-  Array<String> directories () const;
-  String find (String name) const;
-  String find (String name, char const *extensions[]);
-  String to_string () const;
-  bool try_append (String str);
-  void append (String str);
-  void parse_path (String);
-  void prepend (String str);
+  vector<string> directories () const;
+  string find (string name) const;
+  string find (string name, char const *extensions[]);
+  string to_string () const;
+  bool try_append (string str);
+  void append (string str);
+  void parse_path (string);
+  void prepend (string str);
 };
 
+bool is_file (string file_name);
+bool is_dir (string file_name);
+
 #endif /* FILE_PATH */