Imported Upstream version 2.19.45

[lilypond.git] / lily / include / translator-dispatch-list.hh

diff --git a/lily/include/translator-dispatch-list.hh b/lily/include/translator-dispatch-list.hh
index afb9ce45a2fada6faec8dcf5aa56ade2f203e42b..b6124572fc53d6f694fb7fae2a32cbbe0b83d248 100644 (file)
--- a/lily/include/translator-dispatch-list.hh
+++ b/lily/include/translator-dispatch-list.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--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
@@ -21,24 +21,19 @@
 #define TRANSLATOR_DISPATCH_LIST_HH
 
 #include "lily-proto.hh"
+#include "callback.hh"
 #include "std-vector.hh"
 #include "smobs.hh"
+#include "translator.hh"
 
-struct Engraver_dispatch_entry
+class Engraver_dispatch_list : public Simple_smob<Engraver_dispatch_list>
 {
-  Engraver *engraver_;
-  Engraver_void_function_engraver_grob_info function_;
-};
-
-class Engraver_dispatch_list
-{
-  vector<Engraver_dispatch_entry> dispatch_entries_;
+  vector<Method_instance> dispatch_entries_;
 public:
   void apply (Grob_info);
   SCM static create (SCM trans_list,
                      SCM iface_list, Direction);
 
-  DECLARE_SIMPLE_SMOBS (Engraver_dispatch_list);
 };
 
 #endif /* TRANSLATOR_DISPATCH_LIST_HH */