Issue 4842/3: Replace Engraver_dispatch_entry with Method_instance

[lilypond.git] / lily / include / translator.icc

diff --git a/lily/include/translator.icc b/lily/include/translator.icc
index 3b700d815c7d3181995866739f68f511a37d09ae..cebfba52e905541f66a3e145e3da4c7cd4f5e1b8 100644 (file)
--- a/lily/include/translator.icc
+++ b/lily/include/translator.icc
@@ -22,7 +22,7 @@
 
 #include "callback.hh"
 #include "std-vector.hh"
-#include "translator.hh"
+#include "engraver.hh"
 
 /*
   TODO: derive "foo-bar-interface" from Foo_bar classname.
@@ -53,12 +53,12 @@
 
 #define DEFINE_ACKNOWLEDGERS(classname) \
   Drul_array< vector<Acknowledge_information> > classname::acknowledge_static_array_drul_;      \
-  Translator::Grob_info_callback                                        \
+  SCM                                                                   \
   classname::static_get_acknowledger (SCM sym)                          \
   {                                                                     \
     return generic_get_acknowledger (sym, &acknowledge_static_array_drul_[START]);      \
   }                                                                     \
-  Translator::Grob_info_callback                                        \
+  SCM                                                                   \
   classname::static_get_end_acknowledger (SCM sym)                      \
   {                                                                     \
     return generic_get_acknowledger (sym, &acknowledge_static_array_drul_[STOP]);       \
@@ -108,25 +108,27 @@
       : static_cast<Callback> (&T::process_acknowledged);              \
   }
 
-void add_acknowledger (Translator::Grob_info_callback ptr,
+void add_acknowledger (SCM ptr,
                        char const *func_name,
                        vector<Acknowledge_information> *ack_array);
 
-Translator::Grob_info_callback
+SCM
 generic_get_acknowledger (SCM sym,
                           vector<Acknowledge_information> const *ack_array);
 
 #define ADD_ACKNOWLEDGER(CLASS, NAME)                                   \
   void CLASS ## NAME ## _ack_adder ()                                   \
   {                                                                     \
-    add_acknowledger (static_cast<Translator::Grob_info_callback> (&CLASS::acknowledge_ ## NAME), #NAME, &CLASS::acknowledge_static_array_drul_[START]); \
+    add_acknowledger (CLASS::ack_finder<&CLASS::acknowledge_ ## NAME> (), \
+                      #NAME, &CLASS::acknowledge_static_array_drul_[START]); \
   }                                                                     \
   ADD_SCM_INIT_FUNC (CLASS ## NAME ## _ack_adder_initclass, CLASS ## NAME ## _ack_adder);
 
-#define ADD_END_ACKNOWLEDGER(CLASS, NAME)                                       \
-  void CLASS ## NAME ## _end_ack_adder ()                                       \
+#define ADD_END_ACKNOWLEDGER(CLASS, NAME)                               \
+  void CLASS ## NAME ## _end_ack_adder ()                               \
   {                                                                     \
-    add_acknowledger (static_cast<Translator::Grob_info_callback> (&CLASS::acknowledge_end_ ## NAME), #NAME, &CLASS::acknowledge_static_array_drul_[STOP]); \
+    add_acknowledger (CLASS::ack_finder<&CLASS::acknowledge_end_ ## NAME> (), \
+                      #NAME, &CLASS::acknowledge_static_array_drul_[STOP]); \
   }                                                                     \
   ADD_SCM_INIT_FUNC (CLASS ## NAME ## _end_ack_adder_initclass, CLASS ## NAME ## _end_ack_adder);