X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-array.cc;h=f267ce5a440729fe97f8d959236b746bfbb517f2;hb=90d3233da87b372e02690978f89b2add3863fba6;hp=4084e0fa7502be8228136f73342cf12dc22406db;hpb=8c97b5bb732d4623a3588add0c3c4d3c2510f5bf;p=lilypond.git

diff --git a/lily/grob-array.cc b/lily/grob-array.cc
index 4084e0fa75..f267ce5a44 100644
--- a/lily/grob-array.cc
+++ b/lily/grob-array.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 #include "item.hh"
 #include "spanner.hh"
 
-#include "ly-smobs.icc"
+ADD_SMOB_INIT (Grob_array);
 
 Item *
 Grob_array::item (vsize i)
@@ -40,40 +40,35 @@ Grob_array::Grob_array ()
   ordered_ = true;
 }
 
-vector<Grob*> &
+vector<Grob *> &
 Grob_array::array_reference ()
 {
   return grobs_;
 }
 
-vector<Grob*> const &
+vector<Grob *> const &
 Grob_array::array () const
 {
   return grobs_;
 }
 
 SCM
-Grob_array::mark_smob (SCM s)
+Grob_array::mark_smob ()
 {
-  (void) s;
-
 #if 0  /* see System::derived_mark () const */
-  Grob_array *ga = unsmob_grob_array (s);
-  for (vsize i = 0; i < ga->grobs_.size (); i++)
-    scm_gc_mark (ga->grobs_[i]->self_scm ());
+  for (vsize i = 0; i < grobs_.size (); i++)
+    scm_gc_mark (grobs_[i]->self_scm ());
 #endif
   return SCM_UNDEFINED;
 }
 
 int
-Grob_array::print_smob (SCM arr, SCM port, scm_print_state*)
+Grob_array::print_smob (SCM port, scm_print_state *)
 {
   scm_puts ("#<Grob_array", port);
-
-  Grob_array *grob_arr = unsmob (arr);
-  for (vsize i = 0; i < grob_arr->size (); i++)
+  for (vsize i = 0; i < size (); i++)
     {
-      scm_display (grob_arr->grob (i)->self_scm (), port);
+      scm_display (grob (i)->self_scm (), port);
       scm_puts (" ", port);
     }
   scm_puts (">", port);
@@ -97,9 +92,8 @@ void
 Grob_array::remove_duplicates ()
 {
   assert (!ordered_);
-  
-  vector_sort (grobs_, less<Grob*> ());
-  ::uniq (grobs_);
+
+  uniquify (grobs_);
 }
 
 bool
@@ -109,23 +103,21 @@ Grob_array::empty () const
 }
 
 void
-Grob_array::set_array (vector<Grob*> const &src)
+Grob_array::set_array (vector<Grob *> const &src)
 {
   grobs_ = src;
 }
 
-IMPLEMENT_SIMPLE_SMOBS (Grob_array);
-IMPLEMENT_TYPE_P (Grob_array, "ly:grob-array?");
+const char Grob_array::type_p_name_[] = "ly:grob-array?";
 
-IMPLEMENT_DEFAULT_EQUAL_P (Grob_array);
 
 SCM
 grob_list_to_grob_array (SCM lst)
 {
   SCM arr_scm = Grob_array::make_array ();
-  Grob_array *ga = unsmob_grob_array (arr_scm);
+  Grob_array *ga = Grob_array::unsmob (arr_scm);
   for (SCM s = lst; scm_is_pair (s); s = scm_cdr (s))
-    ga->add (unsmob_grob (scm_car (s)));
+    ga->add (Grob::unsmob (scm_car (s)));
   return arr_scm;
 }