X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Ffile-name.hh;h=4822783fc6b956241c363cbbb0521008234221a6;hb=d46572826e777ed3e9fa4656535a6e9000f2ed9e;hp=b91eb351564f060cd4c65af10994b24b9187d369;hpb=bf898a6f737ebdd6a749ea0a14d1056a3566a10e;p=lilypond.git

diff --git a/flower/include/file-name.hh b/flower/include/file-name.hh
index b91eb35156..4822783fc6 100644
--- a/flower/include/file-name.hh
+++ b/flower/include/file-name.hh
@@ -1,32 +1,46 @@
 /*
-  file-name.hh -- declare File_name
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the Flower Library
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef FILE_NAME_HH
 #define FILE_NAME_HH
 
-#include "array.hh"
+#include "std-vector.hh"
 #include "std-string.hh"
 
+std::string dir_name (const std::string &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 */