X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frest-collision.hh;h=bf14845c4dc0310d3a8a4c5332e3db7cc865531f;hb=1c5b28defa29c019a3d2038bf4b19ed215ec2d87;hp=23ba1a6963834b2d42124545a9727c78ca835e76;hpb=d8ddee6490dd1bb4965980d3e952a390493bfffd;p=lilypond.git

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index 23ba1a6963..bf14845c4d 100644
--- a/lily/include/rest-collision.hh
+++ b/lily/include/rest-collision.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -19,10 +19,10 @@
 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, SCM axis));
+  static SCM do_shift (Grob*);
 };
 #endif // REST_COLLISION_HH