Merge branch 'issue4032'

[lilypond.git] / lily / engraver.cc

diff --git a/lily/engraver.cc b/lily/engraver.cc
index ac085bd296e17c21a5538c40da1928122b0aad14..74a6554e3a413bcf2d669f2192902cc975222213 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -51,12 +51,12 @@ Grob_info
 Engraver::make_grob_info (Grob *e, SCM cause)
 {
   /* TODO: Remove Music code when it's no longer needed */
-  if (Music *m = unsmob_music (cause))
+  if (Music *m = Music::unsmob (cause))
     {
       cause = m->to_event ()->unprotect ();
     }
   if (e->get_property ("cause") == SCM_EOL
-      && (unsmob_stream_event (cause) || unsmob_grob (cause)))
+      && (Stream_event::unsmob (cause) || Grob::unsmob (cause)))
     e->set_property ("cause", cause);
 
   return Grob_info (this, e);
@@ -171,15 +171,15 @@ Engraver::internal_make_spanner (SCM x, SCM cause, char const *name,
 }
 
 Engraver *
-unsmob_engraver (SCM eng)
+Engraver::unsmob (SCM eng)
 {
-  return dynamic_cast<Engraver *> (unsmob_translator (eng));
+  return dynamic_cast<Engraver *> (Translator::unsmob (eng));
 }
 
 bool
 ly_is_grob_cause (SCM obj)
 {
-  return unsmob_grob (obj) || unsmob_stream_event (obj) || (obj == SCM_EOL);
+  return Grob::unsmob (obj) || Stream_event::unsmob (obj) || (obj == SCM_EOL);
 }
 
 #include "translator.icc"