Run grand replace for 2015.

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

diff --git a/lily/include/grob-array.hh b/lily/include/grob-array.hh
index cb2d2f56c1ff682a375bc82a32def1e0ae8bf6e7..87cb19e23d1a23ec71b4317a9911ce3c688f5ea6 100644 (file)
--- a/lily/include/grob-array.hh
+++ b/lily/include/grob-array.hh
@@ -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
@@ -24,12 +24,16 @@
 #include "smobs.hh"
 #include "std-vector.hh"
 
-class Grob_array
+class Grob_array : public Simple_smob<Grob_array>
 {
-  vector<Grob*> grobs_;
+public:
+  int print_smob (SCM, scm_print_state *);
+  SCM mark_smob ();
+  static const char type_p_name_[];
+private:
+  vector<Grob *> grobs_;
   bool ordered_;
 
-  DECLARE_SIMPLE_SMOBS (Grob_array);
 
   Grob_array ();
 public:
@@ -43,16 +47,15 @@ public:
   void remove_duplicates ();
   void clear ();
   void add (Grob *x) { grobs_.push_back (x); }
-  void set_array (vector<Grob*> const &src);
-  vector<Grob*> &array_reference ();
-  vector<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);
 
-vector<Grob*> const &ly_scm2link_array (SCM x);
+vector<Grob *> const &ly_scm2link_array (SCM x);
 SCM grob_list_to_grob_array (SCM lst);
+SCM grob_array_to_list (Grob_array *array);
 
 #endif /* GROB_ARRAY_HH */
-