X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffile-name-map.cc;h=6266aec3c34e0c90a3275453eb51b9d53faa8530;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=dc1a240e46076d1656429847fa55a4b750755de8;hpb=2c22efe5a46a37065b10c3f51c5d7db00d07d318;p=lilypond.git

diff --git a/lily/file-name-map.cc b/lily/file-name-map.cc
index dc1a240e46..6266aec3c3 100644
--- a/lily/file-name-map.cc
+++ b/lily/file-name-map.cc
@@ -1,31 +1,41 @@
 /*
-  file-name-map.cc --  implement map_file_name()
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005 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/>.
 */
 
 #include <map>
+using namespace std;
 
 #include "file-name-map.hh"
 #include "lily-guile.hh"
 
-std::map<String, String> file_name_map_global;
+map<string, string> file_name_map_global;
 
-String
-map_file_name (String s)
+string
+map_file_name (const string &s)
 {
   if (file_name_map_global.find (s) != file_name_map_global.end ())
-    {
-      s = file_name_map_global[s];
-    }
+    return file_name_map_global[s];
   return s;
 }
 
 LY_DEFINE (ly_add_file_name_alist, "ly:add-file-name-alist",
-	   1, 0, 0, (SCM alist),
-	   "Add mappings for error messages from specified alist")
+           1, 0, 0, (SCM alist),
+           "Add mappings for error messages from @var{alist}.")
 {
   for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s))
     {