release: 1.5.29

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

diff --git a/lily/include/group-interface.hh b/lily/include/group-interface.hh
index fb19eec2fc8633be0e48cbecf50cbfc5cd19a22b..64476d0a0aefaabf0938f08d3585081577df6abb 100644 (file)
--- a/lily/include/group-interface.hh
+++ b/lily/include/group-interface.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -13,11 +13,11 @@
 #include "lily-proto.hh"
 #include "string.hh"
 #include "lily-guile.hh"
-#include "smobs.hh"
 
+#include "grob.hh"
 /**
    Look at Score element ELT as thing which has a list property called
-   NAME_. Normally the list would contain Score_elements, but
+   NAME_. Normally the list would contain Grobs, but
    sometimes it can be different things.
 
    todo: reename as list_interface?
@@ -26,27 +26,28 @@
 struct Group_interface
 {
 public:
-  static int count (Score_element*  , String);
-  static void add_thing (Score_element*, String nm, SCM);
+  static int count (Grob*  , String);
+  static void add_thing (Grob*, SCM, SCM);
+  static void add_thing (Grob*, String nm, SCM);
 };
 
 struct Pointer_group_interface : public Group_interface {
 public:
-  static void add_element (Score_element*, String nm, Score_element*e);
+  static void add_grob (Grob*, SCM nm, Grob*e);
 };
 /** 
   Put all score elements of ELT's property called NAME into an array,
   and return it.  */
 template<class T>
 Link_array<T>
-Pointer_group_interface__extract_elements (Score_element const *elt, T *, const char* name)
+Pointer_group_interface__extract_grobs (Grob const *elt, T *, const char* name)
 {
   Link_array<T> arr;
 
-  for (SCM s = elt->get_elt_property (name); gh_pair_p (s); s = gh_cdr (s))
+  for (SCM s = elt->get_grob_property (name); gh_pair_p (s); s = gh_cdr (s))
     {
       SCM e = gh_car (s);
-      arr.push (dynamic_cast<T*> (unsmob_element (e)));
+      arr.push (dynamic_cast<T*> (unsmob_grob (e)));
     }
 
   arr.reverse ();