Run `make grand-replace'.

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

diff --git a/flower/include/file-path.hh b/flower/include/file-path.hh
index 3c7cc264617ddd179cbe84e01a22a0bc0e62e75c..e66ddfa0d4cd38d4873acfc7e63f389b60d6a88e 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--2008 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.
@@ -21,17 +21,22 @@
    TODO: add a unix style PATH interface
 */
 
-class File_path : private Array<String>
+class File_path
 {
+  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) { Array<String>::push (str); }
-  void parse_path (String);
-  void prepend (String str) { Array<String>::insert (str, 0); }
+  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 */