Run grand replace for 2015.

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

diff --git a/lily/include/note-collision.hh b/lily/include/note-collision.hh
index 1b1bd536f65a59016126d4d2ce5f1673f218eb0a..fcdece0a59e69be00d229fd2fa78b9739b606819 100644 (file)
--- a/lily/include/note-collision.hh
+++ b/lily/include/note-collision.hh
@@ -1,17 +1,28 @@
 /*
-  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--2015 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 "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 +37,13 @@
 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 vector<int> note_head_positions (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