*** empty log message ***

[lilypond.git] / lily / time-signature.cc

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index acc057e6713033917461e101545f745e824c3f13..66b788a181e27c0a0a539486f3b367715bac3ba6 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -8,11 +8,12 @@
 
 #include "time-signature.hh"
 
-#include "text-interface.hh"
-#include "output-def.hh"
 #include "font-interface.hh"
-#include "warn.hh"
+#include "international.hh"
+#include "output-def.hh"
 #include "staff-symbol-referencer.hh"
+#include "text-interface.hh"
+#include "warn.hh"
 
 /*
   TODO:
@@ -53,7 +54,7 @@ Time_signature::print (SCM smob)
 Stencil
 Time_signature::special_time_signature (Grob *me, SCM scm_style, int n, int d)
 {
-  String style = ly_scm2string (scm_symbol_to_string (scm_style));
+  std::string style = ly_scm2string (scm_symbol_to_string (scm_style));
 
   if (style == "numbered")
     return numbered_time_signature (me, n, d);
@@ -69,7 +70,7 @@ Time_signature::special_time_signature (Grob *me, SCM scm_style, int n, int d)
        return numbered_time_signature (me, n, d);
     }
 
-  String char_name = style + to_string (n) + to_string (d);
+  std::string char_name = style + to_string (n) + to_string (d);
   me->set_property ("font-encoding", ly_symbol2scm ("fetaMusic"));
   Stencil out = Font_interface::get_default_font (me)
     ->find_by_name ("timesig." + char_name);