* lily/object-key-dumper-scheme.cc: new file.

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

diff --git a/lily/include/group-interface.hh b/lily/include/group-interface.hh
index 55519b0123a6e8dc37d0d6f921792a5869a7e475..6d544f27ee6ed398464a2e096d510530853b77ce 100644 (file)
--- a/lily/include/group-interface.hh
+++ b/lily/include/group-interface.hh
@@ -10,11 +10,8 @@
 #ifndef GROUP_INTERFACE_HH
 #define GROUP_INTERFACE_HH
 
-#include "lily-proto.hh"
-#include "string.hh"
-#include "lily-guile.hh"
-
 #include "grob.hh"
+#include "string.hh"
 /**
    Look at Score element ELT as thing which has a list property called
    NAME_. Normally the list would contain Grobs, but
@@ -42,9 +39,9 @@ Pointer_group_interface__extract_grobs (Grob const *elt, T *, const char* name)
 {
   Link_array<T> arr;
 
-  for (SCM s = elt->get_property (name); gh_pair_p (s); s = gh_cdr (s))
+  for (SCM s = elt->get_property (name); scm_is_pair (s); s = scm_cdr (s))
     {
-      SCM e = gh_car (s);
+      SCM e = scm_car (s);
       arr.push (dynamic_cast<T*> (unsmob_grob (e)));
     }