Run `make grand-replace'.

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

diff --git a/lily/include/note-collision.hh b/lily/include/note-collision.hh
index 70be17119ccf81ffe1ed5d0af4b12448beb2916e..0b2f29ebd931e6cd6d91947a91ba252651b9eb12 100644 (file)
--- 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).
@@ -26,12 +27,12 @@
 class Note_collision_interface
 {
 public:
-  static SCM automatic_shift (Grob *, Drul_array<Link_array__Grob_ >);
+  static SCM automatic_shift (Grob *, Drul_array<vector<Grob*> >);
   static SCM forced_shift (Grob *);
 
-  static Drul_array<Link_array__Grob_ > get_clash_groups (Grob *me);
+  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