X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-collision-engraver.cc;h=151ffacf16eab597378664eeb3d84a74f7ce5229;hb=76efdcf765d2189ee79e390bf51cbb8fca3fb489;hp=01dbbf9e5ecb8a58cbed20e5cde106d32a9e0361;hpb=c054eb280fd9953596eb164f67b0f9d5555c5a32;p=lilypond.git

diff --git a/lily/beam-collision-engraver.cc b/lily/beam-collision-engraver.cc
index 01dbbf9e5e..151ffacf16 100644
--- a/lily/beam-collision-engraver.cc
+++ b/lily/beam-collision-engraver.cc
@@ -115,17 +115,17 @@ Beam_collision_engraver::finalize ()
           if ((covered_grob_spanned_rank[RIGHT] >= beam_spanned_rank_[LEFT])
               && !(to_boolean (beam_grob->get_property ("collision-voice-only"))
                    && (covered_grob_context != beam_context))
-              && !(Beam::has_interface (covered_grob)
+              && !(has_interface<Beam> (covered_grob)
                    && (covered_grob_spanned_rank[LEFT] <= beam_spanned_rank_[LEFT]))
               && covered_grob_has_interface (covered_grob, beam_grob))
             {
               // Do not consider note heads attached to the beam.
-              if (Stem::has_interface (covered_grob))
-                if (Grob::is_smob (covered_grob->get_object ("beam")))
+              if (has_interface<Stem> (covered_grob))
+                if (unsmob<Grob> (covered_grob->get_object ("beam")))
                   continue;
 
-              if (Grob *stem = Grob::unsmob (covered_grob->get_object ("stem")))
-                if (Grob *beam = Grob::unsmob (stem->get_object ("beam")))
+              if (Grob *stem = unsmob<Grob> (covered_grob->get_object ("stem")))
+                if (Grob *beam = unsmob<Grob> (stem->get_object ("beam")))
                   if (beam == beam_grob)
                     continue;