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

[lilypond.git] / lily / include / breathing-sign.hh

diff --git a/lily/include/breathing-sign.hh b/lily/include/breathing-sign.hh
index acff1ea3cbbc6fffc06dbaaeb096a7969ba4af05..810421837266251d9cbdbef62d2bfad551abfc0e 100644 (file)
--- a/lily/include/breathing-sign.hh
+++ b/lily/include/breathing-sign.hh
@@ -1,7 +1,7 @@
 /*
   breathing-sign.hh
 
-  Copyright (c) 1999--2005 Michael Krause
+  Copyright (c) 1999--2008 Michael Krause
 
   written for the GNU LilyPond music typesetter
 */
@@ -9,7 +9,8 @@
 #ifndef BREATHING_SIGN_HH
 #define BREATHING_SIGN_HH
 
-#include "lily-guile.hh"
+#include "grob-interface.hh"
+#include "lily-proto.hh"
 
 class Grob;
 
@@ -26,9 +27,9 @@ public:
   DECLARE_SCHEME_CALLBACK (divisio_maior, (SCM));
   DECLARE_SCHEME_CALLBACK (divisio_maxima, (SCM));
   DECLARE_SCHEME_CALLBACK (finalis, (SCM));
-  DECLARE_SCHEME_CALLBACK (offset_callback, (SCM element, SCM axis));
+  DECLARE_SCHEME_CALLBACK (offset_callback, (SCM element));
 
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
 };
 
 #endif // BREATHING_SIGN_HH