Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / pitch.cc

diff --git a/lily/pitch.cc b/lily/pitch.cc
index 6f5ea965eea5225bbf40811d54cd3c253543bbc0..80b32e3c69ee97d3fd3e72f484d202dda13dd687 100644 (file)
--- a/lily/pitch.cc
+++ b/lily/pitch.cc
@@ -7,8 +7,10 @@
 */
 
 #include "pitch.hh"
-#include "warn.hh"
+
 #include "main.hh"
+#include "string-convert.hh"
+#include "warn.hh"
 
 #include "ly-smobs.icc"
 
@@ -164,13 +166,13 @@ pitch_interval (Pitch const &from, Pitch const &to)
 char const *accname[] = {"eses", "eseh", "es", "eh", "",
                         "ih", "is", "isih", "isis"};
 
-String
+string
 Pitch::to_string () const
 {
   int n = (notename_ + 2) % 7;
-  String s = ::to_string (char (n + 'a'));
+  string s = ::to_string (char (n + 'a'));
   if (alteration_)
-    s += String (accname[alteration_ - DOUBLE_FLAT]);
+    s += string (accname[alteration_ - DOUBLE_FLAT]);
 
   if (octave_ >= 0)
     {