Merge with master

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

diff --git a/flower/include/file-path.hh b/flower/include/file-path.hh
index 9379eda5ad816e4b4658e0b306f0568a4eaad6c2..9a35388c4c08a33686efb39007f5381b3833e768 100644 (file)
--- a/flower/include/file-path.hh
+++ b/flower/include/file-path.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef FILE_PATH_HH
@@ -23,20 +23,20 @@
 
 class File_path
 {
-  std::vector<std::string> dirs_;
+  vector<string> dirs_;
 
 public:
-  std::vector<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);
+  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 (std::string file_name);
-bool is_dir (std::string file_name);
+bool is_file (string file_name);
+bool is_dir (string file_name);
 
 #endif /* FILE_PATH */