Issue 4541 (2/2) Clean up...

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

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index a9564951f3a6a8b349f1f579cb8842e3d81807af..f98cb5a3a037d279c5234b314638432a5252737f 100644 (file)
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -309,14 +309,14 @@ check_meshing_chords (Grob *me,
     {
       Grob *d = unsmob<Grob> (head_up->get_object ("dot"));
       Grob *parent = d->get_parent (X_AXIS);
-      if (Dot_column::has_interface (parent))
+      if (has_interface<Dot_column> (parent))
         Side_position_interface::add_support (parent, head_down);
     }
   else if (Rhythmic_head::dot_count (head_down))
     {
       Grob *d = unsmob<Grob> (head_down->get_object ("dot"));
       Grob *parent = d->get_parent (X_AXIS);
-      if (Dot_column::has_interface (parent))
+      if (has_interface<Dot_column> (parent))
         {
           Grob *stem = unsmob<Grob> (head_up->get_object ("stem"));
           // Loop over all heads on an up-pointing-stem to see if dots
@@ -392,7 +392,7 @@ Note_collision_interface::calc_positioning_done (SCM smob)
     }
 
   vector<Grob *> done;
-  Real left_most = 1e6;
+  Real left_most = 0.0;
 
   vector<Real> amounts;
   for (; scm_is_pair (hand); hand = scm_cdr (hand))
@@ -402,8 +402,6 @@ Note_collision_interface::calc_positioning_done (SCM smob)
 
       done.push_back (s);
       amounts.push_back (amount);
-      if (amount < left_most)
-        left_most = amount;
     }
   for (; scm_is_pair (autos); autos = scm_cdr (autos))
     {
@@ -435,7 +433,7 @@ Note_collision_interface::get_clash_groups (Grob *me)
   for (vsize i = 0; i < elements.size (); i++)
     {
       Grob *se = elements[i];
-      if (Note_column::has_interface (se))
+      if (has_interface<Note_column> (se))
         {
           if (!Note_column::dir (se))
             se->programming_error ("note-column has no direction");