Merge branch 'master' into translation

[lilypond.git] / lily / include / translator-group.hh

diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh
index 737308915770cbaa56f1bc152a14c860a0eca875..d90c2929de2d3d93a5271fae07250108c5b730f1 100644 (file)
--- a/lily/include/translator-group.hh
+++ b/lily/include/translator-group.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 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
@@ -30,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;
@@ -50,8 +50,8 @@ struct Translator_method_binding
 class Translator_group : public Smob<Translator_group>
 {
 public:
-  SCM mark_smob ();
-  int print_smob (SCM, scm_print_state *);
+  SCM mark_smob () const;
+  int print_smob (SCM, scm_print_state *) const;
   static const char type_p_name_[];
   virtual ~Translator_group ();
 private:
@@ -64,7 +64,7 @@ private:
 
   SCM protected_events_;
 
-  DECLARE_LISTENER (create_child_translator);
+  void create_child_translator (SCM);
 
 public:
   DECLARE_CLASSNAME (Translator_group);