X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frest-collision.hh;h=1d25a2cda56a3c7726dffc33f3247274559bbc99;hb=2cff0a95aeaa6c3c7b0b9b49daa9e8f2e41124d9;hp=e500c2aa12f39f9e84e057c0ad94950083756656;hpb=01d84d552854fb399bd0e819502c6c2db2a1b214;p=lilypond.git

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index e500c2aa12..1d25a2cda5 100644
--- a/lily/include/rest-collision.hh
+++ b/lily/include/rest-collision.hh
@@ -3,23 +3,24 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef REST_COLLISION_HH
 #define REST_COLLISION_HH
 
+#include "grob-interface.hh"
 #include "lily-proto.hh"
-#include "item.hh"
 
-class Rest_collision : public Item {
+class Rest_collision
+{
 public:
-  void add_column (Note_column*);
-  Interval rest_dim () const;
-    
-  Rest_collision();
-protected:
-  virtual void do_pre_processing();
+  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