Run grand replace for 2015.

[lilypond.git] / lily / include / pointer-group-interface.hh

diff --git a/lily/include/pointer-group-interface.hh b/lily/include/pointer-group-interface.hh
index 0565b83c1f568cdbad9d9cccf55b44a4b71c7aa7..26ff640610a187ada8b3bd1125e4466ac53b09fd 100644 (file)
--- a/lily/include/pointer-group-interface.hh
+++ b/lily/include/pointer-group-interface.hh
@@ -1,45 +1,55 @@
 /*
-  pointer-group-interface.hh -- declare Pointer_group_interface
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef POINTER_GROUP_INTERFACE_HH
 #define POINTER_GROUP_INTERFACE_HH
 
-#include "parray.hh"
+#include "std-vector.hh"
 #include "lily-proto.hh"
 #include "lily-guile.hh"
 
-
 struct Pointer_group_interface
 {
 public:
   static int count (Grob *, SCM);
   static void add_grob (Grob *, SCM nm, Grob *e);
   static void add_grob (Grob *, SCM nm, SCM x);
+  static void add_unordered_grob (Grob *, SCM nm, Grob *);
+  static void set_ordered (Grob *, SCM, bool);
+  static Grob_array *get_grob_array (Grob *, SCM);
+  static Grob *find_grob (Grob *, SCM, bool (*pred) (Grob *));
 };
 
-Link_array<Grob> const &internal_extract_grob_array (Grob const *elt, SCM symbol);
-Link_array<Item> internal_extract_item_array (Grob const *elt, SCM symbol);
-
-#define extract_grob_array(x,prop) internal_extract_grob_array (x, ly_symbol2scm (prop))
-#define extract_item_array(x,prop) internal_extract_item_array (x, ly_symbol2scm (prop))
+vector<Grob *> const &internal_extract_grob_array (Grob const *elt, SCM symbol);
+vector<Item *> internal_extract_item_array (Grob const *elt, SCM symbol);
 
+#define extract_grob_array(x, prop) internal_extract_grob_array (x, ly_symbol2scm (prop))
+#define extract_item_array(x, prop) internal_extract_item_array (x, ly_symbol2scm (prop))
 
 /*
   This is dubious coding style, but lets not risk that we change the
   representation of grob sets again.
- */
-#define extract_grob_set(grob,prop,set) \
-  Link_array<Grob> const &set (internal_extract_grob_array (grob, ly_symbol2scm (prop))) 
-#define extract_item_set(grob,prop,set) \
-  Link_array<Item> set (internal_extract_item_array (grob, ly_symbol2scm (prop)))
-
-
+*/
+#define extract_grob_set(grob, prop, set)                               \
+  vector<Grob*> const &set (internal_extract_grob_array (grob, ly_symbol2scm (prop)))
+#define extract_item_set(grob, prop, set)                               \
+  vector<Item*> set (internal_extract_item_array (grob, ly_symbol2scm (prop)))
 
 #endif /* POINTER_GROUP_INTERFACE_HH */