Run `make grand-replace'.

[lilypond.git] / lily / relative-octave-check.cc

diff --git a/lily/relative-octave-check.cc b/lily/relative-octave-check.cc
index 9fe109b0841c7bae7d099c3935683cbe552c9f7e..8f997ee81a988ad14a0bf6df0a4b6d130f69ba79 100644 (file)
--- a/lily/relative-octave-check.cc
+++ b/lily/relative-octave-check.cc
@@ -3,12 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "music.hh"
 #include "input.hh"
-#include "pitch.hh"
+#include "international.hh"
+#include "music.hh"
 
 class Relative_octave_check
 {
@@ -35,7 +35,7 @@ Relative_octave_check::relative_callback (SCM music, SCM last_pitch)
 
       if (result != *check_p)
        {
-         String s = _ ("Failed octave check, got: ");
+         string s = _ ("Failed octave check, got: ");
          s += result.to_string ();
 
          m->origin ()->warning (s);
@@ -45,5 +45,6 @@ Relative_octave_check::relative_callback (SCM music, SCM last_pitch)
     }
 
   return Pitch (p.get_octave () + delta_oct,
-               p.get_notename (), p.get_alteration ()).smobbed_copy ();
+               p.get_notename (),
+               p.get_alteration ()).smobbed_copy ();
 }