Nitpick run.

[lilypond.git] / lily / hara-kiri-group-spanner.cc

diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc
index 22975589cbe2df8aad1482ac6f0da63da81c4b1e..28043337ff6e5b79665b1946144f703eeeea4069 100644 (file)
--- a/lily/hara-kiri-group-spanner.cc
+++ b/lily/hara-kiri-group-spanner.cc
@@ -9,6 +9,7 @@
 
 #include "hara-kiri-group-spanner.hh"
 
+#include "pointer-group-interface.hh"
 #include "axis-group-interface.hh"
 #include "spanner.hh"
 #include "warn.hh"
@@ -30,17 +31,17 @@ void
 Hara_kiri_group_spanner::consider_suicide (Grob *me)
 {
   Spanner *sp = dynamic_cast<Spanner *> (me);
-  SCM worth = me->get_property ("items-worth-living");
-  if (scm_is_pair (worth))
+
+  extract_grob_set (me, "items-worth-living", worth);
+  if (worth.size ())
     return;
 
   if (!to_boolean (me->get_property ("remove-first"))
       && broken_spanner_index (sp) == 0)
-    {
-      return;
-    }
+    return;
 
-  Link_array<Grob> childs = Axis_group_interface::get_children (me);
+  Link_array<Grob> childs;
+  Axis_group_interface::get_children (me, &childs);
   for (int i = 0; i < childs.size (); i++)
     childs[i]->suicide ();
 
@@ -60,10 +61,10 @@ Hara_kiri_group_spanner::force_hara_kiri_callback (SCM element_smob, SCM axis)
 {
   Grob *me = unsmob_grob (element_smob);
   (void) axis;
-  
+
   assert (scm_to_int (axis) == Y_AXIS);
   consider_suicide (me);
-  return scm_make_real (0.0);
+  return scm_from_double (0.0);
 }
 
 MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, force_hara_kiri_in_parent_callback, 2);
@@ -74,7 +75,7 @@ Hara_kiri_group_spanner::force_hara_kiri_in_parent_callback (SCM element_smob, S
   Axis a = (Axis) scm_to_int (axis);
   assert (a == Y_AXIS);
   force_hara_kiri_callback (daughter->get_parent (a)->self_scm (), axis);
-  return scm_make_real (0.0);
+  return scm_from_double (0.0);
 }
 
 void