X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-interface.cc;h=8f9875ff9795ae176e009c073952df71fbe18503;hb=c8d62eca2d025e1fdce22f478f87c10f414d4b9d;hp=27c99bb15933b06d8279cdf434e937ac6c30ad4b;hpb=46e296f5381495ce30108aa981e549d61e55a009;p=lilypond.git

diff --git a/lily/spacing-interface.cc b/lily/spacing-interface.cc
index 27c99bb159..8f9875ff97 100644
--- a/lily/spacing-interface.cc
+++ b/lily/spacing-interface.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2007--2012 Joe Neeman <joeneeman@gmail.com>
+  Copyright (C) 2007--2015 Joe Neeman <joeneeman@gmail.com>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -30,6 +30,8 @@
 #include "skyline-pair.hh"
 #include "system.hh"
 
+using std::vector;
+
 /* return the right-pointing skyline of the left-items and the left-pointing
    skyline of the right-items (with the skyline of the left-items in
    ret[LEFT]) */
@@ -64,10 +66,10 @@ Spacing_interface::skylines (Grob *me, Grob *right_col)
             if (Item *piece = g->find_prebroken_piece (break_dirs[d]))
               g = piece;
 
-          if (g && Separation_item::has_interface (g) && g->get_column () == columns[d])
+          if (has_interface<Separation_item> (g) && g->get_column () == columns[d])
             {
               SCM sky_scm = g->get_property ("horizontal-skylines");
-              Skyline_pair *sky = Skyline_pair::unsmob (sky_scm);
+              Skyline_pair *sky = unsmob<Skyline_pair> (sky_scm);
 
               extract_grob_set (g, "elements", elts);
               Grob *ycommon = common_refpoint_of_array (elts, g, Y_AXIS);
@@ -96,7 +98,7 @@ Spacing_interface::minimum_distance (Grob *me, Grob *right)
 {
   Drul_array<Skyline> skylines = Spacing_interface::skylines (me, right);
 
-  return max (0.0, skylines[LEFT].distance (skylines[RIGHT]));
+  return std::max (0.0, skylines[LEFT].distance (skylines[RIGHT]));
 }
 
 /*
@@ -108,7 +110,7 @@ Spacing_interface::right_column (Grob *me)
   if (!me->is_live ())
     return 0;
 
-  Grob_array *a = unsmob_grob_array (me->get_object ("right-items"));
+  Grob_array *a = unsmob<Grob_array> (me->get_object ("right-items"));
   Item *mincol = 0;
   int min_rank = INT_MAX;
   for (vsize i = 0; a && i < a->size (); i++)
@@ -144,9 +146,9 @@ get_note_columns (vector<Grob *> const &elts)
 
   for (vsize i = 0; i < elts.size (); i++)
     {
-      if (Note_column::has_interface (elts[i]))
+      if (has_interface<Note_column> (elts[i]))
         ret.push_back (dynamic_cast<Item *> (elts[i]));
-      else if (Separation_item::has_interface (elts[i]))
+      else if (has_interface<Separation_item> (elts[i]))
         {
           extract_grob_set (elts[i], "elements", more_elts);
           vector<Item *> ncs = get_note_columns (more_elts);