(LilyPond-command-alist): invoke lilypond

[lilypond.git] / flower / file-path.cc

diff --git a/flower/file-path.cc b/flower/file-path.cc
index 20dc9ab874c06605d4e02e4875871e02e15f98e3..14babc23ec95945e8cb8b9f86704e0e1768ab21c 100644 (file)
--- a/flower/file-path.cc
+++ b/flower/file-path.cc
@@ -72,16 +72,16 @@ dos_to_posix_list (String path)
 
 /* Join components to full path. */
 String
-Path::string () const
+Path::to_string () const
 {
   String s;
   if (!root.empty_b ())
-    s = root + to_string (ROOTSEP);
+    s = root + ::to_string (ROOTSEP);
   if (!dir.empty_b ())
-    s += dir + to_string (DIRSEP);
+    s += dir + ::to_string (DIRSEP);
   s += base;
   if (!ext.empty_b ())
-    s += to_string (EXTSEP) + ext;
+    s += ::to_string (EXTSEP) + ext;
   return s;
 }
 
@@ -164,10 +164,10 @@ File_path::find (String nm) const
   for (int i=0; i < size (); i++)
     {
       String path  = elem (i);
-      String sep = to_string (DIRSEP);
+      String sep = ::to_string (DIRSEP);
       String right (path.right_string (1));
       if (path.length () && right != sep)
-       path += to_string (DIRSEP);
+       path += ::to_string (DIRSEP);
 
       path += nm;
 
@@ -184,10 +184,11 @@ File_path::find (String nm) const
        continue;
 #endif
 #if !STAT_MACROS_BROKEN
+      
       struct stat sbuf;
       if (stat (path.to_str0 (), &sbuf) != 0)
        continue;
-      
+
       if (S_ISDIR (sbuf.st_mode))
        continue;
 #endif
@@ -231,7 +232,7 @@ File_path::add (String s)
 }
 
 String
-File_path::string () const
+File_path::to_string () const
 {
   String s;
   for (int i=0; i< size (); i++)