X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fnote-collision.hh;h=0b2f29ebd931e6cd6d91947a91ba252651b9eb12;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=11f578ce8152da85c0abe7727b51494937905d97;hpb=31568c504806f35aac420a394c9eab07abd9faa7;p=lilypond.git

diff --git a/lily/include/note-collision.hh b/lily/include/note-collision.hh
index 11f578ce81..0b2f29ebd9 100644
--- a/lily/include/note-collision.hh
+++ b/lily/include/note-collision.hh
@@ -3,15 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef COLLISION_HH
 #define COLLISION_HH
 
-#include "lily-proto.hh"
-#include "lily-guile.hh"
 #include "std-vector.hh"
+#include "grob-interface.hh"
+#include "lily-proto.hh"
+
 
 /**
    Resolve conflicts between various Note_columns (chords).
@@ -32,6 +33,6 @@ public:
   static Drul_array<vector<Grob*> > get_clash_groups (Grob *me);
   DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM smob));
   static void add_column (Grob *me, Grob *ncol);
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
 };
 #endif // COLLISION_HH