* The grand 2005-2006 replace.

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

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index 23ba1a6963834b2d42124545a9727c78ca835e76..fe76e1b15c8d4c5d8d44d6967eac1e78f42a1a7c 100644 (file)
--- a/lily/include/rest-collision.hh
+++ b/lily/include/rest-collision.hh
@@ -3,26 +3,24 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef REST_COLLISION_HH
 #define REST_COLLISION_HH
 
 #include "lily-proto.hh"
 #include "lily-guile.hh"
 
-
-
-
 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*);
-  DECLARE_SCHEME_CALLBACK(force_shift_callback, (SCM element, SCM 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));
+  DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM element));
+  DECLARE_SCHEME_CALLBACK (force_shift_callback_rest, (SCM element, SCM off));
+  static SCM do_shift (Grob *);
 };
 #endif // REST_COLLISION_HH