Run grand replace for 2015.

[lilypond.git] / lily / grob-array.cc

diff --git a/lily/grob-array.cc b/lily/grob-array.cc
index 78ee5eff006986abb095505837fe245e8c02800e..2747e0d77fb052e66339263500d21cd9996a90a4 100644 (file)
--- 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--2014 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,6 @@
 #include "item.hh"
 #include "spanner.hh"
 
-#include "ly-smobs.icc"
 
 Item *
 Grob_array::item (vsize i)
@@ -53,27 +52,22 @@ Grob_array::array () const
 }
 
 SCM
-Grob_array::mark_smob (SCM s)
+Grob_array::mark_smob ()
 {
-  (void) s;
-
 #if 0  /* see System::derived_mark () const */
-  Grob_array *ga = Grob_array::unsmob (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);
@@ -113,10 +107,8 @@ 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)