Doc: Issue 4168: Add 'Dimensions' to Useful concepts

[lilypond.git] / lily / translator-group.cc

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index 8735fa9f26c1648f7a1c687d86243fc013c940fc..2f6615f17dda6bc7ab08302f98736206b76cf8e8 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -101,7 +101,7 @@ filter_performers (SCM ell)
   SCM *tail = ℓ
   for (SCM p = ell; scm_is_pair (p); p = scm_cdr (p))
     {
-      if (unsmob_performer (scm_car (*tail)))
+      if (Performer::is_smob (scm_car (*tail)))
         *tail = scm_cdr (*tail);
       else
         tail = SCM_CDRLOC (*tail);
@@ -115,7 +115,7 @@ filter_engravers (SCM ell)
   SCM *tail = ℓ
   for (SCM p = ell; scm_is_pair (p); p = scm_cdr (p))
     {
-      if (unsmob_engraver (scm_car (*tail)))
+      if (Engraver::is_smob (scm_car (*tail)))
         *tail = scm_cdr (*tail);
       else
         tail = SCM_CDRLOC (*tail);
@@ -149,7 +149,7 @@ IMPLEMENT_LISTENER (Translator_group, create_child_translator);
 void
 Translator_group::create_child_translator (SCM sev)
 {
-  Stream_event *ev = unsmob_stream_event (sev);
+  Stream_event *ev = Stream_event::unsmob (sev);
   // get from AnnounceNewContext
   SCM cs = ev->get_property ("context");
   Context *new_context = Context::unsmob (cs);
@@ -343,29 +343,23 @@ Translator_group::~Translator_group ()
 {
 }
 
-#include "ly-smobs.icc"
 
-IMPLEMENT_SMOBS (Translator_group);
-IMPLEMENT_DEFAULT_EQUAL_P (Translator_group);
-IMPLEMENT_TYPE_P (Translator_group, "ly:translator-group?");
+const char Translator_group::type_p_name_[] = "ly:translator-group?";
 
 int
-Translator_group::print_smob (SCM s, SCM port, scm_print_state *)
+Translator_group::print_smob (SCM port, scm_print_state *)
 {
-  Translator_group *me = (Translator_group *) SCM_CELL_WORD_1 (s);
   scm_puts ("#<Translator_group ", port);
-  scm_puts (me->class_name (), port);
-  scm_display (me->simple_trans_list_, port);
+  scm_puts (class_name (), port);
+  scm_display (simple_trans_list_, port);
   scm_puts (" >", port);
   return 1;
 }
 
 SCM
-Translator_group::mark_smob (SCM smob)
+Translator_group::mark_smob ()
 {
-  Translator_group *me = (Translator_group *)SCM_CELL_WORD_1 (smob);
-
-  me->derived_mark ();
-  scm_gc_mark (me->protected_events_);
-  return me->simple_trans_list_;
+  derived_mark ();
+  scm_gc_mark (protected_events_);
+  return simple_trans_list_;
 }