X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator.cc;h=e57e1c391af53eec7dc93253da33fe28d5cff8e7;hb=8e2eaf4959bec63a1128a444591a540f4f1e2937;hp=4a234e28172f48b4c55ceee0a0c07a82bb6cc05b;hpb=0e00ce29ec21b053824754651b07c9cc02124d16;p=lilypond.git

diff --git a/lily/translator.cc b/lily/translator.cc
index 4a234e2817..e57e1c391a 100644
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -32,13 +32,6 @@ Translator::~Translator ()
 {
 }
 
-void
-Translator::init ()
-{
-  daddy_context_ = 0;
-  smobify_self ();
-}
-
 void
 Translator::process_music ()
 {
@@ -49,15 +42,10 @@ Translator::process_acknowledged ()
 {
 }
 
-Translator::Translator ()
+Translator::Translator (Context *c)
+  : daddy_context_ (c)
 {
-  init ();
-}
-
-Translator::Translator (Translator const &)
-  : Smob<Translator> ()
-{
-  init ();
+  smobify_self ();
 }
 
 Moment
@@ -160,7 +148,7 @@ Translator::static_translator_description (const char *grobs,
                                            const char *desc,
                                            SCM listener_list,
                                            const char *read,
-                                           const char *write) const
+                                           const char *write)
 {
   SCM static_properties = SCM_EOL;
 
@@ -207,7 +195,7 @@ Translator::get_score_context () const
   return daddy_context_->get_score_context ();
 }
 
-const char Translator::type_p_name_[] = "ly:translator?";
+const char * const Translator::type_p_name_ = "ly:translator?";
 
 bool
 Translator::must_be_last () const
@@ -232,9 +220,9 @@ Translator::print_smob (SCM port, scm_print_state *) const
 void
 add_acknowledger (SCM ptr,
                   char const *func_name,
-                  Protected_scm &ack_hash)
+                  SCM &ack_hash)
 {
-  if (SCM_UNBNDP (SCM (ack_hash)))
+  if (SCM_UNBNDP (ack_hash))
     ack_hash = Scheme_hash_table::make_smob ();
 
   string interface_name (func_name);