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 8defff15ca38b57cf6fa25d83497ed2a392d5f27..edfa72c23f5fe52faf35501a4fe9da28a47bfefa 100644 (file)
--- a/flower/include/file-name.hh
+++ b/flower/include/file-name.hh
@@ -9,21 +9,24 @@
 #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_;
+  string root_;
+  string dir_;
+  string base_;
+  string ext_;
 
-  File_name (String);
+  File_name (string);
 
   bool is_absolute () const;
-  String to_string () const;
+  string to_string () const;
 };
 
 #endif /* FILE_NAME */