Merge with master

[lilypond.git] / lily / include / melody-spanner.hh

diff --git a/lily/include/melody-spanner.hh b/lily/include/melody-spanner.hh
index 42762c0a6fe0fdd9b1d83e20b3576f511b1509cc..7f20f8a343946136c7ac1156ff5e8c0c3ad86bb7 100644 (file)
--- a/lily/include/melody-spanner.hh
+++ b/lily/include/melody-spanner.hh
@@ -3,20 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
 #ifndef MELODY_SPANNER_HH
 #define MELODY_SPANNER_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
+#include "grob-interface.hh"
 
 class Melody_spanner
 {
 public:
-  static bool has_interface (Grob*);
+  DECLARE_GROB_INTERFACE();
   static void add_stem (Grob*, Grob*);
   DECLARE_SCHEME_CALLBACK(calc_neutral_stem_direction, (SCM));
 };