X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fflag.cc;h=4b90be8be01a2395624067d2d64d04d9e230048d;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=f4fcce8e0e96a8db468846208a8ab193ec7952b8;hpb=8848da24e00c75d7de626b2ecc409fb45e87ce4a;p=lilypond.git

diff --git a/lily/flag.cc b/lily/flag.cc
index f4fcce8e0e..4b90be8be0 100644
--- a/lily/flag.cc
+++ b/lily/flag.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1996--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -38,7 +38,6 @@ public:
   DECLARE_SCHEME_CALLBACK (calc_y_offset, (SCM));
   DECLARE_SCHEME_CALLBACK (pure_calc_y_offset, (SCM, SCM, SCM));
   DECLARE_SCHEME_CALLBACK (calc_x_offset, (SCM));
-  DECLARE_GROB_INTERFACE ();
 
   static SCM internal_calc_y_offset (SCM smob, bool pure);
 };
@@ -47,8 +46,8 @@ MAKE_SCHEME_CALLBACK (Flag, width, 1);
 SCM
 Flag::width (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);
-  Stencil *sten = unsmob_stencil (me->get_property ("stencil"));
+  Grob *me = unsmob<Grob> (smob);
+  Stencil *sten = unsmob<Stencil> (me->get_property ("stencil"));
   if (!sten)
     return ly_interval2scm (Interval (0.0, 0.0));
 
@@ -67,7 +66,7 @@ MAKE_SCHEME_CALLBACK (Flag, glyph_name, 1);
 SCM
 Flag::glyph_name (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);
+  Grob *me = unsmob<Grob> (smob);
   Grob *stem = me->get_parent (X_AXIS);
 
   Direction d = get_grob_direction (stem);
@@ -113,7 +112,7 @@ MAKE_SCHEME_CALLBACK (Flag, print, 1);
 SCM
 Flag::print (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);
+  Grob *me = unsmob<Grob> (smob);
   Grob *stem = me->get_parent (X_AXIS);
 
   Direction d = get_grob_direction (stem);
@@ -179,7 +178,7 @@ Flag::calc_y_offset (SCM smob)
 SCM
 Flag::internal_calc_y_offset (SCM smob, bool pure)
 {
-  Grob *me = unsmob_grob (smob);
+  Grob *me = unsmob<Grob> (smob);
   Grob *stem = me->get_parent (X_AXIS);
   Direction d = get_grob_direction (stem);
 
@@ -187,7 +186,7 @@ Flag::internal_calc_y_offset (SCM smob, bool pure)
     = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
 
   Interval stem_extent = pure
-                         ? stem->pure_height (stem, 0, INT_MAX)
+                         ? stem->pure_y_extent (stem, 0, INT_MAX)
                          : stem->extent (stem, Y_AXIS);
 
   return scm_from_double (stem_extent.is_empty ()
@@ -199,7 +198,7 @@ MAKE_SCHEME_CALLBACK (Flag, calc_x_offset, 1);
 SCM
 Flag::calc_x_offset (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);
+  Grob *me = unsmob<Grob> (smob);
   Grob *stem = me->get_parent (X_AXIS);
   return scm_from_double (stem->extent (stem, X_AXIS)[RIGHT]);
 }