*** empty log message ***

[lilypond.git] / lily / misc.cc

diff --git a/lily/misc.cc b/lily/misc.cc
index bfc97761c0efd940c373b72a5db02fcc916f12bd..607cbe99534ccc246d421cf725bec332144b643a 100644 (file)
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -3,13 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 
 #include "misc.hh"
-#include "string.hh"
+#include "std-string.hh"
 
 /*
   Return the 2-log, rounded down
@@ -35,25 +35,25 @@ log_2 (double x)
   return log (x) / log (2.0);
 }
 
-Array<String>
-split_string (String s, char c)
+Array<std::string>
+split_string (std::string s, char c)
 {
-  Array<String> rv;
+  Array<std::string> rv;
   while (s.length ())
     {
-      int i = s.index (c);
+      ssize i = s.find (c);
 
       if (i == 0)
        {
-         s = s.nomid_string (0, 1);
+         s = s.substr (1);
          continue;
        }
 
-      if (i < 0)
+      if (i == NPOS)
        i = s.length ();
 
-      rv.push (s.cut_string (0, i));
-      s = s.nomid_string (0, i);
+      rv.push (s.substr (0, i));
+      s = s.substr (i);
     }
 
   return rv;