* lily/dynamic-engraver.cc (stop_translation_timestep): first set

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

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index a277540df3aceb8c6ebbd621166404f40b135181..66813fb37ce70629dd7e0b374cd9be5e87b391a2 100644 (file)
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -33,23 +33,22 @@ Collision_engraver::process_acknowledged_grobs ()
   if (!col_)
     {
       col_ = make_item ("NoteCollision", SCM_EOL);
-
     }
 
-  for (int i = 0; i< note_columns_.size (); i++)
+  for (int i = 0; i < note_columns_.size (); i++)
     Note_collision_interface::add_column (col_, note_columns_[i]);
 }
 
 void
 Collision_engraver::acknowledge_grob (Grob_info i)
 {
-  if (Note_column::has_interface (i.grob_))
+  if (Note_column::has_interface (i.grob ()))
     {
       /*should check Y axis? */
-      if (Note_column::has_rests (i.grob_) || i.grob_->get_parent (X_AXIS))
+      if (Note_column::has_rests (i.grob ()) || i.grob ()->get_parent (X_AXIS))
        return;
 
-      note_columns_.push (i.grob_);
+      note_columns_.push (i.grob ());
     }
 }
 
@@ -65,7 +64,6 @@ Collision_engraver::Collision_engraver ()
   col_ = 0;
 }
 
-
 ADD_TRANSLATOR (Collision_engraver,
                /* descr */ "Collect NoteColumns, and as soon as there are two or more, put them in a NoteCollision object.",
                /* creats*/ "NoteCollision",