X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frest-collision.hh;h=79b7b8aa72876bcbbd85d77f5da2be0c1273a41b;hb=3c2f386f1385a10dafbb811be245f5a75d6b132c;hp=eac7a48a0ffe938e3636c073aa0e456812f1ddb4;hpb=fbb6d20e9f58d691ffe845284cbb4d8bacf9ca60;p=lilypond.git

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index eac7a48a0f..79b7b8aa72 100644
--- a/lily/include/rest-collision.hh
+++ b/lily/include/rest-collision.hh
@@ -11,15 +11,15 @@
 #define REST_COLLISION_HH
 
 #include "lily-proto.hh"
-#include "item.hh"
+#include "lily-guile.hh"
 
-class Rest_collision : public Item {
+class Rest_collision		// interface
+{
 public:
-  void add_column (Note_column*);
-  Interval rest_dim () const;
-    
-  Rest_collision();
-protected:
-  virtual void before_line_breaking ();
+  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);
 };
 #endif // REST_COLLISION_HH