*** empty log message ***

[lilypond.git] / lily / dot-column.cc

diff --git a/lily/dot-column.cc b/lily/dot-column.cc
index 5ad2e0923a79f33273dfca0fff13f92246b20f20..84f56b6418c247b9dbc2eeca087476e879fa413b 100644 (file)
--- a/lily/dot-column.cc
+++ b/lily/dot-column.cc
@@ -128,7 +128,7 @@ shift_one (Dot_configuration const &cfg,
          int p = i->first;
          if (p == k)
            {
-             if (Staff_symbol_referencer::on_staffline (i->second.dot_, p))
+             if (Staff_symbol_referencer::on_line (i->second.dot_, p))
                p += d;
              else
                p += 2* d;
@@ -155,7 +155,7 @@ shift_one (Dot_configuration const &cfg,
          int p = i->first;
          if (p == k)
            {
-             if (Staff_symbol_referencer::on_staffline (i->second.dot_, p))
+             if (Staff_symbol_referencer::on_line (i->second.dot_, p))
                p += d;
              else
                p += 2* d;
@@ -212,7 +212,7 @@ Dot_column::calc_positioning_done (SCM smob)
       dots when merging.
     */
     Grob *c = 0;
-    for (int i = dots.size (); i--;)
+    for (vsize i = dots.size (); i--;)
       {
        Grob *n = dots[i]->get_parent (Y_AXIS);
        if (c)
@@ -220,7 +220,7 @@ Dot_column::calc_positioning_done (SCM smob)
        else
          c = n;
       }
-    for (int i = dots.size (); i--;)
+    for (vsize i = dots.size (); i--;)
       {
        Grob *n = dots[i]->get_parent (Y_AXIS);
        n->relative_coordinate (c, X_AXIS);
@@ -228,12 +228,12 @@ Dot_column::calc_positioning_done (SCM smob)
   }
 
   dots.sort (compare_position);
-  for (int i = dots.size (); i--;)
+  for (vsize i = dots.size (); i--;)
     if (!dots[i]->is_live ())
-      dots.del (i);
+      dots.erase (dots.begin () + i);
 
   Dot_configuration cfg;
-  for (int i = 0;i < dots.size (); i++)
+  for (vsize i = 0;i < dots.size (); i++)
     {
       Dot_position dp;
       dp.dot_ = dots[i];
@@ -254,7 +254,7 @@ Dot_column::calc_positioning_done (SCM smob)
 
       remove_collision (cfg, p);
       cfg[p] = dp;
-      if (Staff_symbol_referencer::on_staffline (dp.dot_, p))
+      if (Staff_symbol_referencer::on_line (dp.dot_, p))
        remove_collision (cfg, p);
     }