X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftranslator-group.hh;h=d90c2929de2d3d93a5271fae07250108c5b730f1;hb=03903634a20ae38366df912a41a4c0887a81d2cc;hp=45a7c77030343940383b54fc65e3a9e912466c43;hpb=68f8545bd6a0221ee1100336e4ad49399a7ffaa4;p=lilypond.git

diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh
index 45a7c77030..d90c2929de 100644
--- a/lily/include/translator-group.hh
+++ b/lily/include/translator-group.hh
@@ -1,9 +1,20 @@
 /*
-  translator-group.hh -- declare Translator_group
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef TRANSLATOR_GROUP_HH
@@ -11,7 +22,6 @@
 
 #include "listener.hh"
 #include "translator.hh"
-#include "std-vector.hh"
 
 typedef void (Translator:: *Translator_method) (void);
 typedef void (Translator_group:: *Translator_group_method) (void);
@@ -20,12 +30,12 @@ typedef void (*Translator_group_void_method) (Translator_group *);
 struct Translator_method_binding
 {
   Translator *translator_;
-  Translator_void_method_ptr method_;
+  Translator::Callback method_;
 
   Translator_method_binding ()
   {
   }
-  Translator_method_binding (Translator *tr, Translator_void_method_ptr ptr)
+  Translator_method_binding (Translator *tr, Translator::Callback ptr)
   {
     translator_ = tr;
     method_ = ptr;
@@ -33,12 +43,17 @@ struct Translator_method_binding
   void invoke ()
   {
     if (method_)
-      (*method_) (translator_);
+      (translator_->*method_) ();
   }
 };
 
-class Translator_group
+class Translator_group : public Smob<Translator_group>
 {
+public:
+  SCM mark_smob () const;
+  int print_smob (SCM, scm_print_state *) const;
+  static const char type_p_name_[];
+  virtual ~Translator_group ();
 private:
   void precompute_method_bindings ();
   vector<Translator_method_binding>
@@ -49,16 +64,13 @@ private:
 
   SCM protected_events_;
 
-  DECLARE_LISTENER (create_child_translator);
+  void create_child_translator (SCM);
 
 public:
-  VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Translator_group);
-  DECLARE_SMOBS (Translator_group, dummy);
+  DECLARE_CLASSNAME (Translator_group);
 
-public:
   virtual void connect_to_context (Context *c);
   virtual void disconnect_from_context ();
-  virtual Translator_group *get_daddy_translator ()const;
   virtual SCM get_simple_trans_list ();
   virtual void initialize ();
   virtual void finalize ();
@@ -86,13 +98,12 @@ protected:
 
 SCM names_to_translators (SCM namelist, Context *tg);
 void recurse_over_translators (Context *c, Translator_method ptr,
-			       Translator_group_method ptr2, Direction);
+                               Translator_group_method ptr2, Direction);
 void precomputed_recurse_over_translators (Context *c, Translator_precompute_index idx, Direction dir);
 Translator_group *get_translator_group (SCM sym);
 
 #define foobar
-#define ADD_TRANSLATOR_GROUP(classname, desc, grobs, accepted, read, write) foobar
+#define ADD_TRANSLATOR_GROUP(classname, desc, grobs, read, write) foobar
 
-DECLARE_UNSMOB (Translator_group, translator_group);
 
 #endif // TRANSLATOR_GROUP_HH