X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftab-note-heads-engraver.cc;h=be9fa38515c16e52348408b42d71ed2d11de8092;hb=e03b2923c10e1c33238a4f2ecf78714bf829e758;hp=2f684d833ae63bf0d7e657e069911bb2d700dbfa;hpb=4b975f3177880e16e759f67be4517f67109c2633;p=lilypond.git

diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc
index 2f684d833a..be9fa38515 100644
--- a/lily/tab-note-heads-engraver.cc
+++ b/lily/tab-note-heads-engraver.cc
@@ -3,11 +3,12 @@
 
   based on note-heads-engraver.cc, by Jean-Baptiste Lamy <jiba@tuxfamily.org>,
 
-  (c) 2002--2005
+  (c) 2002--2006
 */
 
 #include <cctype>
 #include <cstdio>
+using namespace std;
 
 #include "rhythmic-head.hh"
 #include "output-def.hh"
@@ -20,17 +21,16 @@
 #include "warn.hh"
 #include "duration.hh"
 
-
 /**
    make (guitar-like) tablature note
 */
 class Tab_note_heads_engraver : public Engraver
 {
-  Link_array<Item> notes_;
+  vector<Item*> notes_;
 
-  Link_array<Item> dots_;
-  Link_array<Music> note_events_;
-  Link_array<Music> tabstring_events_;
+  vector<Item*> dots_;
+  vector<Music*> note_events_;
+  vector<Music*> tabstring_events_;
 public:
   TRANSLATOR_DECLARATIONS (Tab_note_heads_engraver);
 
@@ -50,18 +50,16 @@ Tab_note_heads_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("note-event"))
     {
-      note_events_.push (m);
+      note_events_.push_back (m);
       return true;
     }
   else if (m->is_mus_type ("string-number-event"))
     {
-      tabstring_events_.push (m);
+      tabstring_events_.push_back (m);
       return true;
     }
   else if (m->is_mus_type ("busy-playing-event"))
-    {
-      return note_events_.size ();
-    }
+    return note_events_.size ();
 
   return false;
 }
@@ -69,8 +67,8 @@ Tab_note_heads_engraver::try_music (Music *m)
 void
 Tab_note_heads_engraver::process_music ()
 {
-  int j = 0;
-  for (int i = 0; i < note_events_.size (); i++)
+  vsize j = 0;
+  for (vsize i = 0; i < note_events_.size (); i++)
     {
       SCM stringTunings = get_property ("stringTunings");
       int number_of_strings = ((int) ly_length (stringTunings));
@@ -93,7 +91,7 @@ Tab_note_heads_engraver::process_music ()
       if (!tabstring_event && j < tabstring_events_.size ())
 	{
 	  tabstring_event = tabstring_events_[j];
-	  if (j +1 < tabstring_events_.size ())
+	  if (j + 1 < tabstring_events_.size ())
 	    j++;
 	}
 
@@ -125,7 +123,7 @@ Tab_note_heads_engraver::process_music ()
 
 	  d->set_parent (note, Y_AXIS);
 
-	  dots_.push (d);
+	  dots_.push_back (d);
 	}
 
       SCM scm_pitch = event->get_property ("pitch");
@@ -152,7 +150,7 @@ Tab_note_heads_engraver::process_music ()
       note->set_property ("text", text);
 
       note->set_property ("staff-position", scm_from_int (pos));
-      notes_.push (note);
+      notes_.push_back (note);
     }
 }
 
@@ -168,9 +166,9 @@ Tab_note_heads_engraver::stop_translation_timestep ()
 #include "translator.icc"
 
 ADD_TRANSLATOR (Tab_note_heads_engraver,
-		/* descr */ "Generate one or more tablature noteheads from Music of type NoteEvent.",
-		/* creats*/ "TabNoteHead Dots",
-		/* accepts */ "note-event string-number-event busy-playing-event",
-		/* reads */ "middleCPosition stringTunings minimumFret tablatureFormat highStringOne stringOneTopmost",
+		/* doc */ "Generate one or more tablature noteheads from Music of type NoteEvent.",
+		/* create */ "TabNoteHead Dots",
+		/* accept */ "note-event string-number-event busy-playing-event",
+		/* read */ "middleCPosition stringTunings minimumFret tablatureFormat highStringOne stringOneTopmost",
 		/* write */ "");