X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fgrob-array.hh;h=ac4ba3e0c94933c95ac48c586271583a1176dc7a;hb=5f2a9e631fb2415fe1c97d372243de90b6807917;hp=99a0dcd4048dc07262077795f9f8d3e1bbf05539;hpb=586d833b4fb7a336524eb0929d693095a802fa26;p=lilypond.git

diff --git a/lily/include/grob-array.hh b/lily/include/grob-array.hh
index 99a0dcd404..ac4ba3e0c9 100644
--- a/lily/include/grob-array.hh
+++ b/lily/include/grob-array.hh
@@ -11,11 +11,11 @@
 
 #include "lily-proto.hh"
 #include "smobs.hh"
-#include "parray.hh"
+#include "std-vector.hh"
 
 class Grob_array
 {
-  Link_array<Grob> grobs_;
+  vector<Grob*> grobs_;
   bool ordered_;
 
   DECLARE_SIMPLE_SMOBS (Grob_array,);
@@ -29,17 +29,18 @@ public:
   Grob *grob (vsize i) { return grobs_.at (i); }
   vsize size () const { return grobs_.size (); }
   bool empty () const;
+  void remove_duplicates ();
   void clear ();
   void add (Grob *x) { grobs_.push_back (x); }
-  void set_array (Link_array<Grob> const &src);
-  Link_array<Grob> &array_reference ();
-  Link_array<Grob> const &array () const;
+  void set_array (vector<Grob*> const &src);
+  vector<Grob*> &array_reference ();
+  vector<Grob*> const &array () const;
   static SCM make_array ();
 };
 
 DECLARE_UNSMOB (Grob_array, grob_array);
 
-Link_array<Grob> const &ly_scm2link_array (SCM x);
+vector<Grob*> const &ly_scm2link_array (SCM x);
 SCM grob_list_to_grob_array (SCM lst);
 
 #endif /* GROB_ARRAY_HH */