2003 -> 2004

[lilypond.git] / lily / include / rest-collision.hh

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index 79b7b8aa72876bcbbd85d77f5da2be0c1273a41b..bf14845c4dc0310d3a8a4c5332e3db7cc865531f 100644 (file)
--- a/lily/include/rest-collision.hh
+++ b/lily/include/rest-collision.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -13,13 +13,16 @@
 #include "lily-proto.hh"
 #include "lily-guile.hh"
 
-class Rest_collision           // interface
+
+
+
+class Rest_collision
 {
 public:
-  static void add_column (Score_element*me,Score_element*);
-  static void set_interface (Score_element*me);
-  static bool has_interface (Score_element*);
-  static Real force_shift_callback (Score_element *, Axis);
-  static SCM do_shift (Score_element*,SCM);
+  static void add_column (Grob*me,Grob*);
+  
+  static bool has_interface (Grob*);
+  DECLARE_SCHEME_CALLBACK (force_shift_callback, (SCM element, SCM axis));
+  static SCM do_shift (Grob*);
 };
 #endif // REST_COLLISION_HH