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

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

diff --git a/lily/include/note-collision.hh b/lily/include/note-collision.hh
index 1b1bd536f65a59016126d4d2ce5f1673f218eb0a..7500ea45e980c646f54fdaa3a5cebebcce714c59 100644 (file)
--- a/lily/include/note-collision.hh
+++ b/lily/include/note-collision.hh
@@ -9,9 +9,10 @@
 #ifndef COLLISION_HH
 #define COLLISION_HH
 
+#include "std-vector.hh"
+#include "grob-interface.hh"
 #include "lily-proto.hh"
-#include "lily-guile.hh"
-#include "parray.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