X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsustain-pedal.cc;h=4e2a8f529ca669d42e2b910a35b67a83e143ebd1;hb=8124604a6b0258349e12b26af93cf1d014b72f5f;hp=4818b545f71f60aa39ed3b5f59d7beef8bed2a9f;hpb=545092a25d8ca41dc90b87482474b3719f7130a9;p=lilypond.git

diff --git a/lily/sustain-pedal.cc b/lily/sustain-pedal.cc
index 4818b545f7..4e2a8f529c 100644
--- a/lily/sustain-pedal.cc
+++ b/lily/sustain-pedal.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #include "grob.hh"
 #include "stencil.hh"
@@ -44,21 +44,21 @@ Sustain_pedal::print (SCM smob)
   if (!scm_is_string (glyph))
     return mol.smobbed_copy ();
 
-  String text = ly_scm2string (glyph);
+  string text = ly_scm2string (glyph);
 
-  for (int i = 0; i < text.length (); i++)
+  for (ssize i = 0; i < text.length (); i++)
     {
-      String idx ("pedal.");
-      if (text.cut_string (i, 3) == "Ped")
+      string idx ("pedal.");
+      if (text.substr (i, 3) == "Ped")
 	{
 	  idx += "Ped";
 	  i += 2;
 	}
       else
-	idx += String (&text.to_bytes ()[i], 1);
+	idx += string (&text.c_str ()[i], 1);
       Stencil m = Font_interface::get_default_font (e)->find_by_name (idx);
       if (!m.is_empty ())
-	mol.add_at_edge (X_AXIS, RIGHT, m, 0, 0);
+	mol.add_at_edge (X_AXIS, RIGHT, m, 0);
     }
 
   return mol.smobbed_copy ();