*** empty log message ***

[lilypond.git] / lily / beam.cc

diff --git a/lily/beam.cc b/lily/beam.cc
index cab9d8fdfc2a8cd34322864d529f2ba5ce35c5b3..5861dba32115cb4fa7aa7a3cd581a67ec15acd45 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -25,18 +25,20 @@
 */
 
 #include "beam.hh"
-#include "interval-set.hh"
-#include "directional-element-interface.hh"
+
 #include "beaming.hh"
-#include "misc.hh"
+#include "directional-element-interface.hh"
+#include "international.hh"
+#include "interval-set.hh"
+#include "item.hh"
 #include "least-squares.hh"
-#include "stem.hh"
-#include "output-def.hh"
 #include "lookup.hh"
+#include "misc.hh"
+#include "output-def.hh"
 #include "pointer-group-interface.hh"
-#include "staff-symbol-referencer.hh"
-#include "item.hh"
 #include "spanner.hh"
+#include "staff-symbol-referencer.hh"
+#include "stem.hh"
 #include "warn.hh"
 
 #if DEBUG_QUANTING
@@ -498,7 +500,7 @@ Beam::print (SCM grob)
        should be switchable for those who want to twiddle with the
        parameters.
       */
-      String str;
+      std::string str;
       SCM properties = Font_interface::text_font_alist_chain (me);
 
       Direction stem_dir = stems.size () ? to_dir (stems[0]->get_property ("direction")) : UP;