X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frest.hh;h=644aa1450c7bf904d203f444424d82f3eef7b24f;hb=fa2596b6ec273e7d82907f97acf0c65559b3c1b4;hp=053e3960c0d1dcb745ceb77bdc546dd8b5768fe3;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git

diff --git a/lily/include/rest.hh b/lily/include/rest.hh
index 053e3960c0..644aa1450c 100644
--- a/lily/include/rest.hh
+++ b/lily/include/rest.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -29,12 +29,12 @@ class Rest
 public:
   DECLARE_SCHEME_CALLBACK (y_offset_callback, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
-  DECLARE_GROB_INTERFACE();
-  static string glyph_name (Grob *, int, string, bool);
-  static SCM brew_internal_stencil (Grob*, bool);
-  static SCM generic_extent_callback (Grob*, Axis);
+  static string glyph_name (Grob *, int durlog, const string &style, bool, Real);
+  static Real staff_position_internal (Grob *, int /* duration_log */,
+                                       int /* dir */);
+  static SCM brew_internal_stencil (Grob *, bool);
+  static SCM generic_extent_callback (Grob *, Axis);
   static void translate (Grob *me, int dy);
-  DECLARE_SCHEME_CALLBACK (polyphonic_offset_callback, (SCM));
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (width, (SCM));
   DECLARE_SCHEME_CALLBACK (height, (SCM));