Run `make grand-replace'.

[lilypond.git] / lily / include / grob-array.hh

diff --git a/lily/include/grob-array.hh b/lily/include/grob-array.hh
index 975301f7232b5f3e4f11d87be7727b4f1e4545e0..80b6b373cddddc0c0198ec6d53074933fca83c86 100644 (file)
--- a/lily/include/grob-array.hh
+++ b/lily/include/grob-array.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef GROB_ARRAY_HH
@@ -11,14 +11,14 @@
 
 #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,);
+  DECLARE_SIMPLE_SMOBS (Grob_array);
 
   Grob_array ();
 public:
@@ -26,20 +26,21 @@ public:
   void set_ordered (bool b) { ordered_ = b; }
   Item *item (vsize i);
   Spanner *spanner (vsize i);
-  Grob *grob (vsize i) { return grobs_.elem (i); }
+  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 */