X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Ffile-name.hh;h=649521fa71f1a7f5ea834dc9d84fc2f51541b386;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=e6247986f96609f5d0dd398c3d2fae46df9ad5eb;hpb=df5e5095a9275a20e2c89326ee7fcf47cdd6a45b;p=lilypond.git

diff --git a/flower/include/file-name.hh b/flower/include/file-name.hh
index e6247986f9..649521fa71 100644
--- a/flower/include/file-name.hh
+++ b/flower/include/file-name.hh
@@ -3,34 +3,33 @@
 
   source file of the Flower Library
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 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"
 
-#if 0// STD_STRING
-#include "string.hh"
-#endif
+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 */