Run grand-replace (issue 3765)

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

diff --git a/flower/include/file-name.hh b/flower/include/file-name.hh
index edfa72c23f5fe52faf35501a4fe9da28a47bfefa..e0fedd314bbaa7a1e32b0c1f6875bb399e2ffd11 100644 (file)
--- a/flower/include/file-name.hh
+++ b/flower/include/file-name.hh
@@ -1,9 +1,20 @@
 /*
-  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--2014 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
@@ -12,7 +23,7 @@
 #include "std-vector.hh"
 #include "std-string.hh"
 
-std::string dir_name (std::string const file_name);
+std::string dir_name (const std::string &file_name);
 std::string get_working_directory ();
 
 class File_name
@@ -23,10 +34,13 @@ public:
   string base_;
   string ext_;
 
-  File_name (string);
+  File_name (string = "");
 
   bool is_absolute () const;
   string to_string () const;
+  File_name canonicalized () const;
+  string dir_part () const;
+  string file_part () const;
 };
 
 #endif /* FILE_NAME */