Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/flower/include/file-name.hh b/flower/include/file-name.hh
index e6247986f96609f5d0dd398c3d2fae46df9ad5eb..edfa72c23f5fe52faf35501a4fe9da28a47bfefa 100644 (file)
--- a/flower/include/file-name.hh
+++ b/flower/include/file-name.hh
@@ -9,28 +9,24 @@
 #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;
 };
 
 #endif /* FILE_NAME */