Run `make grand-replace'.

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

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index 7171c0ceb6e04c6a18e81da25e9b61214af7a19e..ce3765e65525af9bb1049249b8383a48d3a8479d 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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef REST_COLLISION_HH
 #define REST_COLLISION_HH
 
+#include "grob-interface.hh"
 #include "lily-proto.hh"
-#include "lily-guile.hh"
-
-
-
 
 class Rest_collision
 {
 public:
-  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*);
+  static void add_column (Grob *me, Grob *);
+
+  DECLARE_GROB_INTERFACE();
+  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