Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/include/rest.hh b/lily/include/rest.hh
index 19e3abc3d4da1bf630c0225c90f7aec069f711d5..20107120b7c411bef2f4fa8bbbb4441cf04140db 100644 (file)
--- a/lily/include/rest.hh
+++ b/lily/include/rest.hh
@@ -9,7 +9,7 @@
 #ifndef REST_HH
 #define REST_HH
 
-#include "lily-guile.hh"
+#include "grob-interface.hh"
 
 class Grob;
 
@@ -17,8 +17,8 @@ class Rest
 {
 public:
   DECLARE_SCHEME_CALLBACK (y_offset_callback, (SCM));
-  static bool has_interface (Grob *);
-  static std::string glyph_name (Grob *, int, std::string, bool);
+  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);
   DECLARE_SCHEME_CALLBACK (polyphonic_offset_callback, (SCM));