X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcollision-engraver.cc;h=ca6a52d320a09dde5c5ff326611bfe4309ded81b;hb=3af0951f9a11677240efa6228683dd4fcea13eaf;hp=4b4d91f2bab0dc5b23500eebbb19042ec2be51b2;hpb=652ed35a2013489d0a14fede6307cd2595abb2c4;p=lilypond.git

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 4b4d91f2ba..ca6a52d320 100644
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 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
@@ -23,13 +23,15 @@
 #include "axis-group-interface.hh"
 #include "item.hh"
 
+#include "translator.icc"
+
 class Collision_engraver : public Engraver
 {
   Item *col_;
   vector<Grob *> note_columns_;
 
 protected:
-  DECLARE_ACKNOWLEDGER (note_column);
+  void acknowledge_note_column (Grob_info);
   void process_acknowledged ();
   void stop_translation_timestep ();
 public:
@@ -51,7 +53,7 @@ Collision_engraver::process_acknowledged ()
 void
 Collision_engraver::acknowledge_note_column (Grob_info i)
 {
-  if (Note_column::has_interface (i.grob ()))
+  if (has_interface<Note_column> (i.grob ()))
     {
       /*should check Y axis? */
       if (Note_column::has_rests (i.grob ()) || i.grob ()->get_parent (X_AXIS))
@@ -76,9 +78,12 @@ Collision_engraver::Collision_engraver ()
   col_ = 0;
 }
 
-#include "translator.icc"
 
-ADD_ACKNOWLEDGER (Collision_engraver, note_column);
+void
+Collision_engraver::boot ()
+{
+  ADD_ACKNOWLEDGER (Collision_engraver, note_column);
+}
 
 ADD_TRANSLATOR (Collision_engraver,
                 /* doc */