*** empty log message ***

[lilypond.git] / lily / custos.cc

diff --git a/lily/custos.cc b/lily/custos.cc
index 0b928b500ddab62e9183d422567b44b9e71df976..5b6fc3df26e54339ad49ce59a92f77a9628b5b6e 100644 (file)
--- a/lily/custos.cc
+++ b/lily/custos.cc
@@ -19,11 +19,12 @@ using namespace std;
 
 #include "custos.hh"
 #include "direction.hh"
+#include "font-interface.hh"
+#include "international.hh"
+#include "item.hh"
+#include "note-head.hh"
 #include "staff-symbol-referencer.hh"
 #include "warn.hh"
-#include "note-head.hh"
-#include "item.hh"
-#include "font-interface.hh"
 
 MAKE_SCHEME_CALLBACK (Custos, print, 1);
 SCM
@@ -32,7 +33,7 @@ Custos::print (SCM smob)
   Item *me = (Item *)unsmob_grob (smob);
 
   SCM scm_style = me->get_property ("style");
-  String style;
+  std::string style;
   if (scm_is_symbol (scm_style))
     style = ly_symbol2string (scm_style);
   else
@@ -52,7 +53,7 @@ Custos::print (SCM smob)
   int pos = Staff_symbol_referencer::get_rounded_position (me);
   int sz = Staff_symbol_referencer::line_count (me) - 1;
 
-  String font_char = "custodes." + style + ".";
+  std::string font_char = "custodes." + style + ".";
   if (pos < neutral_pos)
     font_char += "u";
   else if (pos > neutral_pos)