X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpointer-group-interface.cc;h=2720fcf91ae473ca9857b728f0d8dc53211f9686;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=78c4166d73042557a3c0992bdbdc8312e0e1cca3;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git

diff --git a/lily/pointer-group-interface.cc b/lily/pointer-group-interface.cc
index 78c4166d73..2720fcf91a 100644
--- a/lily/pointer-group-interface.cc
+++ b/lily/pointer-group-interface.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2011 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
@@ -25,14 +25,14 @@
 int
 Pointer_group_interface::count (Grob *me, SCM sym)
 {
-  Grob_array *arr = unsmob_grob_array (me->internal_get_object (sym));
+  Grob_array *arr = unsmob<Grob_array> (me->internal_get_object (sym));
   return arr ? arr->size () : 0;
 }
 
 void
 Pointer_group_interface::add_grob (Grob *me, SCM sym, SCM p)
 {
-  add_grob (me, sym, unsmob_grob (p));
+  add_grob (me, sym, unsmob<Grob> (p));
 }
 
 void
@@ -46,18 +46,18 @@ Grob_array *
 Pointer_group_interface::get_grob_array (Grob *me, SCM sym)
 {
   SCM scm_arr = me->internal_get_object (sym);
-  Grob_array *arr = unsmob_grob_array (scm_arr);
+  Grob_array *arr = unsmob<Grob_array> (scm_arr);
   if (!arr)
     {
       scm_arr = Grob_array::make_array ();
-      arr = unsmob_grob_array (scm_arr);
+      arr = unsmob<Grob_array> (scm_arr);
       me->set_object (sym, scm_arr);
     }
   return arr;
 }
 
 Grob *
-Pointer_group_interface::find_grob (Grob *me, SCM sym, bool (*pred) (Grob*))
+Pointer_group_interface::find_grob (Grob *me, SCM sym, bool (*pred) (Grob *))
 {
   Grob_array *arr = get_grob_array (me, sym);
 
@@ -83,28 +83,28 @@ Pointer_group_interface::add_unordered_grob (Grob *me, SCM sym, Grob *p)
   arr->set_ordered (false);
 }
 
-static vector<Grob*> empty_array;
+static vector<Grob *> empty_array;
 
-vector<Grob*> const &
+vector<Grob *> const &
 ly_scm2link_array (SCM x)
 {
-  Grob_array *arr = unsmob_grob_array (x);
+  Grob_array *arr = unsmob<Grob_array> (x);
   return arr ? arr->array () : empty_array;
 }
 
-vector<Grob*> const &
+vector<Grob *> const &
 internal_extract_grob_array (Grob const *elt, SCM symbol)
 {
   return elt
-    ? ly_scm2link_array (elt->internal_get_object (symbol))
-    : empty_array;
+         ? ly_scm2link_array (elt->internal_get_object (symbol))
+         : empty_array;
 }
 
-vector<Item*>
+vector<Item *>
 internal_extract_item_array (Grob const *elt, SCM symbol)
 {
-  Grob_array *arr = unsmob_grob_array (elt->internal_get_object (symbol));
-  vector<Item*> items;
+  Grob_array *arr = unsmob<Grob_array> (elt->internal_get_object (symbol));
+  vector<Item *> items;
   for (vsize i = 0; arr && i < arr->size (); i++)
     items.push_back (arr->item (i));