* flower/file-path.cc:

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

diff --git a/flower/include/file-path.hh b/flower/include/file-path.hh
index e63c5eb7fddb9bd3dfaed517d8c7af583ff55d1e..23997002328422f5cdebca12ed1efc65fdfdc397 100644 (file)
--- a/flower/include/file-path.hh
+++ b/flower/include/file-path.hh
@@ -10,7 +10,7 @@
 #define FILE_PATH_HH
 
 #include "array.hh"
-#include "string.hh"
+#include "std-string.hh"
 
 /**
    search in directories for a file.
@@ -23,19 +23,19 @@
 
 class File_path
 {
-  Array<String> dirs_;
+  Array<Std_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);
+  Array<Std_string> directories () const;
+  Std_string find (Std_string name) const;
+  Std_string find (Std_string name, char const *extensions[]);
+  Std_string to_string () const;
+  bool try_append (Std_string str);
+  void append (Std_string str);
+  void parse_path (Std_string);
+  void prepend (Std_string str);
 };
 
-bool is_file (String file_name);
-bool is_dir (String file_name);
+bool is_file (Std_string file_name);
+bool is_dir (Std_string file_name);
 
 #endif /* FILE_PATH */