X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-name-engraver.cc;h=13d3746faf05f7a2044c995bd5f32f40c86a583e;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=76bdd5677f101ff5c7a289d38a12f07c4b0897f1;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git

diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index 76bdd5677f..13d3746faf 100644
--- a/lily/note-name-engraver.cc
+++ b/lily/note-name-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2015 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
@@ -29,8 +29,7 @@ class Note_name_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS (Note_name_engraver);
 
-  vector<Stream_event*> events_;
-  vector<Item*> texts_;
+  vector<Stream_event *> events_;
   DECLARE_TRANSLATOR_LISTENER (note);
   void process_music ();
   void stop_translation_timestep ();
@@ -50,11 +49,11 @@ Note_name_engraver::process_music ()
   for (vsize i = 0; i < events_.size (); i++)
     {
       if (i)
-	s += " ";
-      Pitch p = *unsmob_pitch (events_[i]->get_property ("pitch"));
+        s += " ";
+      Pitch p = *Pitch::unsmob (events_[i]->get_property ("pitch"));
 
       if (!to_boolean (get_property ("printOctaveNames")))
-	p = Pitch (-1, p.get_notename (), p.get_alteration ());
+        p = Pitch (-1, p.get_notename (), p.get_alteration ());
 
       s += p.to_string ();
     }
@@ -62,14 +61,12 @@ Note_name_engraver::process_music ()
     {
       Item *t = make_item ("NoteName", events_[0]->self_scm ());
       t->set_property ("text", ly_string2scm (s));
-      texts_.push_back (t);
     }
 }
 
 void
 Note_name_engraver::stop_translation_timestep ()
 {
-  texts_.clear ();
   events_.clear ();
 }
 
@@ -78,15 +75,15 @@ Note_name_engraver::Note_name_engraver ()
 }
 
 ADD_TRANSLATOR (Note_name_engraver,
-		/* doc */
-		"Print pitches as words.",
+                /* doc */
+                "Print pitches as words.",
 
-		/* create */
-		"NoteName ",
+                /* create */
+                "NoteName ",
 
-		/* read */
-		"printOctaveNames ",
+                /* read */
+                "printOctaveNames ",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );