tie-details.hh

[lilypond.git] / lily / system.cc

diff --git a/lily/system.cc b/lily/system.cc
index 423fbac24f6f4a167e9816819aa2d14c05358df0..ddf5c613cd3e33cd58dc3aca97f6a3c083e68ed1 100644 (file)
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -106,7 +106,7 @@ System::derived_mark () const
 }
 
 static void
-fixup_refpoints (Link_array<Grob> const &grobs)
+fixup_refpoints (vector<Grob*> const &grobs)
 {
   for (vsize i = grobs.size (); i--;)
     grobs[i]->fixup_refpoint ();
@@ -200,14 +200,14 @@ System::get_paper_systems ()
 }
 
 void
-System::break_into_pieces (std::vector<Column_x_positions> const &breaking)
+System::break_into_pieces (vector<Column_x_positions> const &breaking)
 {
   for (vsize i = 0; i < breaking.size (); i++)
     {
       System *system = dynamic_cast<System *> (clone (i));
       system->rank_ = i;
 
-      Link_array<Grob> c (breaking[i].cols_);
+      vector<Grob*> c (breaking[i].cols_);
       pscore_->typeset_system (system);
 
       system->set_bound (LEFT, c[0]);
@@ -317,9 +317,9 @@ System::post_processing ()
      This might seem inefficient, but Stencils are cached per grob
      anyway. */
 
-  Link_array<Grob> all_elts_sorted (all_elements_->array ());
-  all_elts_sorted.default_sort ();
-  all_elts_sorted.uniq ();
+  vector<Grob*> all_elts_sorted (all_elements_->array ());
+  vector_sort (all_elts_sorted, default_compare);
+  uniq (all_elts_sorted);
   this->get_stencil ();
   for (vsize i = all_elts_sorted.size (); i--;)
     {
@@ -399,10 +399,10 @@ System::get_paper_system ()
   return pl->unprotect ();
 }
 
-Link_array<Item>
+vector<Item*>
 System::broken_col_range (Item const *left, Item const *right) const
 {
-  Link_array<Item> ret;
+  vector<Item*> ret;
 
   left = left->get_column ();
   right = right->get_column ();
@@ -430,7 +430,7 @@ System::broken_col_range (Item const *left, Item const *right) const
 
 /** Return all columns, but filter out any unused columns , since they might
     disrupt the spacing problem. */
-Link_array<Grob>
+vector<Grob*>
 System::columns () const
 {
   extract_grob_set (this, "columns", ro_columns);
@@ -443,7 +443,7 @@ System::columns () const
        break;
     }
 
-  Link_array<Grob> columns;
+  vector<Grob*> columns;
   for (int i = 0; i <= last_breakable; i++)
     {
       if (Paper_column::is_used (ro_columns[i]))