Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

[lilypond.git] / lily / collision-engraver.cc

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index d2cf95e1e8515d33962325207af37dd59e456cb6..15ee2d29239711fd3eda3b02413626078e2b52ab 100644 (file)
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -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))
@@ -71,14 +73,18 @@ Collision_engraver::stop_translation_timestep ()
   note_columns_.clear ();
 }
 
-Collision_engraver::Collision_engraver ()
+Collision_engraver::Collision_engraver (Context *c)
+  : Engraver (c)
 {
   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 */