X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpointer-group-interface.cc;h=2720fcf91ae473ca9857b728f0d8dc53211f9686;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=73cf9fd6a91af44430c47b279bff46fbf9e9d39c;hpb=d2762a4f1add2bb04d6fc34d3c7ae03eeb7d500f;p=lilypond.git diff --git a/lily/pointer-group-interface.cc b/lily/pointer-group-interface.cc index 73cf9fd6a9..2720fcf91a 100644 --- a/lily/pointer-group-interface.cc +++ b/lily/pointer-group-interface.cc @@ -25,14 +25,14 @@ int Pointer_group_interface::count (Grob *me, SCM sym) { - Grob_array *arr = Grob_array::unsmob (me->internal_get_object (sym)); + Grob_array *arr = unsmob (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, Grob::unsmob (p)); + add_grob (me, sym, unsmob (p)); } void @@ -46,11 +46,11 @@ Grob_array * Pointer_group_interface::get_grob_array (Grob *me, SCM sym) { SCM scm_arr = me->internal_get_object (sym); - Grob_array *arr = Grob_array::unsmob (scm_arr); + Grob_array *arr = unsmob (scm_arr); if (!arr) { scm_arr = Grob_array::make_array (); - arr = Grob_array::unsmob (scm_arr); + arr = unsmob (scm_arr); me->set_object (sym, scm_arr); } return arr; @@ -88,7 +88,7 @@ static vector empty_array; vector const & ly_scm2link_array (SCM x) { - Grob_array *arr = Grob_array::unsmob (x); + Grob_array *arr = unsmob (x); return arr ? arr->array () : empty_array; } @@ -103,7 +103,7 @@ internal_extract_grob_array (Grob const *elt, SCM symbol) vector internal_extract_item_array (Grob const *elt, SCM symbol) { - Grob_array *arr = Grob_array::unsmob (elt->internal_get_object (symbol)); + Grob_array *arr = unsmob (elt->internal_get_object (symbol)); vector items; for (vsize i = 0; arr && i < arr->size (); i++) items.push_back (arr->item (i));