X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frest-collision.hh;h=fe76e1b15c8d4c5d8d44d6967eac1e78f42a1a7c;hb=bdd3c80b32f39751ed30a89a4623ede6fe0c6df3;hp=baf03668b40b2de755b717376991de9e99a5f4c3;hpb=a8651b61fa25aee299bbc846d180a942568d6075;p=lilypond.git

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index baf03668b4..fe76e1b15c 100644
--- 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		// interface
+class Rest_collision
 {
 public:
-  Score_element *elt_l_;
-  
-  void add_column (Note_column*);
-  Rest_collision(Score_element*);
-  void set_interface ();
+  static void add_column (Grob *me, Grob *);
 
-  static Real force_shift_callback (Score_element *, Axis);
-  static SCM do_shift (Score_element*,SCM);
+  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