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

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

diff --git a/flower/include/file-name.hh b/flower/include/file-name.hh
index b91eb351564f060cd4c65af10994b24b9187d369..bd699e0b3151cdf12a207fb39cf6d8795d5a03be 100644 (file)
--- a/flower/include/file-name.hh
+++ b/flower/include/file-name.hh
@@ -3,30 +3,33 @@
 
   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_NAME_HH
 #define FILE_NAME_HH
 
-#include "array.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:
-  Std_string root_;
-  Std_string dir_;
-  Std_string base_;
-  Std_string ext_;
+  string root_;
+  string dir_;
+  string base_;
+  string ext_;
 
-  File_name (Std_string);
-#if 0// STD_STRING
-  File_name (String);
-#endif
+  File_name (string="");
 
   bool is_absolute () const;
-  Std_string to_string () const;
+  string to_string () const;
+  File_name canonicalized () const;
+  string dir_part () const;
+  string file_part () const;
 };
 
 #endif /* FILE_NAME */