resolve merge

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

diff --git a/lily/relative-octave-check.cc b/lily/relative-octave-check.cc
index 9fe109b0841c7bae7d099c3935683cbe552c9f7e..bb597f97cb5b2da65cae30a0a4fed57c1c8c323e 100644 (file)
--- a/lily/relative-octave-check.cc
+++ b/lily/relative-octave-check.cc
@@ -1,14 +1,25 @@
 /*
-  relative-octave-check.cc -- implement Relative_octave_check
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "music.hh"
 #include "input.hh"
-#include "pitch.hh"
+#include "international.hh"
+#include "music.hh"
 
 class Relative_octave_check
 {
@@ -35,7 +46,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 +56,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 ();
 }