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

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

diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index 20e7eb9fc784940fe610bec1d6348d5382616250..70984ae2ad1b9ddbe9516730fb443370c7b1f713 100644 (file)
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -32,6 +32,8 @@
 #include "stream-event.hh"
 #include "warn.hh"
 
+#include "translator.icc"
+
 class Rest_collision_engraver : public Engraver
 {
 protected:
@@ -43,7 +45,8 @@ public:
   TRANSLATOR_DECLARATIONS (Rest_collision_engraver);
 };
 
-Rest_collision_engraver::Rest_collision_engraver ()
+Rest_collision_engraver::Rest_collision_engraver (Context *c)
+  : Engraver (c)
 {
   rest_collision_ = 0;
 }
@@ -62,7 +65,7 @@ Rest_collision_engraver::process_acknowledged ()
       if (!g || !m)
         continue;
 
-      if (Rhythmic_head::has_interface (g) && (*m) > now)
+      if (has_interface<Rhythmic_head> (g) && (*m) > now)
         {
           Grob *column = g->get_parent (X_AXIS);
           if (!column)
@@ -70,7 +73,7 @@ Rest_collision_engraver::process_acknowledged ()
 
           // Only include rests that start now. Include notes that started any time.
           Paper_column *paper_column = dynamic_cast<Item *> (column)->get_column ();
-          if (!Rest::has_interface (g) || !paper_column || Paper_column::when_mom (paper_column) == now)
+          if (!has_interface<Rest> (g) || !paper_column || Paper_column::when_mom (paper_column) == now)
             {
               columns.insert (column);
               rest_count += Note_column::has_rests (column);
@@ -92,7 +95,11 @@ Rest_collision_engraver::stop_translation_timestep ()
   rest_collision_ = 0;
 }
 
-#include "translator.icc"
+void
+Rest_collision_engraver::boot ()
+{
+
+}
 
 ADD_TRANSLATOR (Rest_collision_engraver,
                 /* doc */