formatting cleanup

[lilypond.git] / lily / file-name-map.cc

diff --git a/lily/file-name-map.cc b/lily/file-name-map.cc
index c569f4538da782df890656c65e221a0a76f8df97..c5c168bc140a2c38a5b4376f3337c369a6b45aba 100644 (file)
--- a/lily/file-name-map.cc
+++ b/lily/file-name-map.cc
@@ -3,24 +3,22 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #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 (string s)
 {
-  if  (file_name_map_global.find (s) != file_name_map_global.end ())
-    {
-      s = file_name_map_global[s];
-    }
+  if (file_name_map_global.find (s) != file_name_map_global.end ())
+    s = file_name_map_global[s];
   return s;
 }