Run `make grand-replace'.

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

diff --git a/flower/include/file-name.hh b/flower/include/file-name.hh
index f05ec44227e94f9ab28d712bf1ea469a84d8d8c5..649521fa71f1a7f5ea834dc9d84fc2f51541b386 100644 (file)
--- a/flower/include/file-name.hh
+++ b/flower/include/file-name.hh
@@ -3,27 +3,33 @@
 
   source file of the Flower Library
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef FILE_NAME_HH
 #define FILE_NAME_HH
 
-#include "array.hh"
-#include "string.hh"
+#include "std-vector.hh"
+#include "std-string.hh"
+
+std::string dir_name (std::string const file_name);
+std::string get_working_directory ();
 
 class File_name
 {
 public:
-  String root_;
-  String dir_;
-  String base_;
-  String ext_;
-
-  File_name (String);
-    
-  String to_string () const;
-  char const *to_str0 () const;
+  string root_;
+  string dir_;
+  string base_;
+  string ext_;
+
+  File_name (string="");
+
+  bool is_absolute () const;
+  string to_string () const;
+  File_name canonicalized () const;
+  string dir_part () const;
+  string file_part () const;
 };
 
 #endif /* FILE_NAME */