X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-pitch-tuple.cc;h=62ede1af08f6326d01948e7dd95a7501aab03907;hb=0fcd8c283c45644a92d2308f1cd0d82a1e63380b;hp=0fa7d34b3152b376c68e09f3d536994c2c16b59a;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git

diff --git a/lily/grob-pitch-tuple.cc b/lily/grob-pitch-tuple.cc
index 0fa7d34b31..62ede1af08 100644
--- 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--2005  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 
- */
 #include "grob-pitch-tuple.hh"
-#include "pitch.hh"
-#include "musical-request.hh"
 
+#include "event.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_l_ =0;
+  head_ = 0;
   end_ = 0;
 }
 
-Grob_pitch_tuple::Grob_pitch_tuple (Grob *h, Melodic_req*m, Moment mom)
+Grob_pitch_tuple::Grob_pitch_tuple (Grob *h, Music *m, Moment mom)
 {
-  head_l_ = h;
-  pitch_ = *unsmob_pitch (m->get_mus_property ("pitch"));
+  head_ = h;
+  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_);
 }