* flower/include/pqueue.hh: Derive from std::vector.

[lilypond.git] / lily / new-fingering-engraver.cc

diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index d049e1664ab092f307075da6fd0eb1b0224aee19..496e19f93d89e103b15b89a2197a7f0af16ed20e 100644 (file)
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -47,7 +47,7 @@ class New_fingering_engraver : public Engraver
   std::vector<Finger_tuple> articulations_;
   std::vector<Finger_tuple> string_numbers_;
 
-  Link_array<Grob> heads_;
+  Link_array__Grob_ heads_;
   Grob *stem_;
 
 public:
@@ -190,8 +190,8 @@ New_fingering_engraver::position_scripts (SCM orientations,
                                          std::vector<Finger_tuple> *scripts)
 {
   for (vsize i = 0; i < scripts->size (); i++)
-    if (stem_ && to_boolean (scripts->elem (i).script_->get_property ("add-stem-support")))
-      Side_position_interface::add_support (scripts->elem (i).script_, stem_);
+    if (stem_ && to_boolean (scripts->at (i).script_->get_property ("add-stem-support")))
+      Side_position_interface::add_support (scripts->at (i).script_, stem_);
 
   /*
     This is not extremely elegant, but we have to do a little
@@ -241,19 +241,17 @@ New_fingering_engraver::position_scripts (SCM orientations,
          scripts->erase (scripts->begin ());
        }
 
-      horiz.concat (*scripts);
+      horiz.insert (horiz.end (), scripts->begin (), scripts->end ());
     }
   else if (up_p && down_p)
     {
       int center = scripts->size () / 2;
-      down.concat (std::vector<Finger_tuple> (scripts->begin (),
-                                             scripts->begin () + center));
-      up.concat (std::vector<Finger_tuple> (scripts->begin () + center,
-                                           scripts->end ()));
+      down.insert (down.end (), scripts->begin (), scripts->begin () + center);
+      up.insert (up.end (), scripts->begin () + center, scripts->end ());
     }
   else if (up_p)
     {
-      up.concat (*scripts);
+      up.insert (up.end (), scripts->begin (), scripts->end ());
       scripts->clear ();
     }
   else
@@ -263,7 +261,7 @@ New_fingering_engraver::position_scripts (SCM orientations,
          warning (_ ("no placement found for fingerings"));
          warning (_ ("placing below"));
        }
-      down.concat (*scripts);
+      down.insert (down.end (), scripts->begin (), scripts->end ());
       scripts->clear ();
     }