patch::: 1.3.57.jcn2

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

diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc
index 86de42722413b928fca1e455e66d265484b3226c..53dee7207dc6a3ab9fbe6acadd68a9db840abc2e 100644 (file)
--- a/lily/translator-ctors.cc
+++ b/lily/translator-ctors.cc
@@ -3,11 +3,10 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "proto.hh"
-#include "plist.hh"
 #include "translator.hh"
 #include "dictionary.hh"
 #include "debug.hh"
@@ -16,6 +15,9 @@
   should delete these after exit.
  */
 
+/*
+  UGH. Dictionary is deprecated
+ */
 Dictionary<Translator*> *global_translator_dict_p=0;
 
 void
@@ -24,7 +26,7 @@ add_translator (Translator *t)
   if (!global_translator_dict_p)
     global_translator_dict_p = new Dictionary<Translator*>;
 
-  global_translator_dict_p->elem (t->name ()) = t;
+  (*global_translator_dict_p)[classname (t)] = t;
 }
 
 Translator*
@@ -37,28 +39,7 @@ get_translator_l (String s)
        return t;
     }
 
-  error (_f ("unknown translator `%s\'", s));
+  error (_f ("unknown translator: `%s'", s));
   return 0;
 }
 
-Array<Translator_ctor> *ctor_global_static_arr_p_;
-
-
-/*
-  Very special greetings go out to Steve Jobs for creating a system 
-  that doesn't handle global construction correctly.
- */
-void
-add_constructor (Translator_ctor c)
-{
-  if (!ctor_global_static_arr_p_)
-    ctor_global_static_arr_p_ = new Array<Translator_ctor>;
-  ctor_global_static_arr_p_->push (c);
-}
-
-void
-call_constructors ()
-{
-  for (int i=0; i < ctor_global_static_arr_p_->size (); i++)
-    add_translator (ctor_global_static_arr_p_->elem (i) ());
-}