Make test-file-name and test-file-path more unit-testy.

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

diff --git a/flower/include/file-name.hh b/flower/include/file-name.hh
index 68ba6d8f4626e2913d60aa706c6d908e0605672d..3d1a2d0fb2fe28e6094868387bd8792e6a331b87 100644 (file)
--- a/flower/include/file-name.hh
+++ b/flower/include/file-name.hh
@@ -3,26 +3,33 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2006 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_;
+  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;
+  string dir_part () const;
+  string file_part () const;
 };
 
 #endif /* FILE_NAME */