X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frest-collision.hh;h=3946f9b93306b128429cae35892c11a7bc3412a9;hb=926115ff42def8bc1ce767029e4f03c8072994ba;hp=79b7b8aa72876bcbbd85d77f5da2be0c1273a41b;hpb=3c2f386f1385a10dafbb811be245f5a75d6b132c;p=lilypond.git

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index 79b7b8aa72..3946f9b933 100644
--- a/lily/include/rest-collision.hh
+++ b/lily/include/rest-collision.hh
@@ -1,25 +1,35 @@
 /*
-  rest-collision.hh -- declare Rest_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--2000 Han-Wen Nienhuys <hanwen@cs.uu.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 REST_COLLISION_HH
 #define REST_COLLISION_HH
 
+#include "grob-interface.hh"
 #include "lily-proto.hh"
-#include "lily-guile.hh"
 
-class Rest_collision		// interface
+class Rest_collision
 {
 public:
-  static void add_column (Score_element*me,Score_element*);
-  static void set_interface (Score_element*me);
-  static bool has_interface (Score_element*);
-  static Real force_shift_callback (Score_element *, Axis);
-  static SCM do_shift (Score_element*,SCM);
+  static void add_column (Grob *me, Grob *);
+
+  DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM element));
+  DECLARE_SCHEME_CALLBACK (force_shift_callback_rest, (SCM element, SCM off));
+  static SCM do_shift (Grob *);
 };
 #endif // REST_COLLISION_HH