X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fnote-collision.hh;h=b2464067c8600a4df5ed3d6eb3817e5e9d5d162c;hb=27d3e1188a9885e72a5afbd72482617b34907f30;hp=70be17119ccf81ffe1ed5d0af4b12448beb2916e;hpb=9d4a5bbc9687aef811a60aabd9cb839412984e96;p=lilypond.git

diff --git a/lily/include/note-collision.hh b/lily/include/note-collision.hh
index 70be17119c..b2464067c8 100644
--- a/lily/include/note-collision.hh
+++ b/lily/include/note-collision.hh
@@ -1,17 +1,29 @@
 /*
-  collision.hh -- declare Collision
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #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 +38,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