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

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

diff --git a/lily/include/hairpin.hh b/lily/include/hairpin.hh
index 73570c73704d6fd5facccce6cf079f908944e8a5..0d7c92ff23d6f9c5f3af55ec81825679fd27516c 100644 (file)
--- a/lily/include/hairpin.hh
+++ b/lily/include/hairpin.hh
@@ -9,17 +9,16 @@
 #ifndef HAIRPIN_HH
 #define HAIRPIN_HH
 
-#include "lily-guile.hh"
+#include "grob-interface.hh"
 #include "lily-proto.hh"
-/**
-   The hairpin symbol.
-*/
+
 struct Hairpin
 {
 public:
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
-  static bool has_interface (Grob *);
+  static void consider_suicide (Spanner*);
+  DECLARE_GROB_INTERFACE();
 };
 
 #endif // HAIRPIN_HH