use classnames for interface naming; remove inclusion of

[lilypond.git] / lily / include / note-collision.hh

diff --git a/lily/include/note-collision.hh b/lily/include/note-collision.hh
index 11f578ce8152da85c0abe7727b51494937905d97..20de1ca362b4ec5bd3849b80fbdf099067e36d0e 100644 (file)
--- a/lily/include/note-collision.hh
+++ b/lily/include/note-collision.hh
@@ -12,6 +12,8 @@
 #include "lily-proto.hh"
 #include "lily-guile.hh"
 #include "std-vector.hh"
+#include "grob-interface.hh"
+
 
 /**
    Resolve conflicts between various Note_columns (chords).
@@ -32,6 +34,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