* The grand 2005-2006 replace.

[lilypond.git] / lily / grob-pitch-tuple.cc

diff --git a/lily/grob-pitch-tuple.cc b/lily/grob-pitch-tuple.cc
index f55c4f4b7f5425e8e048074baf75173cf4fc5625..eb72a367e107d20270ed31a647e34fa64b7e368a 100644 (file)
--- a/lily/grob-pitch-tuple.cc
+++ b/lily/grob-pitch-tuple.cc
@@ -1,50 +1,46 @@
-/*   
-grob-pitch-tuple.cc --  implement Grob_pitch_tuple
+/*
+  grob-pitch-tuple.cc -- implement Grob_pitch_tuple
 
-source file of the GNU LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
-(c) 2001--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2006  Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
- */
 #include "grob-pitch-tuple.hh"
-#include "pitch.hh"
-#include "request.hh"
 
+#include "music.hh"
 
 int compare (Grob_pitch_tuple const &a, Grob_pitch_tuple const &b)
 {
-  return Grob_pitch_tuple::time_compare (a,b);
+  return Grob_pitch_tuple::time_compare (a, b);
 }
 
-
-
-
 Grob_pitch_tuple::Grob_pitch_tuple ()
 {
-  head_ =0;
+  head_ = 0;
   end_ = 0;
 }
 
 Grob_pitch_tuple::Grob_pitch_tuple (Grob *h, Music *m, Moment mom)
 {
   head_ = h;
-  pitch_ = *unsmob_pitch (m->get_mus_property ("pitch"));
+  pitch_ = *unsmob_pitch (m->get_property ("pitch"));
   end_ = mom;
 }
 
 /*
-  signed compare, should use pitch<? 
- */
+  signed compare, should use pitch<?
+*/
 int
 Grob_pitch_tuple::pitch_compare (Grob_pitch_tuple const &h1,
-                                   Grob_pitch_tuple const &h2)
+                                Grob_pitch_tuple const &h2)
 {
   return Pitch::compare (h1.pitch_, h2.pitch_);
 }
 
 int
-Grob_pitch_tuple::time_compare (Grob_pitch_tuple const&h1,
-                                  Grob_pitch_tuple const &h2)
+Grob_pitch_tuple::time_compare (Grob_pitch_tuple const &h1,
+                               Grob_pitch_tuple const &h2)
 {
-  return Moment::compare(h1.end_,  h2.end_);
+  return Moment::compare (h1.end_, h2.end_);
 }