*** empty log message ***

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

diff --git a/lily/include/group-interface.hh b/lily/include/group-interface.hh
index 4d4a8c79386ff1a65a156bd8aceaf4853fcad240..228f58b6a1d18f859e96928275a8ca0519038112 100644 (file)
--- a/lily/include/group-interface.hh
+++ b/lily/include/group-interface.hh
@@ -3,18 +3,15 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #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
@@ -26,9 +23,8 @@
 struct Group_interface
 {
 public:
-  static int count (Grob*  , String);
+  static int count (Grob*, SCM);
   static void add_thing (Grob*, SCM, SCM);
-  static void add_thing (Grob*, String nm, SCM);
 };
 
 struct Pointer_group_interface : public Group_interface {
@@ -42,9 +38,9 @@ Pointer_group_interface__extract_grobs (Grob const *elt, T *, const char* name)
 {
   Link_array<T> arr;
 
-  for (SCM s = elt->get_grob_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)));
     }