* lily/rest.cc (y_offset_callback): merge function of 3 callbacks.

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

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index a9a80eb20b6ff23996e736025d080d81ba170b0b..5295fd435bae2c125295507fe7b0c27936b40d94 100644 (file)
--- a/lily/include/rest-collision.hh
+++ b/lily/include/rest-collision.hh
@@ -18,9 +18,9 @@ public:
   static void add_column (Grob *me, Grob *);
 
   static bool has_interface (Grob *);
-  DECLARE_SCHEME_CALLBACK (force_shift_callback, (SCM element, SCM axis));
+  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 axis));
+  DECLARE_SCHEME_CALLBACK (force_shift_callback_rest, (SCM element));
   static SCM do_shift (Grob *);
 };
 #endif // REST_COLLISION_HH