X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-loose-columns.cc;h=15f77f34a0bcc0283ca5119af4e5958b9df24c06;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=bcac6ff4937a1ca9864212e86c247926d9eadbf9;hpb=0b544cfb7332615ef809b71b57ab656741311ae1;p=lilypond.git

diff --git a/lily/spacing-loose-columns.cc b/lily/spacing-loose-columns.cc
index bcac6ff493..15f77f34a0 100644
--- a/lily/spacing-loose-columns.cc
+++ b/lily/spacing-loose-columns.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -60,8 +60,8 @@ set_loose_columns (System *which, Column_x_positions const *posns)
           if (!loose->get_system ())
             break;
 
-          Paper_column *le = dynamic_cast<Paper_column *> (unsmob_grob (scm_car (between)));
-          Paper_column *re = dynamic_cast<Paper_column *> (unsmob_grob (scm_cdr (between)));
+          Paper_column *le = unsmob<Paper_column> (scm_car (between));
+          Paper_column *re = unsmob<Paper_column> (scm_cdr (between));
 
           if (! (le && re))
             break;
@@ -135,8 +135,8 @@ set_loose_columns (System *which, Column_x_positions const *posns)
           Paper_column *loose_col = dynamic_cast<Paper_column *> (clique[j]);
           Paper_column *next_col = dynamic_cast<Paper_column *> (clique[j + 1]);
 
-          Grob *spacing = unsmob_grob (clique_col->get_object ("spacing"));
-          if (Grob *grace_spacing = unsmob_grob (clique_col->get_object ("grace-spacing")))
+          Grob *spacing = unsmob<Grob> (clique_col->get_object ("spacing"));
+          if (Grob *grace_spacing = unsmob<Grob> (clique_col->get_object ("grace-spacing")))
             {
               spacing = grace_spacing;
             }
@@ -155,7 +155,7 @@ set_loose_columns (System *which, Column_x_positions const *posns)
             {
               Spring spring = Spacing_spanner::note_spacing (spacing, loose_col,
                                                              next_col, &options);
-              if (Note_spacing::has_interface (spacing))
+              if (has_interface<Note_spacing> (spacing))
                 spring = Note_spacing::get_spacing (spacing, next_col,
                                                     spring, options.increment_);